From d97a000237c133d54125e37653b3ad450fe3a950 Mon Sep 17 00:00:00 2001
From: Risto Seene <39149669+rsarendus@users.noreply.github.com>
Date: Thu, 31 Mar 2022 18:37:34 +0300
Subject: [PATCH 1/2] SIVA-337 Update Spring Boot and other dependencies

---
 pom.xml                                                   | 8 ++++----
 siva-parent/siva-webapp/pom.xml                           | 2 +-
 .../xroad-validation-service/pom.xml                      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index b552de89f..48819f1c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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/siva-webapp/pom.xml b/siva-parent/siva-webapp/pom.xml
index 6ba5a903d..f064e5158 100644
--- a/siva-parent/siva-webapp/pom.xml
+++ b/siva-parent/siva-webapp/pom.xml
@@ -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/xroad-validation-service/pom.xml b/validation-services-parent/xroad-validation-service/pom.xml
index f056b5f73..6ff99fdf5 100644
--- a/validation-services-parent/xroad-validation-service/pom.xml
+++ b/validation-services-parent/xroad-validation-service/pom.xml
@@ -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>

From 59bd96b66365155040105bc2523b71826e0002f9 Mon Sep 17 00:00:00 2001
From: Risto Seene <39149669+rsarendus@users.noreply.github.com>
Date: Thu, 31 Mar 2022 19:55:34 +0300
Subject: [PATCH 2/2] SIVA-337 Update version number to 3.5.2

---
 pom.xml                                                       | 2 +-
 siva-parent/pom.xml                                           | 4 ++--
 siva-parent/siva-distribution/pom.xml                         | 2 +-
 siva-parent/siva-monitoring/pom.xml                           | 2 +-
 siva-parent/siva-sample-application/pom.xml                   | 2 +-
 siva-parent/siva-signature-service/pom.xml                    | 2 +-
 siva-parent/siva-statistics/pom.xml                           | 2 +-
 siva-parent/siva-test/pom.xml                                 | 2 +-
 siva-parent/siva-validation-proxy/pom.xml                     | 2 +-
 siva-parent/siva-webapp/pom.xml                               | 2 +-
 validation-services-parent/generic-validation-service/pom.xml | 2 +-
 validation-services-parent/pom.xml                            | 2 +-
 .../timemark-container-validation-service/pom.xml             | 2 +-
 .../timestamptoken-validation-service/pom.xml                 | 2 +-
 validation-services-parent/tsl-loader/pom.xml                 | 2 +-
 validation-services-parent/validation-commons/pom.xml         | 2 +-
 validation-services-parent/xroad-validation-service/pom.xml   | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pom.xml b/pom.xml
index 48819f1c6..f5d6202a3 100644
--- 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>
diff --git a/siva-parent/pom.xml b/siva-parent/pom.xml
index f4b2dd7b2..809e30a1e 100644
--- 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
index ac94987c7..7c9eed12a 100644
--- 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
index c81bd3336..96b0d15cb 100644
--- 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
index f2501ae78..a601833b4 100644
--- 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
index 6f2411c13..f8144ebf7 100644
--- 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
index 261445603..5938df939 100644
--- 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
index 456b20daf..e6bc0a975 100644
--- 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
index 9457ef690..1d5735d72 100644
--- 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
index f064e5158..d7698418c 100644
--- 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>
 
diff --git a/validation-services-parent/generic-validation-service/pom.xml b/validation-services-parent/generic-validation-service/pom.xml
index e98c49dcb..7b6411974 100644
--- 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
index 8ddd1169c..2b39288b9 100644
--- 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
index 911a85b72..8d94fd703 100644
--- 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
index 95409988a..28ccdcb29 100644
--- 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
index aafd71019..9504fd82e 100644
--- 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
index 3708d887f..7060d65c2 100644
--- 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
index 6ff99fdf5..aced3438d 100644
--- 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>