From 1dc1bdbe94ae9178adc9a256b1a3a46b82188c88 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.io>
Date: Tue, 1 Aug 2023 09:46:44 +0300
Subject: [PATCH] Upgrade Spring and docker image (#1401)

Spring -> 2.7.17
base docker image -> 17.0.8_7-jre-alpine

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 pom.xml | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index e805283bd..32c7941bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
    <parent>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-parent</artifactId>
-      <version>2.7.13</version>
+      <version>2.7.14</version>
    </parent>
 
    <groupId>org.eclipse.hawkbit</groupId>
@@ -130,28 +130,23 @@
       <snapshotDependencyAllowed>true</snapshotDependencyAllowed>
 
       <java.version>17</java.version>
+      <test.jvm.args/>
 
-      <spring.boot.version>2.7.13</spring.boot.version>
+      <spring.boot.version>2.7.14</spring.boot.version>
       <spring.cloud.version>2021.0.5</spring.cloud.version>
       <spring.plugin.core.version>2.0.0.RELEASE</spring.plugin.core.version>
 
-      <!-- Spring boot version overrides (should be reviewed with every boot
-         upgrade) - START -->
+      <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
       <!-- Newer versions needed than defined in Boot -->
       <!-- Fixed dependencies -->
       <!-- CVE-2022-25857 -->
       <snakeyaml.version>1.33</snakeyaml.version>
-      <!-- maintain compatibility with AWS Aurora for production setups -->
-      <mariadb.version>2.7.8</mariadb.version>
-      <!-- CVE-2020-36518, CVE-2022-42003, CVE-2022-42004 -->
-      <jackson-bom.version>2.14.2</jackson-bom.version>
-
       <!-- Spring boot version overrides - END -->
 
-      <rabbitmq.http-client.version>3.12.1</rabbitmq.http-client.version>
+      <rabbitmq.http-client.version>5.0.0</rabbitmq.http-client.version>
 
       <!-- Eclipselink - START -->
-      <eclipselink.version>2.7.11</eclipselink.version>
+      <eclipselink.version>2.7.12</eclipselink.version>
       <eclipselink.maven.plugin.version>2.7.9.1</eclipselink.maven.plugin.version>
       <!-- Eclipselink - END -->
 
@@ -180,7 +175,7 @@
       <docker.jvm.args>${docker.memory.size} ${docker.gc.settings} -XX:+HeapDumpOnOutOfMemoryError
          -XX:+ExitOnOutOfMemoryError -Djava.security.egd=file:/dev/./urandom
       </docker.jvm.args>
-      <docker.jre.version>17.0.7_7-jre-alpine</docker.jre.version>
+      <docker.jre.version>17.0.8_7-jre-alpine</docker.jre.version>
       <!-- Docker image build - END -->
 
       <maven.scm.plugin.version>2.0.1</maven.scm.plugin.version>
@@ -197,15 +192,14 @@
       <cron-utils.version>9.2.1</cron-utils.version>
       <jsoup.version>1.16.1</jsoup.version>
       <jaxb-api.version>2.3.1</jaxb-api.version>
-      <guava.version>32.0.1-jre</guava.version>
+      <guava.version>32.1.1-jre</guava.version>
       <javax.el-api.version>3.0.0</javax.el-api.version>
-      <corn-cps.version>1.1.10</corn-cps.version>
       <commons-io.version>2.13.0</commons-io.version>
       <rsql-parser.version>2.1.0</rsql-parser.version>
       <io-protostuff.version>1.8.0</io-protostuff.version>
 
       <!-- test -->
-      <allure.version>2.22.2</allure.version>
+      <allure.version>2.23.0</allure.version>
       <awaitility.version>4.2.0</awaitility.version>
 
       <!-- Misc libraries versions - END -->
@@ -512,7 +506,7 @@
                   <useSystemClassLoader>false</useSystemClassLoader>
                   <reuseForks>true</reuseForks>
                   <forkCount>${surefire.forkcount}</forkCount>
-                  <argLine>${jacoco.agent.ut.arg}</argLine>
+                  <argLine>${jacoco.agent.ut.arg} ${test.jvm.args}</argLine>
                   <properties>
                      <property>
                         <name>listener</name>
@@ -726,11 +720,6 @@
             <artifactId>javax.el-api</artifactId>
             <version>${javax.el-api.version}</version>
          </dependency>
-         <dependency>
-            <groupId>net.sf.corn</groupId>
-            <artifactId>corn-cps</artifactId>
-            <version>${corn-cps.version}</version>
-         </dependency>
          <dependency>
             <groupId>com.github.gwtd3</groupId>
             <artifactId>gwt-d3-api</artifactId>