From 8beee0dae592eb9a9db232e096ca00652bd391a9 Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Thu, 11 Jul 2024 16:58:58 -0300
Subject: [PATCH] Upgrade to Java 21 and update dependencies

* Upgrade to Java 21
* spring boot:2.7.18
* spring cloud:2021.0.9
* lombok:1.18.34
* org.json:json:20240303
* logback:1.2.13
---
 .github/workflows/codeql-analysis.yml |  2 +-
 .github/workflows/docker.yml          |  2 +-
 .github/workflows/pull-request.yml    |  2 +-
 gateway/pom.xml                       |  6 +++---
 pom.xml                               | 22 +++++++++++++++++++---
 5 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 72f61608..30f4f670 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -41,7 +41,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '21'
         cache: 'maven'
 
     - name: Initialize CodeQL
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a5e7cce7..905eaba4 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -22,7 +22,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '21'
         cache: 'maven'
 
     - name: "Build gateway"
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 32ad62d9..53fd33ea 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -16,7 +16,7 @@ jobs:
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '21'
         cache: 'maven'
 
     - name: "Build gateway"
diff --git a/gateway/pom.xml b/gateway/pom.xml
index 53777875..a30e7110 100644
--- a/gateway/pom.xml
+++ b/gateway/pom.xml
@@ -10,7 +10,7 @@
   <name>gateway</name>
   <description>geOrchestra application gateway</description>
   <properties>
-    <java.version>11</java.version>
+    <java.version>21</java.version>
     <imageTag>${project.version}</imageTag>
     <spring-boot.build-image.imageName>georchestra/gateway:${imageTag}</spring-boot.build-image.imageName>
   </properties>
@@ -123,7 +123,7 @@
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
-      <version>20230618</version>
+      <version>20240303</version>
     </dependency>
     <dependency>
       <groupId>org.testcontainers</groupId>
@@ -194,7 +194,7 @@
             <configuration>
               <rules>
                 <requireJavaVersion>
-                  <version>[11,)</version>
+                  <version>[${java.version},)</version>
                 </requireJavaVersion>
                 <requireMavenVersion>
                   <version>[3.6.3,)</version>
diff --git a/pom.xml b/pom.xml
index 20239a00..a9d46164 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.12</version>
+    <version>2.7.18</version>
     <relativePath></relativePath>
     <!-- lookup parent from repository -->
   </parent>
@@ -19,7 +19,7 @@
   <properties>
     <revision>1.0.1-SNAPSHOT</revision>
     <georchestra.version>24.0.1-SNAPSHOT</georchestra.version>
-    <spring-cloud.version>2021.0.7</spring-cloud.version>
+    <spring-cloud.version>2021.0.9</spring-cloud.version>
     <formatter-maven-plugin.version>2.10.0</formatter-maven-plugin.version>
     <fmt.skip>false</fmt.skip>
     <fmt.action>format</fmt.action>
@@ -28,10 +28,26 @@
     <pom.fmt.skip>${fmt.skip}</pom.fmt.skip>
     <imageTag>${project.version}</imageTag>
     <spring-boot.build-image.imageName>georchestra/gateway:${imageTag}</spring-boot.build-image.imageName>
-    <lombok.version>1.18.30</lombok.version>
+    <lombok.version>1.18.34</lombok.version>
+    <logback.version>1.2.13</logback.version>
   </properties>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.yaml</groupId>
+        <artifactId>snakeyaml</artifactId>
+        <version>2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-core</artifactId>
+	<version>${logback.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+	<version>${logback.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.springframework.cloud</groupId>
         <artifactId>spring-cloud-dependencies</artifactId>