From e5251d7795b82aed78ba04d221de2a79e490a469 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Wed, 1 Oct 2025 11:52:47 -0700 Subject: [PATCH] Use Temurin over Zulu. And, for EscapeVelocity and Inject-Common, bump our newest testing JDK from 15 to 25. A bump would probably have been a good idea years ago, but now it's forced by the fact that Temurin doesn't appear to provide a JDK 15, at least nowadays. The change to JDK 25 sometimes has fallout: - We'll want to update any branch-protection rules that require status checks, since the name of the check will change (because it contains the version number). However, I don't see any [for EscapeVelocity](https://github.com/google/escapevelocity/settings/branches) or [for Inject-Common](https://github.com/google/inject-common/settings/branches) (yay?), so there's nothing to update there. Contrast with, e.g., [Guava](https://github.com/google/guava/settings/branches). - Similarly, we need to update our _Copybara_ config for the update to the name of the status check. Sadly, changes do not take effect until after submission (b/360096677), so I'll ultimately have to set `SKIP_COPYBARA` after manually verifying that all CI jobs passed. - And of course different Java versions can be stricter about different things, perhaps especially now that we've enabled things like `maven-javadoc-plugin` by default (cl/807859217). Fortunately, that does not seem to be an issue here. As for why we are switching to Temurin: We got [advice](https://github.com/google/guava/issues/7492#issuecomment-2439753364) from @ben-manes: LTS versions of Temurin [come pre-installed](https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#Hosted-Tool-Cache). Compare cl/711746683 for Guava. RELNOTES=n/a PiperOrigin-RevId: 813848322 --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5b1eed4c6..b6f73e5c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 with: java-version: ${{ matrix.java }} - distribution: 'zulu' + distribution: 'temurin' cache: 'maven' - name: 'Install' shell: bash @@ -51,7 +51,7 @@ jobs: uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 with: java-version: 11 - distribution: 'zulu' + distribution: 'temurin' cache: 'maven' server-id: central server-username: CI_DEPLOY_USERNAME @@ -76,7 +76,7 @@ jobs: uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 with: java-version: 11 - distribution: 'zulu' + distribution: 'temurin' cache: 'maven' - name: 'Generate latest docs' env: