Upgrades to cf-java-client

It's been 7 months since the 5.10.0.RELEASE. The current release documentation states that that release is compatible with Spring Boot release versions up to 2.6.x. Meanwhile, Spring Boot 3.1.x is the current release, with Spring Boot 3.2.x nearing GA.

There's not much that needed to change to prepare a version of the cf-java-client to be compatible with Spring Boot 3.1.x, but it does require setting target to Java 17. That required a change to the maven-compiler-plugin compileArgs configuration to facilitate source code generation and data-binding when using Immutables. I also took the test dependencies forward, so that in the future, the tests could be refactored to leverage JUnit 5 APIs. The rest of the changes are pretty straight-forward, just upgrades to dependencies and plugins to the latest available as of the date of this pull request.

Default build with Maven 3.9.4 targets Java 8 and upgrades Spring Boot to 2.7.16.

Maven profiles get activated based on the installed version of the JDK detected.  These profiles update the dependencies and plugins to support compilation and testing on Java 17 and 21 with Spring Boot 3.1.4 dependency management.

A Github Action workflow was added to provide signal on "good builds".

Currently, tests fail when targeting either Java 17 or 21.  See this open issue for more details: immutables/immutables#1339.

> This PR was based upon earlier work in cloudfoundry#1198.

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>5.12.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client-reactor</artifactId>
@@ -81,10 +81,16 @@
         <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>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -124,11 +130,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>

cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java

@@ -37,7 +37,6 @@
 import reactor.netty.http.client.HttpClientRequest;
 import reactor.netty.http.client.HttpClientResponse;
 
-import java.nio.charset.Charset;
 import java.util.List;
 import java.util.Map;
 import java.util.function.BiConsumer;

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>5.12.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-client</artifactId>
@@ -45,11 +45,16 @@
         </dependency>
         <dependency>
             <groupId>com.squareup.wire</groupId>
-            <artifactId>wire-runtime</artifactId>
+            <artifactId>wire-runtime${wire.suffix}</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>
             <scope>test</scope>
         </dependency>
         <dependency>

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/resourcematch/_ListMatchingResourcesResponse.java

@@ -16,14 +16,9 @@
 
 package org.cloudfoundry.client.v3.resourcematch;
 
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
 import org.immutables.value.Value;
 
