From 933c1bf704e63c57314584275e088f7cbf742842 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 29 Sep 2023 15:52:51 -0400 Subject: [PATCH 1/6] Upgrade appengine-plugins-core to 0.10.0 Upgrade appengine-plugins-core to 0.10.0 that supports java21 runtime --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b9028d..1830531 100644 --- a/pom.xml +++ b/pom.xml @@ -92,7 +92,7 @@ com.google.cloud.tools appengine-plugins-core - 0.9.9 + 0.10.0 From 4fbdffc14ff86c324c9092d6500d53f3c531fe6b Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 29 Sep 2023 15:54:26 -0400 Subject: [PATCH 2/6] added changelog entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1081bbc..e73753c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ All notable changes to this project will be documented in this file. ## 2.4.5-SNAPSHOT +* Update to appengine-plugins-core 0.10.0 that supports GAE Java21 runtime. + ## 2.4.4 * Update to appengine-plugins-core 0.9.9, for automatic Java 17 compatibility when running local devserver [appengine-plugins-core#894](https://github.com/GoogleCloudPlatform/appengine-plugins-core/pull/894). From fa2201fcb59b2bb5572ffec45b5886495fd81d43 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 29 Sep 2023 16:02:26 -0400 Subject: [PATCH 3/6] Java 21 test --- .github/workflows/unit-tests.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index da8438f..6a44ab1 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11, 17] + java: [8, 11, 17, 21] env: CLOUDSDK_CORE_DISABLE_USAGE_REPORTING: true CLOUDSDK_CORE_DISABLE_PROMPTS: true @@ -20,8 +20,9 @@ jobs: - uses: actions/checkout@v2 with: fetch-depth: 2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v2 with: + distribution: temurin java-version: ${{ matrix.java }} - uses: actions/cache@v2 with: From 3c667268f1c682d16dc63df3aa3cf9db05361a7a Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 29 Sep 2023 16:04:21 -0400 Subject: [PATCH 4/6] Does zulu have Java 21? --- .github/workflows/unit-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 6a44ab1..837d2d3 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -22,7 +22,7 @@ jobs: fetch-depth: 2 - uses: actions/setup-java@v2 with: - distribution: temurin + distribution: zulu java-version: ${{ matrix.java }} - uses: actions/cache@v2 with: From f315e3cb550344f79629f3517ba19efae8e0adbe Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 29 Sep 2023 16:11:19 -0400 Subject: [PATCH 5/6] Not adding Java 21 in this pull request --- .github/workflows/unit-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 837d2d3..fa55928 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - java: [8, 11, 17, 21] + java: [8, 11, 17] env: CLOUDSDK_CORE_DISABLE_USAGE_REPORTING: true CLOUDSDK_CORE_DISABLE_PROMPTS: true From 19c6ec833fd997efc7d69bb4944eea3c438c2042 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 3 Oct 2023 09:43:12 -0400 Subject: [PATCH 6/6] Update CHANGELOG.md Co-authored-by: Mike Eltsufin --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e73753c..4dcfa57 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. ## 2.4.5-SNAPSHOT -* Update to appengine-plugins-core 0.10.0 that supports GAE Java21 runtime. +* Update to appengine-plugins-core 0.10.0 that supports GAE java17 and java21 runtimes. ## 2.4.4