Skip to content

Commit 32830ee

Browse files
committed
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 #1198.
1 parent 434ac05 commit 32830ee

File tree

52 files changed

+146
-119
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+146
-119
lines changed

cloudfoundry-client-reactor/pom.xml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.cloudfoundry</groupId>
2727
<artifactId>cloudfoundry-java-client</artifactId>
28-
<version>5.11.0.BUILD-SNAPSHOT</version>
28+
<version>5.12.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>cloudfoundry-client-reactor</artifactId>
@@ -81,10 +81,16 @@
8181
<dependency>
8282
<groupId>javax.annotation</groupId>
8383
<artifactId>javax.annotation-api</artifactId>
84+
<version>1.3.2</version>
8485
</dependency>
8586
<dependency>
86-
<groupId>junit</groupId>
87-
<artifactId>junit</artifactId>
87+
<groupId>org.springframework.boot</groupId>
88+
<artifactId>spring-boot-starter-test</artifactId>
89+
<scope>test</scope>
90+
</dependency>
91+
<dependency>
92+
<groupId>org.junit.vintage</groupId>
93+
<artifactId>junit-vintage-engine</artifactId>
8894
<scope>test</scope>
8995
</dependency>
9096
<dependency>
@@ -124,11 +130,6 @@
124130
<groupId>org.springframework</groupId>
125131
<artifactId>spring-core</artifactId>
126132
</dependency>
127-
<dependency>
128-
<groupId>org.springframework</groupId>
129-
<artifactId>spring-test</artifactId>
130-
<scope>test</scope>
131-
</dependency>
132133
<dependency>
133134
<groupId>org.springframework</groupId>
134135
<artifactId>spring-web</artifactId>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import reactor.netty.http.client.HttpClientRequest;
3838
import reactor.netty.http.client.HttpClientResponse;
3939

40-
import java.nio.charset.Charset;
4140
import java.util.List;
4241
import java.util.Map;
4342
import java.util.function.BiConsumer;

cloudfoundry-client/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<parent>
2626
<groupId>org.cloudfoundry</groupId>
2727
<artifactId>cloudfoundry-java-client</artifactId>
28-
<version>5.11.0.BUILD-SNAPSHOT</version>
28+
<version>5.12.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>cloudfoundry-client</artifactId>
@@ -45,11 +45,16 @@
4545
</dependency>
4646
<dependency>
4747
<groupId>com.squareup.wire</groupId>
48-
<artifactId>wire-runtime</artifactId>
48+
<artifactId>wire-runtime${wire.suffix}</artifactId>
4949
</dependency>
5050
<dependency>
51-
<groupId>junit</groupId>
52-
<artifactId>junit</artifactId>
51+
<groupId>org.springframework.boot</groupId>
52+
<artifactId>spring-boot-starter-test</artifactId>
53+
<scope>test</scope>
54+
</dependency>
55+
<dependency>
56+
<groupId>org.junit.vintage</groupId>
57+
<artifactId>junit-vintage-engine</artifactId>
5358
<scope>test</scope>
5459
</dependency>
5560
<dependency>

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,9 @@
1616

1717
package org.cloudfoundry.client.v3.resourcematch;
1818

19-
import com.fasterxml.jackson.core.JsonParser;
20-
import com.fasterxml.jackson.core.type.TypeReference;
21-
import com.fasterxml.jackson.databind.DeserializationContext;
2219
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
23-
import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
2420
import org.immutables.value.Value;
2521

26-
import java.io.IOException;
2722
import java.util.List;
2823

2924
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package org.cloudfoundry.client.v3.roles;
1818

1919
import com.fasterxml.jackson.annotation.JsonProperty;
20-
import org.cloudfoundry.Nullable;
2120
import org.cloudfoundry.client.v3.Resource;
2221

2322
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.fasterxml.jackson.annotation.JsonProperty;
2020
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
21-
import org.cloudfoundry.AllowNulls;
2221
import org.cloudfoundry.Nullable;
2322
import org.cloudfoundry.client.v3.ToOneRelationship;
2423
import org.immutables.value.Value;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.cloudfoundry.client.v3.routes;
22

33
import com.fasterxml.jackson.annotation.JsonProperty;
4-
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
54
import org.cloudfoundry.AllowNulls;
65
import org.cloudfoundry.client.v3.Link;
76

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.fasterxml.jackson.annotation.JsonProperty;
2020
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
21-
import org.cloudfoundry.doppler.HttpStartStop;
2221
import org.immutables.value.Value;
2322

2423
import java.util.List;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.fasterxml.jackson.annotation.JsonProperty;
2020
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
2121
import org.cloudfoundry.Nullable;
22-
import org.cloudfoundry.doppler.HttpStartStop;
2322
import org.immutables.value.Value;
2423

2524
@JsonDeserialize

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.fasterxml.jackson.annotation.JsonProperty;
2020
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
2121
import org.cloudfoundry.Nullable;
22-
import org.cloudfoundry.doppler.HttpStartStop;
2322
import org.immutables.value.Value;
2423

2524
import java.nio.ByteBuffer;

0 commit comments

Comments
 (0)