From 9c23b606e3040abb0f8b49ad87fea6b7124e5427 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Tue, 3 Aug 2021 11:28:00 -0400
Subject: [PATCH] Update to spring boot version 2.3.12.RELEASE

Update to latest version of spring boot 2.3

Issue-ID: CCSDK-3291
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Ie475c749fa9e8b58cae2aadbde0e8e9b40790f4d
---
 .../src/main/properties/springboot2.properties          |  4 ++--
 .../src/main/resources/pom-template.xml                 | 11 ++++++-----
 springboot/springboot1/pom.xml                          | 11 ++++++-----
 springboot/springboot2/pom.xml                          | 17 +++++++++--------
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/springboot/spring-boot-setup/src/main/properties/springboot2.properties b/springboot/spring-boot-setup/src/main/properties/springboot2.properties
index 3bd4976b..6e69d7fd 100644
--- a/springboot/spring-boot-setup/src/main/properties/springboot2.properties
+++ b/springboot/spring-boot-setup/src/main/properties/springboot2.properties
@@ -1,5 +1,5 @@
 springbootparent.artifactId=spring-boot-starter-parent
 springbootparent.groupId=org.springframework.boot
-springbootparent.version=2.3.8.RELEASE
+springbootparent.version=2.3.12.RELEASE
 springboot.project.artifactId=spring-boot-starter-parent
-spring.version=5.2.12.RELEASE
\ No newline at end of file
+spring.version=5.2.15.RELEASE
\ No newline at end of file
diff --git a/springboot/spring-boot-setup/src/main/resources/pom-template.xml b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
index 7c4a0346..27ccde6f 100644
--- a/springboot/spring-boot-setup/src/main/resources/pom-template.xml
+++ b/springboot/spring-boot-setup/src/main/resources/pom-template.xml
@@ -119,22 +119,23 @@
         <!-- Managed dependency versions -->
         <antlr.version>4.8-1</antlr.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.25.0</grpc.version>
+        <netty-ssl>2.0.39.Final</netty-ssl>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
-        <jersey.version>2.25.1</jersey.version>
-        <jersey.client.version>2.25.1</jersey.client.version>
+        <jersey.version>2.30.1</jersey.version>
+        <jersey.client.version>2.30.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
         <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
+        <tomcat-jdbc.version>9.0.46</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
diff --git a/springboot/springboot1/pom.xml b/springboot/springboot1/pom.xml
index 62fdb355..f24ae877 100644
--- a/springboot/springboot1/pom.xml
+++ b/springboot/springboot1/pom.xml
@@ -119,22 +119,23 @@
         <!-- Managed dependency versions -->
         <antlr.version>4.8-1</antlr.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.25.0</grpc.version>
+        <netty-ssl>2.0.39.Final</netty-ssl>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
-        <jersey.version>2.25.1</jersey.version>
-        <jersey.client.version>2.25.1</jersey.client.version>
+        <jersey.version>2.30.1</jersey.version>
+        <jersey.client.version>2.30.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
         <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
+        <tomcat-jdbc.version>9.0.46</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
diff --git a/springboot/springboot2/pom.xml b/springboot/springboot2/pom.xml
index 2ec92953..cf823d3d 100644
--- a/springboot/springboot2/pom.xml
+++ b/springboot/springboot2/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>2.3.12.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -102,8 +102,8 @@
         <ccsdk.sli.plugins.version>${ccsdk.sli.version}</ccsdk.sli.plugins.version>
 
         <!-- Spring versions -->
-        <spring.boot.version>2.3.8.RELEASE</spring.boot.version>
-        <spring.version>5.2.12.RELEASE</spring.version>
+        <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
+        <spring.version>5.2.15.RELEASE</spring.version>
 
         <!-- Kotlin versions -->
         <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
@@ -119,22 +119,23 @@
         <!-- Managed dependency versions -->
         <antlr.version>4.8-1</antlr.version>
         <commons.lang.version>2.6</commons.lang.version>
-        <apache.httpcomponents.core.version>4.4.12</apache.httpcomponents.core.version>
-        <apache.httpcomponents.client.version>4.5.10</apache.httpcomponents.client.version>
+        <apache.httpcomponents.core.version>4.4.14</apache.httpcomponents.core.version>
+        <apache.httpcomponents.client.version>4.5.13</apache.httpcomponents.client.version>
         <derby.version>10.14.2.0</derby.version>
         <eelf.version>1.0.0</eelf.version>
         <grpc.version>1.25.0</grpc.version>
+        <netty-ssl>2.0.39.Final</netty-ssl>
         <protobuff.java.version>3.10.0</protobuff.java.version>
         <protobuff.java.utils.version>3.10.0</protobuff.java.utils.version>
-        <jersey.version>2.25.1</jersey.version>
-        <jersey.client.version>2.25.1</jersey.client.version>
+        <jersey.version>2.30.1</jersey.version>
+        <jersey.client.version>2.30.1</jersey.client.version>
         <jettison.version>1.3.8</jettison.version>
         <logback.version>1.2.3</logback.version>
         <mariadb.connector.version>2.7.3</mariadb.connector.version>
         <mariadb4j.version>2.4.0</mariadb4j.version>
         <slf4j.version>1.7.25</slf4j.version>
         <testng.version>6.14.3</testng.version>
-        <tomcat-jdbc.version>9.0.30</tomcat-jdbc.version>
+        <tomcat-jdbc.version>9.0.46</tomcat-jdbc.version>
         <dependency-list.file>direct-dependencies.txt</dependency-list.file>
     </properties>
 
-- 
2.16.6