Merge from develop

open-eid · Mar 31, 2022 · 4c59a05 · 4c59a05
2 parents 232db90 + 59bd96b
commit 4c59a05
Show file tree

Hide file tree

Showing 17 changed files with 24 additions and 24 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
 
     <groupId>ee.openid.siva</groupId>
     <artifactId>siva</artifactId>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
     <packaging>pom</packaging>
     <name>SiVa Digitally signed documents validation service</name>
     <url>https://github.com/open-eid/SiVa</url>
@@ -112,12 +112,12 @@
         <commons.codec.version>1.15</commons.codec.version>
         <commons.collections.version>4.4</commons.collections.version>
         <commons.io.version>2.11.0</commons.io.version>
-        <jackson.version>2.13.1</jackson.version>
-        <json.version>20211205</json.version>
-        <logback.version>1.2.10</logback.version>
+        <jackson.version>2.13.2</jackson.version>
+        <json.version>20220320</json.version>
+        <logback.version>1.2.11</logback.version>
         <lombok.version>1.18.22</lombok.version>
         <snakeyaml.version>1.30</snakeyaml.version>
-        <spring.boot.version>2.6.2</spring.boot.version>
+        <spring.boot.version>2.6.6</spring.boot.version>
         <xmlsec.version>2.1.7</xmlsec.version>
 
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>

diff --git a/siva-parent/pom.xml b/siva-parent/pom.xml
@@ -19,14 +19,14 @@
     <parent>
         <artifactId>siva</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>siva-parent</artifactId>
     <packaging>pom</packaging>
     <name>SiVa webapp and other core modules</name>
-    <version>3.5.1</version>
+    <version>3.5.2</version>
 
     <modules>
         <module>siva-validation-proxy</module>

diff --git a/siva-parent/siva-distribution/pom.xml b/siva-parent/siva-distribution/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-monitoring/pom.xml b/siva-parent/siva-monitoring/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-sample-application/pom.xml b/siva-parent/siva-sample-application/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-signature-service/pom.xml b/siva-parent/siva-signature-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-statistics/pom.xml b/siva-parent/siva-statistics/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-test/pom.xml b/siva-parent/siva-test/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-validation-proxy/pom.xml b/siva-parent/siva-validation-proxy/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/siva-parent/siva-webapp/pom.xml b/siva-parent/siva-webapp/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -96,7 +96,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-sleuth</artifactId>
-            <version>3.1.0</version>
+            <version>3.1.1</version>
         </dependency>
 
         <dependency>

diff --git a/validation-services-parent/generic-validation-service/pom.xml b/validation-services-parent/generic-validation-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/validation-services-parent/pom.xml b/validation-services-parent/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>siva</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>

diff --git a/validation-services-parent/timemark-container-validation-service/pom.xml b/validation-services-parent/timemark-container-validation-service/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/validation-services-parent/timestamptoken-validation-service/pom.xml b/validation-services-parent/timestamptoken-validation-service/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/validation-services-parent/tsl-loader/pom.xml b/validation-services-parent/tsl-loader/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/validation-services-parent/validation-commons/pom.xml b/validation-services-parent/validation-commons/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/validation-services-parent/xroad-validation-service/pom.xml b/validation-services-parent/xroad-validation-service/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>validation-services-parent</artifactId>
         <groupId>ee.openid.siva</groupId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.12.1</version>
+            <version>2.12.2</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.messaging.saaj</groupId>