Skip to content

Commit 75ea5ee

Browse files
pacphipacphi
committed
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
1 parent de27c8f commit 75ea5ee

File tree

9 files changed

+74
-59
lines changed

9 files changed

+74
-59
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ bin/
99
.settings/
1010
.factorypath
1111
.gradle
12+
.history

‎cloudfoundry-client-reactor/pom.xml‎

Lines changed: 10 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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>cloudfoundry-client-reactor</artifactId>
@@ -81,10 +81,17 @@
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>
94+
<version>5.9.3</version>
8895
<scope>test</scope>
8996
</dependency>
9097
<dependency>
@@ -124,11 +131,6 @@
124131
<groupId>org.springframework</groupId>
125132
<artifactId>spring-core</artifactId>
126133
</dependency>
127-
<dependency>
128-
<groupId>org.springframework</groupId>
129-
<artifactId>spring-test</artifactId>
130-
<scope>test</scope>
131-
</dependency>
132134
<dependency>
133135
<groupId>org.springframework</groupId>
134136
<artifactId>spring-web</artifactId>

‎cloudfoundry-client/pom.xml‎

Lines changed: 10 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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>cloudfoundry-client</artifactId>
@@ -45,11 +45,17 @@
4545
</dependency>
4646
<dependency>
4747
<groupId>com.squareup.wire</groupId>
48-
<artifactId>wire-runtime</artifactId>
48+
<artifactId>wire-runtime-jvm</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>
58+
<version>5.9.3</version>
5359
<scope>test</scope>
5460
</dependency>
5561
<dependency>

‎cloudfoundry-operations/pom.xml‎

Lines changed: 9 additions & 3 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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>cloudfoundry-operations</artifactId>
@@ -48,8 +48,14 @@
4848
<scope>test</scope>
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>
58+
<version>5.9.3</version>
5359
<scope>test</scope>
5460
</dependency>
5561
<dependency>

‎cloudfoundry-util/pom.xml‎

Lines changed: 10 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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>cloudfoundry-util</artifactId>
@@ -49,9 +49,15 @@
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>
52-
<groupId>junit</groupId>
53-
<artifactId>junit</artifactId>
54-
<optional>true</optional>
52+
<groupId>org.springframework.boot</groupId>
53+
<artifactId>spring-boot-starter-test</artifactId>
54+
<scope>test</scope>
55+
</dependency>
56+
<dependency>
57+
<groupId>org.junit.vintage</groupId>
58+
<artifactId>junit-vintage-engine</artifactId>
59+
<version>5.9.3</version>
60+
<scope>test</scope>
5561
</dependency>
5662
<dependency>
5763
<groupId>org.apache.commons</groupId>

‎integration-test/pom.xml‎

Lines changed: 9 additions & 14 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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>integration-test</artifactId>
@@ -44,8 +44,8 @@
4444
<scope>test</scope>
4545
</dependency>
4646
<dependency>
47-
<groupId>junit</groupId>
48-
<artifactId>junit</artifactId>
47+
<groupId>org.springframework.boot</groupId>
48+
<artifactId>spring-boot-starter-test</artifactId>
4949
<scope>test</scope>
5050
</dependency>
5151
<dependency>
@@ -76,17 +76,6 @@
7676
<version>${project.version}</version>
7777
<scope>test</scope>
7878
</dependency>
79-
<dependency>
80-
<groupId>org.junit.vintage</groupId>
81-
<artifactId>junit-vintage-engine</artifactId>
82-
<scope>test</scope>
83-
<exclusions>
84-
<exclusion>
85-
<groupId>org.hamcrest</groupId>
86-
<artifactId>hamcrest-core</artifactId>
87-
</exclusion>
88-
</exclusions>
89-
</dependency>
9079
<dependency>
9180
<groupId>org.immutables</groupId>
9281
<artifactId>value</artifactId>
@@ -102,6 +91,12 @@
10291
<artifactId>spring-boot-starter-test</artifactId>
10392
<scope>test</scope>
10493
</dependency>
94+
<dependency>
95+
<groupId>org.junit.vintage</groupId>
96+
<artifactId>junit-vintage-engine</artifactId>
97+
<version>5.9.3</version>
98+
<scope>test</scope>
99+
</dependency>
105100
</dependencies>
106101

107102
<build>

‎pom.xml‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<artifactId>cloudfoundry-java-client</artifactId>
2424
<name>Cloud Foundry Java Client Parent</name>
2525
<description>A Java language binding for interacting with a Cloud Foundry instance</description>
26-
<version>5.11.0.BUILD-SNAPSHOT</version>
26+
<version>6.0.0.BUILD-SNAPSHOT</version>
2727
<packaging>pom</packaging>
2828
<url>https://github.com/cloudfoundry/cf-java-client</url>
2929

@@ -55,14 +55,15 @@
5555
</modules>
5656

