Merge pull request #14788 from panos-kakos/JAVA-22209

[JAVA-22209] Upgraded spring-cloud-zuul-eureka-integration module to …
2023-09-30 14:10:54 +02:00 · 2023-09-30 14:10:54 +02:00 · e626b17c6e
parent a93751923d 0907865ea6
commit e626b17c6e
12 changed files with 117 additions and 10 deletions
--- a/pom.xml
+++ b/pom.xml
@ -723,9 +723,12 @@
                <module>spring-boot-rest</module>
                <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-data-flow</module>
-                <module>spring-cloud-modules/spring-cloud-circuit-breaker</module>
+                <module>spring-cloud-modules/spring-cloud-netflix-feign</module>
+                <module>spring-cloud-modules/spring-cloud-stream-starters</module>
+                <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
                <module>spring-exceptions</module>
                <module>spring-jenkins-pipeline</module>
                <module>spring-core</module>
@ -1001,6 +1004,10 @@
                <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-netflix-feign</module>
+                <module>spring-cloud-modules/spring-cloud-stream-starters</module>
+                <module>spring-cloud-modules/spring-cloud-zuul-eureka-integration</module>
                <module>spring-exceptions</module>
                <module>spring-jenkins-pipeline</module>
                <module>spring-core</module>
@ -1213,7 +1220,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>
--- a/spring-cloud-modules/pom.xml
+++ b/spring-cloud-modules/pom.xml
@ -27,11 +27,11 @@
        <module>spring-cloud-gateway</module>
        <module>spring-cloud-gateway-2</module>
        <module>spring-cloud-stream</module>
-        <module>spring-cloud-stream-starters</module>
+        <!--        <module>spring-cloud-stream-starters</module>-->
        <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>
@ -46,7 +46,7 @@
        <!--        <module>spring-cloud-circuit-breaker</module>-->
        <module>spring-cloud-eureka-self-preservation</module>
        <module>spring-cloud-openfeign</module>
-        <module>spring-cloud-netflix-feign</module>
+        <!--        <module>spring-cloud-netflix-feign</module>-->
        <module>spring-cloud-netflix-sidecar</module>
        <module>spring-cloud-sentinel</module>
        <module>spring-cloud-dapr</module>
--- 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>
--- 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>
--- 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>
--- 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>
--- a/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml
+++ b/spring-cloud-modules/spring-cloud-netflix-feign/pom.xml
@ -58,6 +58,20 @@
        </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
+                    </argLine>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
    <properties>
        <spring-cloud.version>Camden.SR7</spring-cloud.version>
        <feign-ok.version>8.18.0</feign-ok.version>
--- 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>
--- a/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml
+++ b/spring-cloud-modules/spring-cloud-stream-starters/twitterhdfs/pom.xml
@ -61,16 +61,21 @@
            <groupId>org.junit.vintage</groupId>
            <artifactId>junit-vintage-engine</artifactId>
        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+            <version>${groovy.version}</version>
+        </dependency>
    </dependencies>

    <build>
+        <finalName>twitterhdfs</finalName>
        <plugins>
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
        </plugins>
-        <finalName>twitterhdfs</finalName>
    </build>

    <properties>
@ -83,6 +88,7 @@
        <junit.version>4.13.2</junit.version>
        <junit-jupiter.version>5.8.1</junit-jupiter.version>
        <log4j2.version>2.17.1</log4j2.version>
+        <groovy.version>3.0.8</groovy.version>
    </properties>

 </project>
--- 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>
--- 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>
--- 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>