Merge branch 'nightlybuild' into feature/matching_base

# Conflicts:
#	connector/pom.xml
#	connector/src/test/java/at/asitplus/eidas/specific/connector/test/FullStartUpAndProcessTest.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/szr/SzrClient.java
#	modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/SzrClientTestProduction.java
#	modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
#	pom.xml

1 files changed, 25 insertions, 17 deletions

diff --git a/pom.xml b/pom.xml
index 20dabdc8..8313f005 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.4-SNAPSHOT</version>
+  <version>1.2.5-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>MS specific eIDAS components</name>
@@ -27,8 +27,7 @@
     <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>
-    <org.thymeleaf-spring5.version>3.0.14.RELEASE</org.thymeleaf-spring5.version>
-
+    <org.thymeleaf-spring5.version>3.0.15.RELEASE</org.thymeleaf-spring5.version>
     <apache.cxf.version>3.5.0</apache.cxf.version>
     
     <eidas-ref.version>2.5.0</eidas-ref.version>
@@ -36,24 +35,27 @@
     <org.apache.commons-lang3.version>3.12.0</org.apache.commons-lang3.version>
     <org.apache.commons-text.version>1.9</org.apache.commons-text.version>
     <commons-collections4.version>4.4</commons-collections4.version>
+
     <commons-io.version>2.11.0</commons-io.version>
-    <com.google.guava.version>31.0.1-jre</com.google.guava.version>
-    <joda-time.version>2.10.13</joda-time.version>
-    
-    <org.slf4j.version>1.7.32</org.slf4j.version>
-    <log4j.version>2.17.1</log4j.version>    
-    <ch.qos.logback.version>1.2.10</ch.qos.logback.version>
-       
-    <jackson.version>2.13.1</jackson.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.29</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>
+           
+    <!-- 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.9</org.bitbucket.b_c.jose4j.version>
-  
-    <!-- for code generation -->
-    <openapi-generator-maven-plugin.version>5.4.0</openapi-generator-maven-plugin.version>
+    <org.bitbucket.b_c.jose4j.version>0.7.11</org.bitbucket.b_c.jose4j.version>
 
     <!-- For software testing only -->
     <json-path.version>2.6.0</json-path.version>
@@ -391,8 +393,7 @@
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>${jackson.version}</version>
-      </dependency>      
-      
+      </dependency>            
       <dependency>
         <groupId>org.openapitools</groupId>
         <artifactId>jackson-databind-nullable</artifactId>
@@ -404,6 +405,13 @@
         <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>
+      <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
         <version>${javax.validation-api.version}</version>