5757
<properties>
58-
<commons-compress.version>1.21</commons-compress.version>
59-
<dependencies.version>2.4.2</dependencies.version>
58+
<java.version>17</java.version>
59+
<commons-compress.version>1.24.0</commons-compress.version>
60+
<dependencies.version>3.1.4</dependencies.version>
6061
<evo-inflector.version>1.3</evo-inflector.version>
61-
<immutables.version>2.8.8</immutables.version>
62+
<immutables.version>2.9.2</immutables.version>
6263
<java-semver.version>0.9.0</java-semver.version>
63-
<jjwt.version>0.11.2</jjwt.version>
64+
<jjwt.version>0.11.5</jjwt.version>
6465
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
65-
<wire.version>2.2.0</wire.version>
66+
<wire.version>4.9.1</wire.version>
6667
</properties>
6768

6869
<dependencyManagement>
@@ -82,7 +83,7 @@
8283
</dependency>
8384
<dependency>
8485
<groupId>com.squareup.wire</groupId>
85-
<artifactId>wire-runtime</artifactId>
86+
<artifactId>wire-runtime-jvm</artifactId>
8687
<version>${wire.version}</version>
8788
</dependency>
8889
<dependency>
@@ -126,7 +127,7 @@
126127
<plugin>
127128
<groupId>com.squareup.wire</groupId>
128129
<artifactId>wire-maven-plugin</artifactId>
129-
<version>2.2.0</version>
130+
<version>3.0.2</version>
130131
<executions>
131132
<execution>
132133
<phase>generate-sources</phase>
@@ -139,34 +140,32 @@
139140
<plugin>
140141
<groupId>org.apache.maven.plugins</groupId>
141142
<artifactId>maven-compiler-plugin</artifactId>
142-
<version>3.8.1</version>
143+
<version>3.11.0</version>
144+
<!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
143145
<configuration>
144-
<compilerArgs>
145-
<arg>-Werror</arg>
146-
<arg>-Xlint:all</arg>
147-
<arg>-Xlint:-options</arg>
148-
<arg>-Xlint:-processing</arg>
149-
<arg>-Xlint:-serial</arg>
146+
<fork>true</fork>
147+
<compilerArgs combine.children="append">
148+
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
150149
</compilerArgs>
151150
<showWarnings>true</showWarnings>
152-
<source>1.8</source>
153-
<target>1.8</target>
151+
<source>${java.version}</source>
152+
<target>${java.version}</target>
154153
</configuration>
155154
</plugin>
156155
<plugin>
157156
<groupId>org.apache.maven.plugins</groupId>
158157
<artifactId>maven-jar-plugin</artifactId>
159-
<version>3.2.0</version>
158+
<version>3.3.0</version>
160159
</plugin>
161160
<plugin>
162161
<groupId>org.apache.maven.plugins</groupId>
163162
<artifactId>maven-deploy-plugin</artifactId>
164-
<version>2.8.2</version>
163+
<version>3.1.1</version>
165164
</plugin>
166165
<plugin>
167166
<groupId>org.apache.maven.plugins</groupId>
168167
<artifactId>maven-javadoc-plugin</artifactId>
169-
<version>3.2.0</version>
168+
<version>3.6.0</version>
170169
<configuration>
171170
<links>
172171
<link>https://projectreactor.io/docs/core/release/api/</link>
@@ -186,7 +185,7 @@
186185
<plugin>
187186
<groupId>org.apache.maven.plugins</groupId>
188187
<artifactId>maven-source-plugin</artifactId>
189-
<version>3.2.1</version>
188+
<version>3.3.0</version>
190189
<executions>
191190
<execution>
192191
<id>attach-sources</id>
@@ -199,7 +198,7 @@
199198
<plugin>
200199
<groupId>org.apache.maven.plugins</groupId>
201200
<artifactId>maven-surefire-plugin</artifactId>
202-
<version>2.22.2</version>
201+
<version>3.1.2</version>
203202
<configuration>
204203
<runOrder>random</runOrder>
205204
</configuration>
@@ -211,7 +210,7 @@
211210
<plugin>
212211
<groupId>org.jfrog.buildinfo</groupId>
213212
<artifactId>artifactory-maven-plugin</artifactId>
214-
<version>2.7.0</version>
213+
<version>3.6.1</version>
215214
<inherited>false</inherited>
216215
<executions>
217216
<execution>
@@ -235,7 +234,7 @@
235234
<plugin>
236235
<groupId>org.apache.maven.plugins</groupId>
237236
<artifactId>maven-gpg-plugin</artifactId>
238-
<version>3.0.1</version>
237+
<version>3.1.0</version>
239238
<executions>
240239
<execution>
241240
<id>sign-artifacts</id>

‎test-log-cache/pom.xml‎

Lines changed: 1 addition & 1 deletion
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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>test-log-cache</artifactId>

‎test-service-broker/pom.xml‎

Lines changed: 1 addition & 1 deletion
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>6.0.0.BUILD-SNAPSHOT</version>
2929
</parent>
3030

3131
<artifactId>test-service-broker</artifactId>

0 commit comments

Comments
 (0)