From 81d0d980144da0e7537d380b60e71281a598dfc6 Mon Sep 17 00:00:00 2001 From: "AO Industries, Inc" Date: Wed, 1 May 2024 09:25:40 +0000 Subject: [PATCH] Upgraded GitHub Actions builds from Java 17 to 21 --- .github/workflows/build.yml | 5 +++-- Jenkinsfile | 1 + book/Jenkinsfile | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f02a9ee..a462765 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,10 +13,11 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v3 with: - java-version: 17 + # Matches Jenkinsfile:deployJdk + java-version: 21 distribution: 'oracle' - name: Setup Maven uses: stCarolas/setup-maven@v.4.5 diff --git a/Jenkinsfile b/Jenkinsfile index 4d4ab59..cd19e05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -158,6 +158,7 @@ def upstreamProjects = [ // JDK versions if (!binding.hasVariable('deployJdk')) { + // Matches build.yml:java-version binding.setVariable('deployJdk', '21') } if (!binding.hasVariable('buildJdks')) { diff --git a/book/Jenkinsfile b/book/Jenkinsfile index 43a1696..b920d0c 100644 --- a/book/Jenkinsfile +++ b/book/Jenkinsfile @@ -158,6 +158,7 @@ def upstreamProjects = [ // JDK versions if (!binding.hasVariable('deployJdk')) { + // Matches build.yml:java-version binding.setVariable('deployJdk', '21') } if (!binding.hasVariable('buildJdks')) {