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

1 files changed, 35 insertions, 8 deletions

diff --git a/pom.xml b/pom.xml
index 48169e8c..927e8f5e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.asitplus.eidas</groupId>
   <artifactId>ms_specific</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.2.3</version>
   <packaging>pom</packaging>
 
   <name>MS specific eIDAS components</name>
@@ -22,13 +22,13 @@
     <!-- ===================================================================== -->
     <egiz-spring-api>0.3</egiz-spring-api>
     <egiz-eventlog-slf4jBackend>0.4</egiz-eventlog-slf4jBackend>
-    <eaaf-core.version>1.1.13.1</eaaf-core.version>
+    <eaaf-core.version>1.1.17</eaaf-core.version>
 
-    <spring-boot-starter-web.version>2.4.5</spring-boot-starter-web.version>
-    <spring-boot-admin-starter-client.version>2.4.1</spring-boot-admin-starter-client.version>
-    <org.springframework.version>5.3.6</org.springframework.version>
+    <spring-boot-starter-web.version>2.5.4</spring-boot-starter-web.version>
+    <spring-boot-admin-starter-client.version>2.5.1</spring-boot-admin-starter-client.version>
+    <org.springframework.version>5.3.10</org.springframework.version>
     <org.thymeleaf-spring5.version>3.0.12.RELEASE</org.thymeleaf-spring5.version>
-    <cxf.version>3.3.5</cxf.version>
+    <cxf.version>3.4.4</cxf.version>
 
     <eidas-ref.version>2.5.0</eidas-ref.version>
 
@@ -38,23 +38,25 @@
     <com.google.guava.version>30.1.1-jre</com.google.guava.version>
     <joda-time.version>2.10.10</joda-time.version>
     <org.slf4j.version>1.7.30</org.slf4j.version>
-    <jackson-datatype-jsr310.version>2.12.3</jackson-datatype-jsr310.version>
+    <jackson-datatype-jsr310.version>2.12.5</jackson-datatype-jsr310.version>
     <!-- org.xerial.sqlite-jdbc.version>3.34.0</org.xerial.sqlite-jdbc.version -->
 
     <javax.validation-api.version>2.0.1.Final</javax.validation-api.version>
     <hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
+    <org.bitbucket.b_c.jose4j.version>0.7.9</org.bitbucket.b_c.jose4j.version>
 
     <!-- testing -->
     <junit.version>4.13</junit.version>
     <surefire.version>2.22.2</surefire.version>
     <mockito-soap-cxf.version>1.2.0</mockito-soap-cxf.version>
     <com.squareup.okhttp3.version>4.0.0</com.squareup.okhttp3.version>
+    <org.powermock.version>2.0.9</org.powermock.version>
 
     <!-- Code quality checks -->
     <jacoco-maven-plugin.version>0.8.6</jacoco-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.1.1</maven-checkstyle-plugin.version>
     <maven-pmd-plugin.version>3.14.0</maven-pmd-plugin.version>
-    <spotbugs-maven-plugin.version>4.1.4</spotbugs-maven-plugin.version>
+    <spotbugs-maven-plugin.version>4.4.1</spotbugs-maven-plugin.version>
     <findsecbugs-plugin.version>1.11.0</findsecbugs-plugin.version>
 
     <dependency-check-maven.version>6.0.3</dependency-check-maven.version>
@@ -327,6 +329,11 @@
         <artifactId>hibernate-validator</artifactId>
         <version>${hibernate-validator.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.bitbucket.b_c</groupId>
+        <artifactId>jose4j</artifactId>
+        <version>${org.bitbucket.b_c.jose4j.version}</version>
+      </dependency>      
 
 
       <!-- Testing -->
@@ -397,11 +404,31 @@
         <type>test-jar</type>
       </dependency>
       <dependency>
+        <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
+        <artifactId>authmodule-eIDAS-v2</artifactId>
+        <version>${egiz.eidas.version}</version>
+        <classifier>tests</classifier>
+        <scope>test</scope>
+        <type>test-jar</type>
+      </dependency>            
+      <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>mockwebserver</artifactId>
         <version>${com.squareup.okhttp3.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-module-junit4</artifactId>
+        <version>${org.powermock.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.powermock</groupId>
+        <artifactId>powermock-api-mockito2</artifactId>
+        <version>${org.powermock.version}</version>
+        <scope>test</scope>
+      </dependency>            
     </dependencies>
   </dependencyManagement>
   <dependencies>