From e0c7208f9c070ba3d77d664b71449dcc004918de Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Sat, 14 Sep 2024 10:27:49 +0200 Subject: [PATCH 1/5] Build against early access JDK 23 release --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aa8e3d8c6d..5bf0ed04b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ ubuntu-22.04 ] - jdk: [ 17.0.10, 21.0.2, 22.0.2 ] + jdk: [ 17.0.10, 21.0.2, 22.0.2, 23-ea ] distribution: [ temurin ] experimental: [ false ] include: From 6e76998c8a7ce055ecb0a2fdb1fada95cef21b7b Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Sun, 27 Oct 2024 15:00:46 +0100 Subject: [PATCH 2/5] Bumps --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5bf0ed04b0..ad52d2d902 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,7 +10,7 @@ jobs: strategy: matrix: os: [ ubuntu-22.04 ] - jdk: [ 17.0.10, 21.0.2, 22.0.2, 23-ea ] + jdk: [ 17.0.13, 21.0.5, 23.0.1 ] distribution: [ temurin ] experimental: [ false ] include: From a79397e98fdcd403df2dfa6470a5c0c403d2b114 Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Sun, 27 Oct 2024 15:11:02 +0100 Subject: [PATCH 3/5] More bumps --- .github/ISSUE_TEMPLATE/bug_report.md | 6 +++--- .github/workflows/build.yml | 4 ++-- .github/workflows/codeql.yml | 2 +- .github/workflows/pitest-analyze-pr.yml | 2 +- .github/workflows/pitest-update-pr.yml | 2 +- .github/workflows/run-integration-tests.yml | 2 +- .github/workflows/sonarcloud.yml | 2 +- website/generate-version-compatibility-overview.sh | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index c9d07f799c..2873c20108 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -42,9 +42,9 @@ Please replace this sentence with log output, if applicable. - Operating system (e.g. MacOS Monterey). -- Java version (i.e. `java --version`, e.g. `17.0.10`). -- Error Prone version (e.g. `2.25.0`). -- Error Prone Support version (e.g. `0.15.0`). +- Java version (i.e. `java --version`, e.g. `17.0.13`). +- Error Prone version (e.g. `2.35.1`). +- Error Prone Support version (e.g. `0.18.0`). ### Additional context diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ad52d2d902..0c7dbdd179 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,11 +15,11 @@ jobs: experimental: [ false ] include: - os: macos-14 - jdk: 17.0.10 + jdk: 17.0.13 distribution: temurin experimental: false - os: windows-2022 - jdk: 17.0.10 + jdk: 17.0.13 distribution: temurin experimental: false runs-on: ${{ matrix.os }} diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0d3f6acb78..34384e894b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -36,7 +36,7 @@ jobs: - name: Check out code and set up JDK and Maven uses: s4u/setup-maven-action@489441643219d2b93ee2a127b2402eb640a1b947 # v1.13.0 with: - java-version: 17.0.10 + java-version: 17.0.13 java-distribution: temurin maven-version: 3.9.9 - name: Initialize CodeQL diff --git a/.github/workflows/pitest-analyze-pr.yml b/.github/workflows/pitest-analyze-pr.yml index a45f77bcbe..4c443ab50c 100644 --- a/.github/workflows/pitest-analyze-pr.yml +++ b/.github/workflows/pitest-analyze-pr.yml @@ -25,7 +25,7 @@ jobs: uses: s4u/setup-maven-action@489441643219d2b93ee2a127b2402eb640a1b947 # v1.13.0 with: checkout-fetch-depth: 2 - java-version: 17.0.10 + java-version: 17.0.13 java-distribution: temurin maven-version: 3.9.9 - name: Run Pitest diff --git a/.github/workflows/pitest-update-pr.yml b/.github/workflows/pitest-update-pr.yml index 6d5b181c40..96441ee0b9 100644 --- a/.github/workflows/pitest-update-pr.yml +++ b/.github/workflows/pitest-update-pr.yml @@ -33,7 +33,7 @@ jobs: - name: Check out code and set up JDK and Maven uses: s4u/setup-maven-action@489441643219d2b93ee2a127b2402eb640a1b947 # v1.13.0 with: - java-version: 17.0.10 + java-version: 17.0.13 java-distribution: temurin maven-version: 3.9.9 - name: Download Pitest analysis artifact diff --git a/.github/workflows/run-integration-tests.yml b/.github/workflows/run-integration-tests.yml index 51e200864e..2a70eb85ab 100644 --- a/.github/workflows/run-integration-tests.yml +++ b/.github/workflows/run-integration-tests.yml @@ -36,7 +36,7 @@ jobs: uses: s4u/setup-maven-action@489441643219d2b93ee2a127b2402eb640a1b947 # v1.13.0 with: checkout-ref: "refs/pull/${{ github.event.issue.number }}/head" - java-version: 17.0.10 + java-version: 17.0.13 java-distribution: temurin maven-version: 3.9.9 - name: Install project to local Maven repository diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 9e944536aa..cf0d018e11 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -38,7 +38,7 @@ jobs: uses: s4u/setup-maven-action@489441643219d2b93ee2a127b2402eb640a1b947 # v1.13.0 with: checkout-fetch-depth: 0 - java-version: 17.0.10 + java-version: 17.0.13 java-distribution: temurin maven-version: 3.9.9 - name: Create missing `test` directory diff --git a/website/generate-version-compatibility-overview.sh b/website/generate-version-compatibility-overview.sh index ad29e4dba7..7513a035d8 100755 --- a/website/generate-version-compatibility-overview.sh +++ b/website/generate-version-compatibility-overview.sh @@ -12,7 +12,7 @@ set -e -u -o pipefail # Currently all released Error Prone Support versions are compatible with Java # 17. -java_version=17.0.10-tem +java_version=17.0.13-tem (set +u && echo n | sdk install java "${java_version}") sdk use java "${java_version}" From e5f8226eb152285ca684ed7af4e99154eea7480e Mon Sep 17 00:00:00 2001 From: Stephan Schroevers Date: Tue, 29 Oct 2024 07:40:19 +0100 Subject: [PATCH 4/5] Manual upgrade --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index a87dca75d6..d6a0deaa9a 100644 --- a/pom.xml +++ b/pom.xml @@ -486,6 +486,13 @@ mongodb-driver-core 5.2.0 + + + org.openrewrite + rewrite-java-17 + 8.38.1 + org.openrewrite rewrite-templating From 8b945d4723f6b220832dd85123ca8583531063c1 Mon Sep 17 00:00:00 2001 From: Rick Ossendrijver Date: Tue, 29 Oct 2024 09:22:23 +0100 Subject: [PATCH 5/5] Propose bump --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 2873c20108..a3ecc33067 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -44,7 +44,7 @@ Please replace this sentence with log output, if applicable. - Operating system (e.g. MacOS Monterey). - Java version (i.e. `java --version`, e.g. `17.0.13`). - Error Prone version (e.g. `2.35.1`). -- Error Prone Support version (e.g. `0.18.0`). +- Error Prone Support version (e.g. `0.19.0`). ### Additional context