Prepare for an eventual 6.0.0 release

* Set Java 17 as baseline * Upgrade version of all cf-java-client artifacts to be 6.0.0.BUILD-SNAPSHOT * Upgrade Spring Boot to 3.1.4 * Occurrences of Square's wire-runtime dependency replaced with wire-runtime-jvm * Replace occurrences of JUnit 4 dependencies with spring-boot-starter-test and junit-vintage-engine * a larger refactor would be required to fully embrace JUnit 5 * Add .history folder to .gitignore - useful when developing with Visual Studio Code IDE * Upgrade other third-party dependency and plugin versions to latest available * Update maven-compiler-plugin compilerArg configuration to support Java 17
cloudfoundry · Oct 3, 2023 · 75ea5ee · 75ea5ee
1 parent de27c8f
commit 75ea5ee
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 59 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ bin/
 .settings/
 .factorypath
 .gradle
+.history
diff --git a/cloudfoundry-client-reactor/pom.xml b/cloudfoundry-client-reactor/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client-reactor</artifactId>
@@ -81,10 +81,17 @@
         <dependency>
             <groupId>javax.annotation</groupId>
             <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -124,11 +131,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-core</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>

diff --git a/cloudfoundry-client/pom.xml b/cloudfoundry-client/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client</artifactId>
@@ -45,11 +45,17 @@
         </dependency>
         <dependency>
             <groupId>com.squareup.wire</groupId>
-            <artifactId>wire-runtime</artifactId>
+            <artifactId>wire-runtime-jvm</artifactId>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cloudfoundry-operations/pom.xml b/cloudfoundry-operations/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-operations</artifactId>
@@ -48,8 +48,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.9.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/cloudfoundry-util/pom.xml b/cloudfoundry-util/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-util</artifactId>
@@ -49,9 +49,15 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <optional>true</optional>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.9.3</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

diff --git a/integration-test/pom.xml b/integration-test/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>integration-test</artifactId>
@@ -44,8 +44,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -76,17 +76,6 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hamcrest</groupId>
-                    <artifactId>hamcrest-core</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
@@ -102,6 +91,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <version>5.9.3</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <artifactId>cloudfoundry-java-client</artifactId>
     <name>Cloud Foundry Java Client Parent</name>
     <description>A Java language binding for interacting with a Cloud Foundry instance</description>
-    <version>5.11.0.BUILD-SNAPSHOT</version>
+    <version>6.0.0.BUILD-SNAPSHOT</version>
     <packaging>pom</packaging>
     <url>https://github.com/cloudfoundry/cf-java-client</url>
 
@@ -55,14 +55,15 @@
     </modules>
 
     <properties>
-        <commons-compress.version>1.21</commons-compress.version>
-        <dependencies.version>2.4.2</dependencies.version>
+        <java.version>17</java.version>
+        <commons-compress.version>1.24.0</commons-compress.version>
+        <dependencies.version>3.1.4</dependencies.version>
         <evo-inflector.version>1.3</evo-inflector.version>
-        <immutables.version>2.8.8</immutables.version>
+        <immutables.version>2.9.2</immutables.version>
         <java-semver.version>0.9.0</java-semver.version>
-        <jjwt.version>0.11.2</jjwt.version>
+        <jjwt.version>0.11.5</jjwt.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <wire.version>2.2.0</wire.version>
+        <wire.version>4.9.1</wire.version>
     </properties>
 
     <dependencyManagement>
@@ -82,7 +83,7 @@
             </dependency>
             <dependency>
                 <groupId>com.squareup.wire</groupId>
-                <artifactId>wire-runtime</artifactId>
+                <artifactId>wire-runtime-jvm</artifactId>
                 <version>${wire.version}</version>
             </dependency>
             <dependency>
@@ -126,7 +127,7 @@
                 <plugin>
                     <groupId>com.squareup.wire</groupId>
                     <artifactId>wire-maven-plugin</artifactId>
-                    <version>2.2.0</version>
+                    <version>3.0.2</version>
                     <executions>
                         <execution>
                             <phase>generate-sources</phase>
@@ -139,34 +140,32 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.1</version>
+                    <version>3.11.0</version>
+                    <!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
                     <configuration>
-                        <compilerArgs>
-                            <arg>-Werror</arg>
-                            <arg>-Xlint:all</arg>
-                            <arg>-Xlint:-options</arg>
-                            <arg>-Xlint:-processing</arg>
-                            <arg>-Xlint:-serial</arg>
+                        <fork>true</fork>
+                        <compilerArgs combine.children="append">
+                            <arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
                         </compilerArgs>
                         <showWarnings>true</showWarnings>
-                        <source>1.8</source>
-                        <target>1.8</target>
+                        <source>${java.version}</source>
+                        <target>${java.version}</target>
                     </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <links>
                             <link>https://projectreactor.io/docs/core/release/api/</link>
@@ -186,7 +185,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-source-plugin</artifactId>
-                    <version>3.2.1</version>
+                    <version>3.3.0</version>
                     <executions>
                         <execution>
                             <id>attach-sources</id>
@@ -199,7 +198,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.2</version>
+                    <version>3.1.2</version>
                     <configuration>
                         <runOrder>random</runOrder>
                     </configuration>
@@ -211,7 +210,7 @@
             <plugin>
                 <groupId>org.jfrog.buildinfo</groupId>
                 <artifactId>artifactory-maven-plugin</artifactId>
-                <version>2.7.0</version>
+                <version>3.6.1</version>
                 <inherited>false</inherited>
                 <executions>
                     <execution>
@@ -235,7 +234,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>

diff --git a/test-log-cache/pom.xml b/test-log-cache/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-log-cache</artifactId>

diff --git a/test-service-broker/pom.xml b/test-service-broker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.cloudfoundry</groupId>
         <artifactId>cloudfoundry-java-client</artifactId>
-        <version>5.11.0.BUILD-SNAPSHOT</version>
+        <version>6.0.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>test-service-broker</artifactId>