Merge branch 'nightlybuild' into feature/ms_proxy_before_refactoring

# Conflicts:
#	basicConfig/templates/error_message.html
#	connector/src/main/resources/specific_eIDAS_connector.beans.xml
#	connector/src/test/resources/config/junit_config_1_springboot.properties
#	connector/src/test/resources/config/junit_config_2_springboot.properties
#	connector/src/test/resources/config/templates/countrySelection.html
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
#	pom.xml

1 files changed, 68 insertions, 23 deletions

diff --git a/pom.xml b/pom.xml
index 5ffda104..0f04a7d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,17 +5,17 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>at.asitplus.eidas</groupId>
   <artifactId>ms_specific</artifactId>
-  <version>1.2.5-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>MS specific eIDAS components</name>
 
-  <properties>    
+  <properties>
     <!-- Project versions -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <timestamp>${maven.build.timestamp}</timestamp>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm</maven.build.timestamp.format>
-    
+
     <egiz.eidas.version>${project.version}</egiz.eidas.version>
 
 
@@ -24,11 +24,11 @@
     <egiz-eventlog-slf4jBackend>0.4</egiz-eventlog-slf4jBackend>
     <eaaf-core.version>1.2.1-SNAPSHOT</eaaf-core.version>
 
-    <spring-boot-starter-web.version>2.5.12</spring-boot-starter-web.version>
-    <spring-boot-admin-starter-client.version>2.5.4</spring-boot-admin-starter-client.version>
-    <org.springframework.version>5.3.18</org.springframework.version>
+    <spring-boot-starter-web.version>2.5.13</spring-boot-starter-web.version>
+    <spring-boot-admin-starter-client.version>2.5.6</spring-boot-admin-starter-client.version>
+    <org.springframework.version>5.3.19</org.springframework.version>
     <org.thymeleaf-spring5.version>3.0.15.RELEASE</org.thymeleaf-spring5.version>
-    <apache.cxf.version>3.5.0</apache.cxf.version>
+    <apache.cxf.version>3.5.2</apache.cxf.version>
     
     <eidas-ref.version>2.5.0</eidas-ref.version>
 
@@ -39,28 +39,33 @@
     <commons-io.version>2.11.0</commons-io.version>
     <com.google.guava.version>31.1-jre</com.google.guava.version>
     <joda-time.version>2.10.14</joda-time.version>
+    <jackson.version>2.13.2</jackson.version>
     <jackson-datatype-jsr310.version>2.13.2</jackson-datatype-jsr310.version>
+    <jackson-databind-nullable.version>0.2.2</jackson-databind-nullable.version>
+    <swagger-parser.version>2.0.32</swagger-parser.version>
     
     <org.slf4j.version>1.7.36</org.slf4j.version>
     <log4j.version>2.17.2</log4j.version>    
-    <ch.qos.logback.version>1.2.10</ch.qos.logback.version>
+    <ch.qos.logback.version>1.2.11</ch.qos.logback.version>
+           
+    <!-- for code generation -->
+    <openapi-generator-maven-plugin.version>5.4.0</openapi-generator-maven-plugin.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.11</org.bitbucket.b_c.jose4j.version>
-
+    <org.bitbucket.b_c.jose4j.version>0.7.12</org.bitbucket.b_c.jose4j.version>
 
     <!-- For software testing only -->
-    <json-path.version>2.6.0</json-path.version>
-    <jetty.version>9.4.44.v20210927</jetty.version>
+    <json-path.version>2.7.0</json-path.version>
+    <jetty.version>9.4.46.v20220331</jetty.version>
 
     <!-- testing -->
     <junit.version>4.13.2</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>
+    <com.squareup.okhttp3.version>4.9.3</com.squareup.okhttp3.version>
     <org.powermock.version>2.0.9</org.powermock.version>
 
     <!-- Code quality checks -->
@@ -96,6 +101,16 @@
       </activation>
       <repositories>
         <repository>
+          <id>central</id>
+          <url>https://repo.maven.apache.org/maven2</url>
+          <releases>
+            <updatePolicy>never</updatePolicy>
+          </releases>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </repository>
+        <repository>
           <id>egiz-commons</id>
           <url>https://apps.egiz.gv.at/maven/</url>
           <releases>
@@ -155,9 +170,14 @@
       </dependency>
       <dependency>
         <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_core</artifactId>