-import java.io.IOException;
 import java.util.List;
 
 /**

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/Role.java

@@ -17,7 +17,6 @@
 package org.cloudfoundry.client.v3.roles;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import org.cloudfoundry.Nullable;
 import org.cloudfoundry.client.v3.Resource;
 
 /**

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_RoleRelationships.java

@@ -18,7 +18,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.Nullable;
 import org.cloudfoundry.client.v3.ToOneRelationship;
 import org.immutables.value.Value;

cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/RouteDestinations.java

@@ -1,7 +1,6 @@
 package org.cloudfoundry.client.v3.routes;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.AllowNulls;
 import org.cloudfoundry.client.v3.Link;
 

cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_EnvelopeBatch.java

@@ -18,7 +18,6 @@
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.cloudfoundry.doppler.HttpStartStop;
 import org.immutables.value.Value;
 
 import java.util.List;

cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Event.java

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.Nullable;
-import org.cloudfoundry.doppler.HttpStartStop;
 import org.immutables.value.Value;
 
 @JsonDeserialize

cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Log.java

@@ -19,7 +19,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import org.cloudfoundry.Nullable;
-import org.cloudfoundry.doppler.HttpStartStop;
 import org.immutables.value.Value;
 
 import java.nio.ByteBuffer;

cloudfoundry-client/src/main/java/org/cloudfoundry/routing/v1/tcproutes/_TcpRoute.java

@@ -16,9 +16,7 @@
 
 package org.cloudfoundry.routing.v1.tcproutes;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import org.cloudfoundry.routing.v1.ModificationTag;
 import org.immutables.value.Value;
 
 /**

cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java

@@ -16,7 +16,6 @@
 
 package org.cloudfoundry.client.v3.spaces;
 
-import org.cloudfoundry.client.v3.routes.DeleteRouteRequest;
 import org.junit.Test;
 
 public class DeleteUnmappedRoutesRequestTest {

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>5.12.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-operations</artifactId>
@@ -48,8 +48,13 @@
             <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>
             <scope>test</scope>
         </dependency>
         <dependency>

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java

@@ -30,14 +30,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.TreeMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static java.util.Collections.emptyMap;
 import static java.util.stream.Collectors.toMap;
 
-import static org.cloudfoundry.operations.applications.ApplicationManifestUtilsCommon.*;
 
 /**
  * Utilities for dealing with {@link ApplicationManifest}s.  Includes the functionality to transform to and from standard CLI YAML files.

cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsCommon.java

@@ -27,7 +27,6 @@
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -42,7 +41,6 @@
 import java.util.stream.Collectors;
 
 import static java.util.Collections.emptyMap;
-import static java.util.stream.Collectors.toMap;
 
 /**
  * Common base class for dealing with manifests

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java

@@ -33,8 +33,6 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType;
 import static org.cloudfoundry.operations.applications.ApplicationHealthCheck.NONE;
 import static org.cloudfoundry.operations.applications.ApplicationHealthCheck.PORT;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThrows;
 import static org.junit.Assume.assumeTrue;
 
 public final class ApplicationManifestUtilsTest {

cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java

@@ -40,9 +40,6 @@
 import org.cloudfoundry.client.v2.routes.RouteEntity;
 import org.cloudfoundry.client.v2.routes.RouteExistsRequest;
 import org.cloudfoundry.client.v2.routes.RouteResource;
-import org.cloudfoundry.client.v2.serviceinstances.GetServiceInstanceRequest;
-import org.cloudfoundry.client.v2.serviceinstances.GetServiceInstanceResponse;
-import org.cloudfoundry.client.v2.serviceinstances.ServiceInstanceResource;
 import org.cloudfoundry.client.v2.serviceinstances.UnionServiceInstanceEntity;
 import org.cloudfoundry.client.v2.serviceinstances.UnionServiceInstanceResource;
 import org.cloudfoundry.client.v2.shareddomains.ListSharedDomainsRequest;

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>5.12.0.BUILD-SNAPSHOT</version>
     </parent>
 
     <artifactId>cloudfoundry-util</artifactId>
@@ -49,9 +49,14 @@
             <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>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>

cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java

@@ -41,7 +41,6 @@
 
 import java.time.Duration;
 import java.util.Collections;
-import java.util.concurrent.TimeoutException;
 
 import static org.mockito.Mockito.RETURNS_SMART_NULLS;
 import static org.mockito.Mockito.mock;

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>5.12.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,11 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.vintage</groupId>
+            <artifactId>junit-vintage-engine</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java

@@ -25,7 +25,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 public final class BlobstoresTest extends AbstractIntegrationTest {
 

integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java

@@ -53,7 +53,6 @@
 import reactor.util.function.Tuple2;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;

integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java

@@ -33,7 +33,6 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
 import static org.assertj.core.api.Assertions.assertThat;

integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java

@@ -25,7 +25,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.client.CloudFoundryClient.SUPPORTED_API_VERSION;

integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java

@@ -29,7 +29,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 import static org.cloudfoundry.util.tuple.TupleUtils.predicate;
 

integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java

@@ -35,7 +35,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java

@@ -39,7 +39,6 @@
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.cloudfoundry.util.tuple.TupleUtils.consumer;

integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java

@@ -48,7 +48,6 @@
 import reactor.util.function.Tuple3;
 
 import java.time.Duration;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;

integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java

@@ -44,7 +44,6 @@
 
 import java.time.Duration;
 import java.util.Optional;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Consumer;
 
 import static org.assertj.core.api.Assertions.assertThat;