Merge branch 'master' into feature/matching_base_rebase

# Conflicts:
#	connector/pom.xml
#	connector/src/test/java/at/asitplus/eidas/specific/connector/test/task/GenerateCountrySelectionFrameTaskTest.java
#	eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
#	eidas_modules/authmodule-eIDAS-v2/pom.xml
#	pom.xml

3 files changed, 20 insertions, 16 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml b/eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
index 15d62521..9b12a750 100644
--- a/eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
@@ -2,14 +2,9 @@
 <FindBugsFilter>
     <Match>
       <!-- Do not check code generated by Apache CXF framework -->
-      <Or>
-        <Class name="~szrservices.SZRException"/>
-        <Package name="~at[.]gv[.]bmi[.]namespace[.]zmr_su.*?" />
-      </Or>
-    </Match>
-    <Match>
-      <!-- Do not check code generated by Apache CXF framework -->
-      <Class name="~szrservices.SZRException"/>
+      <Class name="~szrservices.*"/>
+      <Class name="~at.gv.e_government.reference.namespace.persondata.*" />
+      <Class name="~org.w3._2000._09.xmldsig.*" />
     </Match>
     <Match>
       <!-- Logging of SAML2 responses in case of errors or for debugging is allowed -->
@@ -40,5 +35,16 @@
       <Class name="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAuthnRequestTask" />
       <Method name="sendRedirect" />
       <Bug pattern="UNVALIDATED_REDIRECT" />               
-    </Match>  
+    </Match>
+  <Match>
+    <!-- Builder pattern does not expose date elements -->
+    <OR>
+      <Class name="at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ErnbEidData" />
+      <Class name="at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.JoseUtils$JwsResult"/>
+    </OR>
+    <OR>
+      <Bug pattern="EI_EXPOSE_REP" />
+      <Bug pattern="EI_EXPOSE_REP2" />
+    </OR>
+  </Match>        
 </FindBugsFilter>
diff --git a/eidas_modules/authmodule-eIDAS-v2/pom.xml b/eidas_modules/authmodule-eIDAS-v2/pom.xml
index 976a4d9b..d8c712b9 100644
--- a/eidas_modules/authmodule-eIDAS-v2/pom.xml
+++ b/eidas_modules/authmodule-eIDAS-v2/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>at.asitplus.eidas.ms_specific</groupId>
     <artifactId>modules</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.2.3</version>
   </parent>
   <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
   <artifactId>authmodule-eIDAS-v2</artifactId>
@@ -147,10 +147,8 @@
     <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>
@@ -183,7 +181,6 @@
       <artifactId>mockito-soap-cxf</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>at.asitplus.eidas.ms_specific</groupId>
       <artifactId>connector_lib</artifactId>
@@ -203,12 +200,14 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_module_pvp2_core</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
+    
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_module_pvp2_idp</artifactId>
@@ -220,7 +219,6 @@
       <artifactId>mockwebserver</artifactId>
       <scope>test</scope>
     </dependency>
-
   </dependencies>
 
   <build>
diff --git a/eidas_modules/pom.xml b/eidas_modules/pom.xml
index 0c6183dc..0693d793 100644
--- a/eidas_modules/pom.xml
+++ b/eidas_modules/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
     <groupId>at.asitplus.eidas</groupId>
 	  <artifactId>ms_specific</artifactId>
-	  <version>1.2.3-SNAPSHOT</version>
+	  <version>1.2.3</version>
 	</parent>
 	<groupId>at.asitplus.eidas.ms_specific</groupId>
 	<artifactId>modules</artifactId>