From 829593380b9ee3c19d248396c2668e70e29a9bf5 Mon Sep 17 00:00:00 2001
From: panos-kakos <kakos.programmer@gmail.com>
Date: Mon, 18 Sep 2023 12:34:20 +0300
Subject: [PATCH] [JAVA-22209] Upgraded spring-cloud-zuul-eureka-integration
 module to jdk17 + fixed tests in spring-cloud-archaius module

---
 pom.xml                                        |  4 +++-
 spring-cloud-modules/pom.xml                   |  2 +-
 .../spring-cloud-archaius/pom.xml              |  4 +++-
 .../pom.xml                                    |  3 ++-
 .../pom.xml                                    | 16 ++++++++++++++++
 .../spring-cloud-archaius-jdbc-config/pom.xml  |  9 +++++++++
 .../spring-cloud-stream-starters/pom.xml       |  3 +--
 .../eureka-client/pom.xml                      | 18 ++++++++++++++++++
 .../eureka-server/pom.xml                      | 18 ++++++++++++++++++
 .../zuul-server/pom.xml                        | 18 ++++++++++++++++++
 10 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index c65f6ce62d..86d7d3328c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,6 +726,7 @@
                 <module>spring-cloud-modules/spring-cloud-contract</module>
                 <module>spring-cloud-modules/spring-cloud-data-flow</module>
                 <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
+                <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
@@ -999,6 +1000,8 @@
                 <module>spring-drools</module>
                 <module>spring-cloud-modules/spring-cloud-azure</module>
                 <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
+                <module>spring-cloud-modules/spring-cloud-contract</module>
+                <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
                 <module>spring-exceptions</module>
                 <module>spring-jenkins-pipeline</module>
                 <module>spring-core</module>
@@ -1210,7 +1213,6 @@
                 <module>gradle-modules/gradle/maven-to-gradle</module>
                 <module>persistence-modules/spring-data-neo4j</module>
                 <module>spring-actuator</module>
-                <module>spring-cloud-modules/spring-cloud-contract</module>
             </modules>
 
             <properties>
diff --git a/spring-cloud-modules/pom.xml b/spring-cloud-modules/pom.xml
index 9c926bbe61..73276d7e0f 100644
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@@ -31,7 +31,7 @@
         <module>spring-cloud-connectors-heroku</module>
         <module>spring-cloud-aws</module>
         <module>spring-cloud-consul</module>
-        <module>spring-cloud-zuul-eureka-integration</module>
+        <!--        <module>spring-cloud-zuul-eureka-integration</module>-->
         <!--        <module>spring-cloud-contract</module>-->
         <module>spring-cloud-kubernetes</module>
         <module>spring-cloud-open-service-broker</module>
diff --git a/spring-cloud-modules/spring-cloud-archaius/pom.xml b/spring-cloud-modules/spring-cloud-archaius/pom.xml
index 4d7ca3943d..3e90c7390c 100644
--- a/spring-cloud-modules/spring-cloud-archaius/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/pom.xml
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+            <version>${spring-cloud-starter-netflix-archaius.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -54,7 +55,8 @@
     </dependencies>
 
     <properties>
-        <spring-cloud-dependencies.version>2.0.3.RELEASE</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2.2.10.RELEASE</spring-cloud-dependencies.version>
+        <spring-cloud-starter-netflix-archaius.version>2.2.10.RELEASE</spring-cloud-starter-netflix-archaius.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml
index 6e25ace6a8..600fedc774 100644
--- a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-dynamodb-config/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <scope>provided</scope>
+            <version>${lombok.version}</version>
         </dependency>
     </dependencies>
 
@@ -44,6 +44,7 @@
         <aws.sdk.dynamo.version>1.11.407</aws.sdk.dynamo.version>
         <spring.dynamo.version>5.0.3</spring.dynamo.version>
         <archaius.version>0.7.6</archaius.version>
+        <lombok.version>1.18.26</lombok.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml
index f90570abc2..383ad6a780 100644
--- a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-extra-configs/pom.xml
@@ -37,6 +37,22 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <spring-cloud-dependencies.version>2.0.1.RELEASE</spring-cloud-dependencies.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml
index 7fb5747739..2871f129b5 100644
--- a/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml
+++ b/spring-cloud-modules/spring-cloud-archaius/spring-cloud-archaius-jdbc-config/pom.xml
@@ -27,6 +27,15 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+        </dependency>
     </dependencies>
 
+    <properties>
+        <lombok.version>1.18.26</lombok.version>
+    </properties>
+
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-stream-starters/pom.xml b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml
index eee5b27396..95176d1e5c 100644
--- a/spring-cloud-modules/spring-cloud-stream-starters/pom.xml
+++ b/spring-cloud-modules/spring-cloud-stream-starters/pom.xml
@@ -3,7 +3,6 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung.spring.cloud</groupId>
     <artifactId>spring-cloud-stream-starters</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-cloud-stream-starters</name>
@@ -32,7 +31,7 @@
     </dependencyManagement>
 
     <properties>
-        <spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
+        <spring-cloud-dependencies.version>2022.0.4</spring-cloud-dependencies.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml
index 3960cfde5d..46b3e7047f 100644
--- a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml
+++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-client/pom.xml
@@ -53,6 +53,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED
+                        --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml
index c9bc120e4d..796b908bca 100644
--- a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml
+++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/eureka-server/pom.xml
@@ -53,6 +53,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED
+                        --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml
index 76d899447f..11cc992523 100644
--- a/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml
+++ b/spring-cloud-modules/spring-cloud-zuul-eureka-integration/zuul-server/pom.xml
@@ -61,6 +61,24 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <argLine>
+                        --add-opens java.base/java.lang=ALL-UNNAMED
+                        --add-opens java.base/java.util=ALL-UNNAMED
+                        --add-opens java.base/java.lang.reflect=ALL-UNNAMED
+                        --add-opens java.base/java.text=ALL-UNNAMED
+                        --add-opens java.desktop/java.awt.font=ALL-UNNAMED
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <properties>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>