From 0f849201ea4a2a6e8cc1a9a4591c133c8bb6ce21 Mon Sep 17 00:00:00 2001
From: Johannes Faltermeier <jfaltermeier@eclipsesource.com>
Date: Wed, 21 Aug 2024 14:01:40 +0200
Subject: [PATCH] Update Java Dependencies

Contributed on behalf of STMicroelectronics
---
 java/common/maven-conf/pom.xml                | 24 +++++++++++--------
 .../org.eclipse.theia.cloud.common/pom.xml    |  3 +--
 .../pom.xml                                   |  6 +----
 .../org.eclipse.theia.cloud.operator/pom.xml  |  6 +----
 4 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/java/common/maven-conf/pom.xml b/java/common/maven-conf/pom.xml
index a88eaf3f..f7beecee 100644
--- a/java/common/maven-conf/pom.xml
+++ b/java/common/maven-conf/pom.xml
@@ -12,19 +12,23 @@
 
     <properties>
         <failsafe.useModulePath>false</failsafe.useModulePath>
-        <guice.version>5.0.1</guice.version>
-        <kubernetes-client.version>6.10.0</kubernetes-client.version>
-        <log4j.version>2.17.1</log4j.version>
-        <slf4j.version>1.7.32</slf4j.version>
-        <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
-        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
-        <quarkus.platform.version>3.8.1</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
-        <webhooks.framework.core.version>1.1.2</webhooks.framework.core.version>
+        <guice.version>7.0.0</guice.version>
+        <log4j.version>2.23.1</log4j.version>
+        <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
+        <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+        <surefire-plugin.version>3.4.0</surefire-plugin.version>
+        <google.artifactregistry-maven-wagon-version>2.2.2</google.artifactregistry-maven-wagon-version>
+        <junit-jupiter.version>5.11.0</junit-jupiter.version>
+        <org.json.version>20240303</org.json.version>
+        <picocli.version>4.7.6</picocli.version>
+        <webhooks.framework.core.version>1.1.4</webhooks.framework.core.version>
+        <slf4j.version>1.7.36</slf4j.version>
+        <kubernetes-client.version>6.12.1</kubernetes-client.version>
+        <quarkus.platform.version>3.11.3</quarkus.platform.version>
     </properties>
 
     <profiles>
@@ -73,7 +77,7 @@
                     <plugin>
                         <groupId>com.google.cloud.artifactregistry</groupId>
                         <artifactId>artifactregistry-maven-wagon</artifactId>
-                        <version>2.2.0</version>
+                        <version>${google.artifactregistry-maven-wagon-version}</version>
                         <extensions>true</extensions>
                     </plugin>
                 </plugins>
diff --git a/java/common/org.eclipse.theia.cloud.common/pom.xml b/java/common/org.eclipse.theia.cloud.common/pom.xml
index 718e57d3..22adab06 100644
--- a/java/common/org.eclipse.theia.cloud.common/pom.xml
+++ b/java/common/org.eclipse.theia.cloud.common/pom.xml
@@ -31,11 +31,10 @@
             <artifactId>log4j-core</artifactId>
             <version>${log4j.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.10.3</version>
+            <version>${junit-jupiter.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml b/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml
index 063cf84a..1a7d3eab 100644
--- a/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml
+++ b/java/operator/org.eclipse.theia.cloud.defaultoperator/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../common/maven-conf/</relativePath>
     </parent>
 
-    <properties>
-        <picocli.version>4.6.3</picocli.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.eclipse.theia.cloud</groupId>
@@ -33,7 +29,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220924</version>
+            <version>${org.json.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>
diff --git a/java/operator/org.eclipse.theia.cloud.operator/pom.xml b/java/operator/org.eclipse.theia.cloud.operator/pom.xml
index bfaab6dc..8e3e081c 100644
--- a/java/operator/org.eclipse.theia.cloud.operator/pom.xml
+++ b/java/operator/org.eclipse.theia.cloud.operator/pom.xml
@@ -15,10 +15,6 @@
         <relativePath>../../common/maven-conf/</relativePath>
     </parent>
 
-    <properties>
-        <picocli.version>4.6.3</picocli.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.eclipse.theia.cloud</groupId>
@@ -28,7 +24,7 @@
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20220924</version>
+            <version>${org.json.version}</version>
         </dependency>
         <dependency>
             <groupId>com.google.inject</groupId>