diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000000..cd236fd947 --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,30 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + java: [ 8, 11, 17, 21 ] + name: Java ${{ matrix.java }} build + steps: + - uses: actions/checkout@v4 + - name: Prepare multi-module build + run: | + git submodule update --init --recursive + - name: Set up Java + uses: actions/setup-java@v3 + with: + distribution: liberica + java-version: ${{ matrix.java }} + - name: Cache Maven packages + uses: actions/cache@v3 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build with Maven + run: ./mvnw clean install -Dgpg.skip + diff --git a/.gitignore b/.gitignore index eacf837152..176ae6fc30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -.idea/libraries -.idea/jarRepositories.xml -.idea/tasks.xml -.idea/workspace.xml +.idea/ target/ bin/ .project @@ -9,3 +6,4 @@ bin/ .settings/ .factorypath .gradle +.history \ No newline at end of file diff --git a/cloudfoundry-client-reactor/pom.xml b/cloudfoundry-client-reactor/pom.xml index b1f51a01ee..67a1d9753b 100644 --- a/cloudfoundry-client-reactor/pom.xml +++ b/cloudfoundry-client-reactor/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT cloudfoundry-client-reactor @@ -79,12 +79,18 @@ reactor-netty - javax.annotation - javax.annotation-api + jakarta.annotation + jakarta.annotation-api + 2.1.1 - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine test @@ -124,11 +130,6 @@ org.springframework spring-core - - org.springframework - spring-test - test - org.springframework spring-web diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java index 1fefd65ac4..0aea075c6f 100644 --- a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java +++ b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/_DefaultConnectionContext.java @@ -37,8 +37,8 @@ import reactor.netty.resources.LoopResources; import reactor.netty.tcp.SslProvider; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; import javax.management.JMException; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/_ReactorCloudFoundryClient.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/_ReactorCloudFoundryClient.java index 90833d4e66..29d208aad4 100644 --- a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/_ReactorCloudFoundryClient.java +++ b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/_ReactorCloudFoundryClient.java @@ -132,7 +132,7 @@ import org.immutables.value.Value; import reactor.core.publisher.Mono; -import javax.annotation.PostConstruct; +import jakarta.annotation.PostConstruct; import java.util.Collections; import java.util.Map; diff --git a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java b/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java index 63a1c63b4d..92ee626cbe 100644 --- a/cloudfoundry-client-reactor/src/main/java/org/cloudfoundry/reactor/client/v3/AbstractClientV3Operations.java +++ b/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; diff --git a/cloudfoundry-client/pom.xml b/cloudfoundry-client/pom.xml index d904e24c60..cdf66dc957 100644 --- a/cloudfoundry-client/pom.xml +++ b/cloudfoundry-client/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT cloudfoundry-client @@ -45,11 +45,16 @@ com.squareup.wire - wire-runtime + wire-runtime${wire.suffix} - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine test diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/resourcematch/_ListMatchingResourcesResponse.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/resourcematch/_ListMatchingResourcesResponse.java index 9c9c1e0cd1..96154230bd 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/resourcematch/_ListMatchingResourcesResponse.java +++ b/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; /** diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/Role.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/Role.java index 0bb0465fc7..85d5106185 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/Role.java +++ b/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; /** diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_RoleRelationships.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_RoleRelationships.java index 90299eb42b..90c4d99c51 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/roles/_RoleRelationships.java +++ b/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; diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/RouteDestinations.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/RouteDestinations.java index 476c0b3881..a8b5f235bb 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/client/v3/routes/RouteDestinations.java +++ b/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; diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_EnvelopeBatch.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_EnvelopeBatch.java index c12971e503..2ac26a35fc 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_EnvelopeBatch.java +++ b/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; diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Event.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Event.java index de330d4b98..9342ec5bf7 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Event.java +++ b/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 diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Log.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Log.java index ef8908f92a..cb001a2e19 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/logcache/v1/_Log.java +++ b/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; diff --git a/cloudfoundry-client/src/main/java/org/cloudfoundry/routing/v1/tcproutes/_TcpRoute.java b/cloudfoundry-client/src/main/java/org/cloudfoundry/routing/v1/tcproutes/_TcpRoute.java index feb1177ae4..a125309185 100644 --- a/cloudfoundry-client/src/main/java/org/cloudfoundry/routing/v1/tcproutes/_TcpRoute.java +++ b/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; /** diff --git a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java b/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java index cccfa33de0..49788574b7 100644 --- a/cloudfoundry-client/src/test/java/org/cloudfoundry/client/v3/spaces/DeleteUnmappedRoutesRequestTest.java +++ b/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 { diff --git a/cloudfoundry-operations/pom.xml b/cloudfoundry-operations/pom.xml index f31abcf959..ae53229fb5 100644 --- a/cloudfoundry-operations/pom.xml +++ b/cloudfoundry-operations/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT cloudfoundry-operations @@ -48,8 +48,13 @@ test - junit - junit + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine test diff --git a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java index f470d6d93e..d954b51e53 100644 --- a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtils.java +++ b/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. diff --git a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsCommon.java b/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsCommon.java index adf7a7b0b3..8e9171de4a 100644 --- a/cloudfoundry-operations/src/main/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsCommon.java +++ b/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 diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java index 8a3cab6ade..a69fd782cd 100644 --- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/applications/ApplicationManifestUtilsTest.java +++ b/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 { diff --git a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java b/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java index 31e015f1ec..54311e4449 100644 --- a/cloudfoundry-operations/src/test/java/org/cloudfoundry/operations/routes/DefaultRoutesTest.java +++ b/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; diff --git a/cloudfoundry-util/pom.xml b/cloudfoundry-util/pom.xml index f192624251..ac627dad00 100644 --- a/cloudfoundry-util/pom.xml +++ b/cloudfoundry-util/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT cloudfoundry-util @@ -49,9 +49,14 @@ test - junit - junit - true + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + test org.apache.commons diff --git a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java b/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java index b18771368a..5feaa87131 100644 --- a/cloudfoundry-util/src/test/java/org/cloudfoundry/util/PaginationUtilsTest.java +++ b/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; diff --git a/integration-test/pom.xml b/integration-test/pom.xml index d93d1fd9ac..e1b541e150 100644 --- a/integration-test/pom.xml +++ b/integration-test/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT integration-test @@ -44,8 +44,8 @@ test - junit - junit + org.springframework.boot + spring-boot-starter-test test @@ -76,17 +76,6 @@ ${project.version} test - - org.junit.vintage - junit-vintage-engine - test - - - org.hamcrest - hamcrest-core - - - org.immutables value @@ -102,6 +91,11 @@ spring-boot-starter-test test + + org.junit.vintage + junit-vintage-engine + test + diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java index 4f72a287e4..6af1ce3452 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/BlobstoresTest.java +++ b/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 { diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java index 16092caed3..17a195ccfb 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/DomainsTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java index 0468315d88..0c9d693197 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/FeatureFlagsTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java index 2d0018c038..d6998b88ad 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/InfoTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java index 788d14f2da..50c21b216d 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/JobsTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java index 28e9ba9444..2d3828ee36 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/OrganizationQuotaDefinitionsTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java index dd8e401b49..5f8b8549cc 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/RouteMappingsTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java index 6b1ee4fee1..2a2c63dae6 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/RoutesTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java index af063a1867..d928390e62 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBindingsTest.java +++ b/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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java index 0b79594a94..b902d9139b 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/ServiceBrokersTest.java @@ -25,8 +25,6 @@ import org.cloudfoundry.client.v2.servicebrokers.GetServiceBrokerRequest; import org.cloudfoundry.client.v2.servicebrokers.ListServiceBrokersRequest; import org.cloudfoundry.client.v2.servicebrokers.UpdateServiceBrokerRequest; -import org.cloudfoundry.client.v2.shareddomains.ListSharedDomainsRequest; -import org.cloudfoundry.client.v2.shareddomains.SharedDomainResource; import org.cloudfoundry.client.v2.spaces.CreateSpaceRequest; import org.cloudfoundry.client.v2.spaces.CreateSpaceResponse; import org.cloudfoundry.util.PaginationUtils; @@ -35,19 +33,16 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import reactor.core.Exceptions; -import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; import java.io.IOException; import java.nio.file.Path; import java.time.Duration; -import java.util.Optional; import static org.assertj.core.api.Assertions.assertThat; import static org.cloudfoundry.ServiceBrokerUtils.createServiceBroker; import static org.cloudfoundry.ServiceBrokerUtils.deleteServiceBroker; -import static org.cloudfoundry.util.tuple.TupleUtils.function; public final class ServiceBrokersTest extends AbstractIntegrationTest { diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java index 98b550c246..6cad4a136f 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/SharedDomainsTest.java @@ -37,7 +37,6 @@ import java.time.Duration; import java.util.Optional; -import java.util.concurrent.TimeoutException; public final class SharedDomainsTest extends AbstractIntegrationTest { diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java index 95a482a6f2..1da3ec5bd5 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/StacksTest.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; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java index f0809f39a1..938b74b7c4 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v2/UserProvidedServicesTest.java @@ -26,8 +26,6 @@ import org.cloudfoundry.client.v2.routes.CreateRouteResponse; import org.cloudfoundry.client.v2.servicebindings.CreateServiceBindingRequest; import org.cloudfoundry.client.v2.servicebindings.ServiceBindingResource; -import org.cloudfoundry.client.v2.shareddomains.CreateSharedDomainRequest; -import org.cloudfoundry.client.v2.shareddomains.CreateSharedDomainResponse; import org.cloudfoundry.client.v2.userprovidedserviceinstances.AssociateUserProvidedServiceInstanceRouteRequest; import org.cloudfoundry.client.v2.userprovidedserviceinstances.AssociateUserProvidedServiceInstanceRouteResponse; import org.cloudfoundry.client.v2.userprovidedserviceinstances.CreateUserProvidedServiceInstanceRequest; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java index ce82f8e958..f600afaf48 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/DeploymentsTest.java @@ -47,7 +47,6 @@ import java.nio.file.Path; import java.time.Duration; -import java.util.function.Consumer; import static org.assertj.core.api.Assertions.assertThat; import static org.cloudfoundry.util.tuple.TupleUtils.function; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java index 29c076d0d0..0588e9d3f7 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/IsolationSegmentsTest.java @@ -50,7 +50,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; import static org.cloudfoundry.util.tuple.TupleUtils.function; diff --git a/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java b/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java index b23fe747eb..b4d2596ae7 100644 --- a/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/client/v3/StacksTest.java @@ -34,7 +34,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java index b863d5d47a..27558f54f8 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/AdvancedTest.java @@ -22,7 +22,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java index 9b2e6bfbf8..4d23eca955 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/DomainsTest.java @@ -31,7 +31,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.operations.domains.Status.OWNED; diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java index dac506ae7a..fc5ad4852c 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/NetworkPoliciesTest.java @@ -34,7 +34,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; public final class NetworkPoliciesTest extends AbstractIntegrationTest { diff --git a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java index dd6f31d32b..00adc94d99 100644 --- a/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/operations/OrganizationsTest.java @@ -24,7 +24,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; public final class OrganizationsTest extends AbstractIntegrationTest { diff --git a/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java index 0bd1b66bc5..f6ee202f30 100644 --- a/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/routing/v1/RouterGroupsTest.java @@ -29,7 +29,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; public final class RouterGroupsTest extends AbstractIntegrationTest { diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java index 73497187c2..6e103bb25b 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/GroupsTest.java @@ -55,7 +55,6 @@ import java.time.Duration; import java.util.Optional; -import java.util.concurrent.TimeoutException; import static org.assertj.core.api.Assertions.assertThat; import static org.cloudfoundry.util.tuple.TupleUtils.consumer; diff --git a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java index 02413b5a8c..ff7302a994 100644 --- a/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java +++ b/integration-test/src/test/java/org/cloudfoundry/uaa/IdentityZonesTest.java @@ -31,7 +31,6 @@ import reactor.test.StepVerifier; import java.time.Duration; -import java.util.concurrent.TimeoutException; public final class IdentityZonesTest extends AbstractIntegrationTest { diff --git a/pom.xml b/pom.xml index 9c5ae51ab3..b858efbc50 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ cloudfoundry-java-client Cloud Foundry Java Client Parent A Java language binding for interacting with a Cloud Foundry instance - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT pom https://github.com/cloudfoundry/cf-java-client @@ -55,14 +55,24 @@ - 1.21 - 2.4.2 + 1.8 + UTF-8 + + 2.7.17 + + 1.24.0 + 3.13.0 1.3 - 2.8.8 + 2.10.0 + 2.15.2 0.9.0 - 0.11.2 - UTF-8 - 2.2.0 + 0.11.5 + 5.10.0 + 5.6.0 + 2.2 + 3.7.1 + 3.0.2 + @@ -85,6 +95,11 @@ wire-runtime ${wire.version} + + com.squareup.wire + wire-runtime-jvm + ${wire.version} + io.jsonwebtoken jjwt-api @@ -126,7 +141,7 @@ com.squareup.wire wire-maven-plugin - 2.2.0 + ${wire.plugin.version} generate-sources @@ -139,34 +154,33 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 - -Werror -Xlint:all -Xlint:-options -Xlint:-processing -Xlint:-serial true - 1.8 - 1.8 + ${java.version} + ${java.version} org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.3.0 org.apache.maven.plugins maven-deploy-plugin - 2.8.2 + 3.1.1 org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.6.0 https://projectreactor.io/docs/core/release/api/ @@ -186,7 +200,7 @@ org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -199,7 +213,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.22.2 + 3.1.2 random @@ -211,7 +225,7 @@ org.jfrog.buildinfo artifactory-maven-plugin - 2.7.0 + 3.6.1 false @@ -235,7 +249,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts @@ -300,6 +314,74 @@ test-service-broker + + + jdk-17 + + 17 + + + 17 + 3.1.5 + 4.9.1 + 3.0.2 + -jvm + + + ${project.artifactId}-jdk17-${project.version} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + true + + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + + true + ${java.version} + ${java.version} + + + + + + + + jdk-21 + + 21 + + + 21 + 3.1.5 + 4.9.1 + 3.0.2 + -jvm + + + ${project.artifactId}-jdk21-${project.version} + + + org.apache.maven.plugins + maven-compiler-plugin + 3.11.0 + + + true + + -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED + + true + ${java.version} + ${java.version} + + + + + diff --git a/test-log-cache/pom.xml b/test-log-cache/pom.xml index 54d59a6261..b0acf66c67 100644 --- a/test-log-cache/pom.xml +++ b/test-log-cache/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT test-log-cache diff --git a/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java b/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java index d1daa10d1d..440918b866 100644 --- a/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java +++ b/test-log-cache/src/main/java/org/cloudfoundry/logcachetest/package-info.java @@ -24,5 +24,3 @@ typeImmutable = "*" ) package org.cloudfoundry.logcachetest; - -import org.immutables.value.Value; diff --git a/test-service-broker/pom.xml b/test-service-broker/pom.xml index fce8741c19..f86e316dde 100644 --- a/test-service-broker/pom.xml +++ b/test-service-broker/pom.xml @@ -25,7 +25,7 @@ org.cloudfoundry cloudfoundry-java-client - 5.11.0.BUILD-SNAPSHOT + 5.12.0.BUILD-SNAPSHOT test-service-broker diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java index 044653808f..4379da6be3 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/binding/_UnbindResponse.java @@ -16,8 +16,6 @@ package org.cloudfoundry.servicebroker.binding; -import org.immutables.value.Value; - @Value.Immutable abstract class _UnbindResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java index a4ec3c5f22..cb078134a4 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_DeprovisionSyncResponse.java @@ -16,8 +16,6 @@ package org.cloudfoundry.servicebroker.instance; -import org.immutables.value.Value; - @Value.Immutable abstract class _DeprovisionSyncResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java index e288a0a6df..b33cce5ef2 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/instance/_UpdateSyncResponse.java @@ -16,8 +16,6 @@ package org.cloudfoundry.servicebroker.instance; -import org.immutables.value.Value; - @Value.Immutable abstract class _UpdateSyncResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java index ff669bcdb1..2492975420 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/lastoperation/_LastOperationDeprovisionResponse.java @@ -16,8 +16,6 @@ package org.cloudfoundry.servicebroker.lastoperation; -import org.immutables.value.Value; - @Value.Immutable abstract class _LastOperationDeprovisionResponse { diff --git a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java index cd1e62f229..217d28ba61 100644 --- a/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java +++ b/test-service-broker/src/main/java/org/cloudfoundry/servicebroker/package-info.java @@ -28,5 +28,3 @@ typeImmutable = "*" ) package org.cloudfoundry.servicebroker; - -import org.immutables.value.Value;