Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/workflows/ci-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 8, 11, 17, 21 ]
java: [ 17, 21 ]
name: Java ${{ matrix.java }} build
steps:
- uses: actions/checkout@v4
Expand All @@ -37,8 +37,7 @@ jobs:
run: ./mvnw clean package -Dgpg.skip
- name: Compile integration tests
run: ./mvnw -Pintegration-test test-compile compile
- if: ${{ matrix.java != 8 }}
name: Check style with Spotless
- name: Check style with Spotless
run: ./mvnw spotless:check -Pintegration-test

integration-test:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
description: 'JSON array of Java versions to test'
type: string
required: false
default: '[8, 11, 17, 21]'
default: '[17, 21]'
preview:
description: 'Deploy the latest cf-deployment versions instead of the default ones'
type: boolean
Expand All @@ -21,7 +21,7 @@ on:
description: 'JSON array of Java versions to test'
type: string
required: false
default: '[8, 11, 17, 21]'
default: '[17, 21]'
preview:
description: 'Deploy the latest cf-deployment versions instead of the default ones'
type: boolean
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ${{ fromJSON(inputs.java-versions || (github.event_name == 'schedule' && '[21]' || '[8, 11, 17, 21]')) }}
java: ${{ fromJSON(inputs.java-versions || (github.event_name == 'schedule' && '[21]' || '[17, 21]')) }}
name: Java ${{ matrix.java }} integration test${{ (inputs.preview || github.event_name == 'schedule') && ' (preview)' || '' }}
steps:
- uses: actions/checkout@v7
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ Beyond that, it is helpful to capture the following information:
If you open a Github issue with a request for help, please include as much of the information above as possible and do not forget to sanitize any request/response data posted.

## Development
The project depends on Java 8. To build from source and install to your local Maven cache, run the following:
The project depends on Java 17. To build from source and install to your local Maven cache, run the following:

```shell
$ git submodule update --init --recursive
Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG base_image=openjdk:8-jre
ARG base_image=eclipse-temurin:17-jre
ARG script_image=springio/concourse-release-scripts:0.3.4

FROM ${script_image}
Expand Down
68 changes: 10 additions & 58 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@
</modules>

<properties>
<java.version>1.8</java.version>
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<dependencies.version>2.7.18</dependencies.version>
<dependencies.version>3.2.1</dependencies.version>

<commons-compress.version>1.28.0</commons-compress.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
Expand All @@ -70,9 +70,9 @@
<junit-jupiter.version>5.14.4</junit-jupiter.version>
<mockito.version>5.8.0</mockito.version>
<snakeyaml.version>2.4</snakeyaml.version>
<wire.version>3.7.1</wire.version>
<wire.version>4.9.1</wire.version>
<wire.plugin.version>3.0.2</wire.plugin.version>
<wire.suffix></wire.suffix>
<wire.suffix>-jvm</wire.suffix>
<spotless.version>2.44.4</spotless.version>
<resilience4j.version>1.7.0</resilience4j.version>
</properties>
Expand Down Expand Up @@ -178,11 +178,14 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
<fork>true</fork>
<compilerArgs>
<arg>-Xlint:all</arg>
<arg>-Xlint:-options</arg>
<arg>-Xlint:-processing</arg>
<arg>-Xlint:-serial</arg>
<arg>-J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED</arg>
</compilerArgs>
<showWarnings>true</showWarnings>
<source>${java.version}</source>
Expand All @@ -208,7 +211,9 @@
<link>https://projectreactor.io/docs/core/release/api/</link>
</links>
<quiet>true</quiet>
<source>8</source>
<source>${java.version}</source>
<!-- classpath mode: Automatic-Module-Name would otherwise switch javadoc to module mode -->
<legacyMode>true</legacyMode>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -356,69 +361,16 @@
</modules>
</profile>

<profile>
<id>jdk-17</id>
<activation>
<jdk>17</jdk>
</activation>
<properties>
<java.version>17</java.version>
<dependencies.version>3.2.1</dependencies.version>
<wire.version>4.9.1</wire.version>
<wire.plugin.version>3.0.2</wire.plugin.version>
<wire.suffix>-jvm</wire.suffix>
</properties>
<build>
<finalName>${project.artifactId}-jdk17-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
<configuration>
<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>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<profile>
<id>jdk-21</id>
<activation>
<jdk>21</jdk>
</activation>
<properties>
<java.version>21</java.version>
<dependencies.version>3.2.1</dependencies.version>
<wire.version>4.9.1</wire.version>
<wire.plugin.version>3.0.2</wire.plugin.version>
<wire.suffix>-jvm</wire.suffix>
</properties>
<build>
<finalName>${project.artifactId}-jdk21-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<!-- @see https://github.com/immutables/immutables/issues/1339#issuecomment-1016125673 -->
<configuration>
<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>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
Expand Down
Loading