From ba648cae0e5863e0fe3b6e91bd024453b9b74b09 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Fri, 15 Dec 2023 12:56:32 +0200
Subject: [PATCH] Bump Spring Boot version -> 2.7.18 (#1519)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
---
 hawkbit-runtime/README.md                 | 2 ++
 hawkbit-runtime/hawkbit-simple-ui/pom.xml | 1 +
 pom.xml                                   | 5 +++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/hawkbit-runtime/README.md b/hawkbit-runtime/README.md
index 93ff3d90a9..446001cc87 100644
--- a/hawkbit-runtime/README.md
+++ b/hawkbit-runtime/README.md
@@ -12,3 +12,5 @@ hawkBit Runtime
 | `hawkbit-dmf-server/`    | Spring-Boot application of hawkBit DMF server.                                                                             |
 | `hawkbit-mgmt-server/`   | Spring-Boot application of hawkBit Management server. Provides REST Management API and rollouts / auto assigment processing |
 | `hawkbit-vv8-ui/`        | Spring-Boot application of hawkBit Vaadin 8 UI.                                                                            |
+
+Note: micro service setup requires all services using DB to use same shared DB. So, they don't work with default in memory H2 database. Docker compose with mysql shows an example setup.
diff --git a/hawkbit-runtime/hawkbit-simple-ui/pom.xml b/hawkbit-runtime/hawkbit-simple-ui/pom.xml
index 69a8bc9359..5d2da6c478 100644
--- a/hawkbit-runtime/hawkbit-simple-ui/pom.xml
+++ b/hawkbit-runtime/hawkbit-simple-ui/pom.xml
@@ -17,6 +17,7 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.1.5</version>
+        <relativePath/>
     </parent>
 
     <groupId>com.eclipse.hawkbit</groupId>
diff --git a/pom.xml b/pom.xml
index 2ef5909152..7b5df80e82 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.17</version>
+      <version>2.7.18</version>
    </parent>
 
    <groupId>org.eclipse.hawkbit</groupId>
@@ -159,7 +159,7 @@
       <java.version>17</java.version>
       <test.jvm.args/>
 
-      <spring.boot.version>2.7.17</spring.boot.version>
+      <spring.boot.version>2.7.18</spring.boot.version>
       <spring.cloud.version>2021.0.8</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-->
@@ -173,6 +173,7 @@
       <!-- Fixed dependencies -->
       <!-- CVE-2022-25857 -->
       <snakeyaml.version>1.33</snakeyaml.version>
+      <logback.version>1.2.13</logback.version>
       <!-- Spring boot version overrides - END -->
 
       <!-- CVE-2022-45868, fixed in 2.2.200 -->