Promoting Java21 runtime to Alpha stage

PiperOrigin-RevId: 573261766 Change-Id: I822d2477aeade0b5add11033398b230009f507e6
GoogleCloudPlatform · Oct 13, 2023 · 222c567 · 222c567
1 parent d850e76
commit 222c567
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/builders/java/acceptance/gae_test.go b/builders/java/acceptance/gae_test.go
@@ -150,17 +150,26 @@ func TestAcceptance(t *testing.T) {
 			MustNotOutput:   []string{"WARNING"},
 			EnableCacheTest: true,
 			Setup:           updateGradleVersions,
+			// Java21 is not yet supported by Gradle - https://screenshot.googleplex.com/5Rd6oKQcxKHxEAX
+			// TODO(b/305232925) remove constraint once Java21 support is available
+			VersionInclusionConstraint: "< 21.0",
 		},
 		{
 			Name:          "gradlew micronaut",
 			App:           "gradlew_micronaut",
 			MustNotOutput: []string{"WARNING"},
 			Setup:         updateGradleVersions,
+			// Java21 is not yet supported by Gradle - https://screenshot.googleplex.com/5Rd6oKQcxKHxEAX
+			// TODO(b/305232925) remove constraint once Java21 support is available
+			VersionInclusionConstraint: "< 21.0",
 		},
 		{
 			Name:  "gradle kotlin",
 			App:   "gradle-kotlin",
 			Setup: updateGradleVersions,
+			// Java21 is not yet supported by Gradle - https://screenshot.googleplex.com/5Rd6oKQcxKHxEAX
+			// TODO(b/305232925) remove constraint once Java21 support is available
+			VersionInclusionConstraint: "< 21.0",
 		},
 		{
 			Name:              "Gradle with source clearing",
@@ -175,6 +184,9 @@ func TestAcceptance(t *testing.T) {
 			App:           "gradle_quarkus",
 			MustNotOutput: []string{"WARNING"},
 			Setup:         updateGradleVersions,
+			// Java21 is not yet supported by Gradle - https://screenshot.googleplex.com/5Rd6oKQcxKHxEAX
+			// TODO(b/305232925) remove constraint once Java21 support is available
+			VersionInclusionConstraint: "< 21.0",
 		},
 	}
 	for _, tc := range acceptance.FilterTests(t, imageCtx, testCases) {

diff --git a/builders/java/acceptance/runtime.bzl b/builders/java/acceptance/runtime.bzl
@@ -8,9 +8,11 @@ gae_runtimes = {
     "java8": "8.0",
     "java11": "11.0",
     "java17": "17.0",
+    "java21": "21.0",
 }
 
 gcf_runtimes = {
     "java11": "11.0",
     "java17": "17.0",
+    "java21": "21.0",
 }
diff --git a/builders/testdata/java/appengine/ktordemo/pom.xml b/builders/testdata/java/appengine/ktordemo/pom.xml
@@ -9,11 +9,11 @@
     <properties>
         <ktor.version>1.5.3</ktor.version>
         <kotlin.code.style>official</kotlin.code.style>
-        <kotlin_version>1.4.30</kotlin_version>
+        <kotlin_version>1.6.21</kotlin_version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <kotlin.compiler.jvmTarget>11</kotlin.compiler.jvmTarget>
         <main.class>io.ktor.server.netty.EngineMain</main.class>
-        <logback_version>1.2.3</logback_version>
+        <logback_version>1.2.9</logback_version>
     </properties>
 
     <repositories>
@@ -90,7 +90,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.3.0</version>
                 <configuration>
                     <archive>
                         <manifest>
@@ -103,7 +103,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.4.2</version>
                 <executions>
                     <execution>
                         <id>make-assembly</id>