+        <version>${eaaf-core.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
         <artifactId>eaaf_module_pvp2_sp</artifactId>
         <version>${eaaf-core.version}</version>
-      </dependency>            
+      </dependency>
       <dependency>
         <groupId>at.asitplus.eidas.ms_specific</groupId>
         <artifactId>ms_specific_connector</artifactId>
@@ -253,7 +273,6 @@
         <artifactId>spring-boot-admin-starter-client</artifactId>
         <version>${spring-boot-admin-starter-client.version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.springframework</groupId>
         <artifactId>spring-webmvc</artifactId>
@@ -371,17 +390,37 @@
         <version>${commons-collections4.version}</version>
       </dependency>
       <dependency>
+        <groupId>com.fasterxml.jackson.dataformat</groupId>
+        <artifactId>jackson-dataformat-yaml</artifactId>
+        <version>${jackson.version}</version>    
+      </dependency>
+      <dependency>
         <groupId>com.fasterxml.jackson.datatype</groupId>
         <artifactId>jackson-datatype-jsr310</artifactId>
-        <version>${jackson-datatype-jsr310.version}</version>
+        <version>${jackson.version}</version>
       </dependency>
       <dependency>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>
+        <version>${jackson.version}</version>
+      </dependency>            
+      <dependency>
+        <groupId>org.openapitools</groupId>
+        <artifactId>jackson-databind-nullable</artifactId>
+        <version>${jackson-databind-nullable.version}</version>
+      </dependency>      
+      <dependency>
+        <groupId>io.swagger.parser.v3</groupId>
+        <artifactId>swagger-parser</artifactId>
+        <version>${swagger-parser.version}</version>
+      </dependency>      
+      <dependency>
         <groupId>com.fasterxml.jackson.module</groupId>
         <artifactId>jackson-modules-java8</artifactId>
         <version>${jackson-datatype-jsr310.version}</version>
         <type>pom</type>
-        <scope>runtime</scope>        
-      </dependency>      
+        <scope>runtime</scope>      
+      </dependency>
       <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
@@ -417,7 +456,7 @@
         <artifactId>spring-boot-starter-test</artifactId>
         <version>${spring-boot-starter-web.version}</version>
         <scope>test</scope>
-      </dependency>            
+      </dependency>
       <dependency>
         <groupId>com.github.skjolber</groupId>
         <artifactId>mockito-soap-cxf</artifactId>
@@ -499,14 +538,14 @@
         <version>${eaaf-core.version}</version>
         <scope>test</scope>
         <type>test-jar</type>
-      </dependency>       
+      </dependency>
       <dependency>
         <groupId>at.gv.egiz.eaaf</groupId>
         <artifactId>eaaf_module_pvp2_sp</artifactId>
         <version>${eaaf-core.version}</version>
         <scope>test</scope>
         <type>test-jar</type>
-      </dependency> 
+      </dependency>    
       <dependency>
         <groupId>at.asitplus.eidas.ms_specific</groupId>
         <artifactId>core_common_lib</artifactId>
@@ -649,6 +688,11 @@
           </executions>
         </plugin>
 
+        <plugin>
+          <groupId>org.openapitools</groupId>
+          <artifactId>openapi-generator-maven-plugin</artifactId>
+          <version>${openapi-generator-maven-plugin.version}</version>
+        </plugin>
 
       </plugins>
     </pluginManagement>
@@ -668,7 +712,7 @@
         </executions>
         <configuration>
           <excludedScopes>test</excludedScopes>
-          <excludedGroups>iaik.*|MOA.spss.*</excludedGroups>
+          <excludedGroups>MOA.spss.*</excludedGroups>
         </configuration>
       </plugin>
 
@@ -770,7 +814,7 @@
           </execution>
         </executions>
         <configuration>
-          <linkXref>false</linkXref>
+          <linkXRef>false</linkXRef>
           <sourceEncoding>utf-8</sourceEncoding>
           <minimumTokens>100</minimumTokens>
           <targetJdk>1.8</targetJdk>
@@ -781,6 +825,7 @@
           </rulesets>
           <excludeRoots>
             <excludeRoot>target/generated/cxf</excludeRoot>
+            <excludeRoot>target/generated/swagger</excludeRoot>
           </excludeRoots>
         </configuration>
       </plugin>