Merge branch 'base' into issue6

# Conflicts:
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/SimpleEidasData.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/ernp/DummyErnpClient.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/ernp/IErnpClient.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
#	eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
#	eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
#	eidas_modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskFirstTest.java
#	eidas_modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml

1 files changed, 29 insertions, 19 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml
index b2e841fb..4f3133f8 100644
--- a/eidas_modules/authmodule-eIDAS-v2/pom.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml
@@ -13,14 +13,6 @@
   <name>eIDAS v2 authentication module</name>
   <description>eIDAS module based on eIDAS node reference implementation v2.x</description>
 
-  <properties>
-    <eidas-commons.version>2.4.0</eidas-commons.version>
-    <eidas-light-commons.version>2.4.0</eidas-light-commons.version>
-    <eidas-specific-communication-definition.version>2.4.0</eidas-specific-communication-definition.version>
-    <eidas-jcache-ignite-specific-communication.version>2.4.0</eidas-jcache-ignite-specific-communication.version>
-    <org.xerial.sqlite-jdbc.version>3.23.1</org.xerial.sqlite-jdbc.version>
-  </properties>
-
   <profiles>
     <profile>
       <id>default</id>
@@ -62,8 +54,6 @@
     <dependency>
       <groupId>eu.eidas</groupId>
       <artifactId>eidas-commons</artifactId>
-      <version>${eidas-commons.version}</version>
-      <!--scope>provided</scope -->
       <exclusions>
         <exclusion>
           <groupId>log4j</groupId>
@@ -79,19 +69,16 @@
     <dependency>
       <groupId>eu.eidas</groupId>
       <artifactId>eidas-light-commons</artifactId>
-      <version>${eidas-light-commons.version}</version>
     </dependency>
 
     <dependency>
       <groupId>eu.eidas</groupId>
       <artifactId>eidas-specific-communication-definition</artifactId>
-      <version>${eidas-specific-communication-definition.version}</version>
     </dependency>
 
     <dependency>
       <groupId>eu.eidas</groupId>
       <artifactId>eidas-jcache-ignite-specific-communication</artifactId>
-      <version>${eidas-jcache-ignite-specific-communication.version}</version>
     </dependency>
 
     <!-- other third party libs -->
@@ -162,6 +149,14 @@
       <version>2.0.7</version>
       <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>
@@ -251,22 +246,37 @@
       <plugin>
         <groupId>com.github.spotbugs</groupId>
         <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>${spotbugs-maven-plugin.version}</version>
+        <configuration>
+          <excludeFilterFile>checks/spotbugs-exclude.xml</excludeFilterFile>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
         <executions>
           <execution>
-            <id>spotbugs_validate</id>
+            <id>post-unit-check</id>
             <phase>test</phase>
             <goals>
               <goal>check</goal>
+              <goal>report</goal>
             </goals>
+            <configuration>
+              <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>                         
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <failOnError>true</failOnError>
-          <excludeFilterFile>spotbugs_exclude.xml</excludeFilterFile>
-        </configuration>
       </plugin>
 
-
       <!-- enable co-existence of testng and junit -->
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>