diff --git a/.github/workflows/ci-java.yml b/.github/workflows/ci-java.yml
index 3d05984149..4527bdbfac 100644
--- a/.github/workflows/ci-java.yml
+++ b/.github/workflows/ci-java.yml
@@ -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
@@ -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:
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index c27d202142..24eb8ac799 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -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
@@ -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
@@ -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
diff --git a/README.md b/README.md
index 5247c0cd00..01418787ee 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 8c8b068992..66551f84cc 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -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}
diff --git a/pom.xml b/pom.xml
index 96dd501d44..af36f55fe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,10 +55,10 @@
- 1.8
+ 17
UTF-8
- 2.7.18
+ 3.2.1
1.28.0
3.20.0
@@ -70,9 +70,9 @@
5.14.4
5.8.0
2.4
- 3.7.1
+ 4.9.1
3.0.2
-
+ -jvm
2.44.4
1.7.0
@@ -178,11 +178,14 @@
maven-compiler-plugin
3.14.0
+
+ true
-Xlint:all
-Xlint:-options
-Xlint:-processing
-Xlint:-serial
+ -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
true
${java.version}
@@ -208,7 +211,9 @@
https://projectreactor.io/docs/core/release/api/
true
- 8
+ ${java.version}
+
+ true
@@ -356,39 +361,6 @@
-
- jdk-17
-
- 17
-
-
- 17
- 3.2.1
- 4.9.1
- 3.0.2
- -jvm
-
-
- ${project.artifactId}-jdk17-${project.version}
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- true
-
- -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
-
- true
- ${java.version}
- ${java.version}
-
-
-
-
-
-
jdk-21
@@ -396,29 +368,9 @@
21
- 3.2.1
- 4.9.1
- 3.0.2
- -jvm
${project.artifactId}-jdk21-${project.version}
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- true
-
- -J--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
-
- true
- ${java.version}
- ${java.version}
-
-
-