Merge branch 'feature/matching_rebased' into feature/matching_base

1 files changed, 91 insertions, 25 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml
index 188bbd26..a695d21a 100644
--- a/eidas_modules/authmodule-eIDAS-v2/pom.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml
@@ -50,6 +50,24 @@
       <artifactId>eaaf-core</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_module_pvp2_core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_module_pvp2_sp</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>iaik.prod</groupId>
+      <artifactId>iaik_jce_full</artifactId>
+      <version>5.52_moa</version>
+<!--      <groupId>iaik</groupId>-->
+<!--      <artifactId>jce_full_signed</artifactId>-->
+<!--      <version>5.52</version>-->
+    </dependency>
+
     <!-- eIDAS reference implemenation libs -->
     <dependency>
       <groupId>eu.eidas</groupId>
@@ -83,6 +101,16 @@
 
     <!-- other third party libs -->
     <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter-tomcat</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
     </dependency>
@@ -120,6 +148,19 @@
     </dependency>
 
     <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.11.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.bitbucket.b_c</groupId>
+      <artifactId>jose4j</artifactId>
+      <version>0.7.2</version>
+    </dependency>
+
+
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
@@ -137,30 +178,28 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.skjolber</groupId>
-      <artifactId>mockito-soap-cxf</artifactId>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
-    </dependency>
+    </dependency>        
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-module-junit4</artifactId>
-      <version>2.0.7</version>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-tomcat</artifactId>
       <scope>test</scope>
-    </dependency>
+    </dependency>        
     <dependency>
-      <groupId>org.powermock</groupId>
-      <artifactId>powermock-api-mockito2</artifactId>
-      <version>2.0.7</version>
+      <groupId>com.github.skjolber</groupId>
+      <artifactId>mockito-soap-cxf</artifactId>
       <scope>test</scope>
     </dependency>
-    
+
     <dependency>
       <groupId>at.asitplus.eidas.ms_specific</groupId>
       <artifactId>connector_lib</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-    
+
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_core_utils</artifactId>
@@ -174,16 +213,23 @@
       <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.11.2</version>
-      <scope>compile</scope>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_module_pvp2_core</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
     </dependency>
     <dependency>
-      <groupId>org.bitbucket.b_c</groupId>
-      <artifactId>jose4j</artifactId>
-      <version>0.7.2</version>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_module_pvp2_idp</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>com.squareup.okhttp3</groupId>
+      <artifactId>mockwebserver</artifactId>
+      <scope>test</scope>
     </dependency>
+
   </dependencies>
 
   <build>
@@ -233,11 +279,31 @@
               <sourceRoot>${project.build.directory}/generated/cxf</sourceRoot>
               <wsdlOptions>
                 <wsdlOption>
-                  <wsdl>${basedir}/src/main/resources/szr_client/SZR_v4.0.wsdl</wsdl>
+                  <wsdl>${basedir}/src/main/resources/wsdl/szr_client/SZR_v4.0.wsdl</wsdl>
+                  <extraargs>
+                    <extraarg>-verbose </extraarg>
+                  </extraargs>
+                </wsdlOption>                
+                <wsdlOption>
+                  <wsdl>${basedir}/src/main/resources/wsdl/zmr_client/wsdl/Service.wsdl</wsdl>
                   <extraargs>
                     <extraarg>-verbose </extraarg>
                   </extraargs>
                 </wsdlOption>
+                
+                <!--use custom package name for search address Web-Service, 
+                    because ZMR and address Web-Service use the same XML namespace but defines different schema. -->
+                <wsdlOption>
+                  <wsdl>${basedir}/src/main/resources/wsdl/addresssearching_client/wsdl/Service.wsdl</wsdl>
+                  <extraargs>
+                    <extraarg>-verbose </extraarg>
+                  </extraargs>
+                  <packagenames>
+                    <packagename>http://bmi.gv.at/namespace/zmr-su/base/20040201#=at.gv.bmi.namespace.zmr_su.base._20040201_.address</packagename>
+                    <packagename>http://bmi.gv.at/namespace/zmr-su/zmr/20040201#=at.gv.bmi.namespace.zmr_su.zrm._20040201_.address</packagename>                    
+                  </packagenames>
+                </wsdlOption> 
+                               
               </wsdlOptions>
             </configuration>
             <goals>
@@ -246,7 +312,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
@@ -268,14 +334,14 @@
               <goal>report</goal>
             </goals>
             <configuration>
-              <haltOnFailure>true</haltOnFailure>
+              <haltOnFailure>false</haltOnFailure>
               <excludes>
                 <exclude>**/at/gv/e_government/reference/namespace/persondata/_20020228/*</exclude>
                 <exclude>**/org/w3/_2000/_09/*</exclude>
                 <exclude>**/org/w3/_2001/_04/*</exclude>
                 <exclude>**/szrservices/*</exclude>
-                <exclude>**/generated/cxf/*</exclude>                           
-              </excludes>                         
+                <exclude>**/generated/cxf/*</exclude>
+              </excludes>
             </configuration>
           </execution>
         </executions>
@@ -297,4 +363,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>