From 8558b96de1dfdae7dc58a4fdd7da9a346c0a6147 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.io>
Date: Thu, 14 Sep 2023 12:42:17 +0300
Subject: [PATCH] Spring upgrade to 2.7.15 (#1428)

Spring and some other dependencies upgraded

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

diff --git a/pom.xml b/pom.xml
index da5c0357d..e51d18acb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
    <parent>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-parent</artifactId>
-      <version>2.7.14</version>
+      <version>2.7.15</version>
    </parent>
 
    <groupId>org.eclipse.hawkbit</groupId>
@@ -28,7 +28,7 @@
 
    <licenses>
       <license>
-         <name>Eclipse Public License - Version 1.0</name>
+         <name>Eclipse Public License - v 2.0</name>
          <url>https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt</url>
       </license>
    </licenses>
@@ -105,6 +105,15 @@
             <role>Committer</role>
          </roles>
       </developer>
+      <developer>
+         <id>avgustinmm</id>
+         <email>Avgustin.Marinov@bosch.com</email>
+         <organization>Bosch</organization>
+         <organizationUrl>https://www.bosch.io</organizationUrl>
+         <roles>
+            <role>Committer</role>
+         </roles>
+      </developer>
    </developers>
 
    <distributionManagement>
@@ -133,11 +142,9 @@
       <java.version>17</java.version>
       <test.jvm.args/>
 
-      <spring.boot.version>2.7.14</spring.boot.version>
+      <spring.boot.version>2.7.15</spring.boot.version>
       <spring.cloud.version>2021.0.5</spring.cloud.version>
       <spring.plugin.core.version>2.0.0.RELEASE</spring.plugin.core.version>
-      <!-- CVE-2022-31690 Remove after Spring 3.0.0 migration-->
-      <spring.security.oauth2.client.version>5.7.10</spring.security.oauth2.client.version>
 
       <!-- Swagger Support -->
       <springdoc-openapi.version>1.7.0</springdoc-openapi.version>
@@ -149,13 +156,13 @@
       <snakeyaml.version>1.33</snakeyaml.version>
       <!-- Spring boot version overrides - END -->
 
-      <!-- CVE-2022-45868 -->
-      <h2.version>2.2.220</h2.version>
+      <!-- CVE-2022-45868, fixed in 2.2.200 -->
+      <h2.version>2.2.222</h2.version>
 
-      <rabbitmq.http-client.version>5.0.0</rabbitmq.http-client.version>
+      <rabbitmq.http-client.version>5.1.0</rabbitmq.http-client.version>
 
       <!-- Eclipselink - START -->
-      <eclipselink.version>2.7.12</eclipselink.version>
+      <eclipselink.version>2.7.13</eclipselink.version>
       <eclipselink.maven.plugin.version>2.7.9.1</eclipselink.maven.plugin.version>
       <!-- Eclipselink - END -->
 
@@ -201,14 +208,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.1.1-jre</guava.version>
+      <guava.version>32.1.2-jre</guava.version>
       <javax.el-api.version>3.0.0</javax.el-api.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.23.0</allure.version>
+      <allure.version>2.24.0</allure.version>
       <awaitility.version>4.2.0</awaitility.version>
 
       <!-- Misc libraries versions - END -->
@@ -858,13 +865,6 @@
             <version>${springdoc-openapi.version}</version>
          </dependency>
 
-         <!-- CVE-2022-31690 Remove after Spring 3.0.0 migration-->
-         <dependency>
-            <groupId>org.springframework.security</groupId>
-            <artifactId>spring-security-oauth2-client</artifactId>
-            <version>${spring.security.oauth2.client.version}</version>
-         </dependency>
-
          <!-- Protostuff Io -->
          <dependency>
             <groupId>io.protostuff</groupId>