feat!: remove java11 support and expand java21 test coverage

.github/workflows/buildpack-integration-test.yml

@@ -14,16 +14,16 @@ on:
 permissions: read-all
 
 jobs:
-  java11-buildpack-test:
+  java21-buildpack-test:
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@main
     with:
       http-builder-source: '/tmp/tests/conformance'
       http-builder-target: 'com.google.cloud.functions.conformance.HttpConformanceFunction'
       cloudevent-builder-source: '/tmp/tests/conformance'
       cloudevent-builder-target: 'com.google.cloud.functions.conformance.CloudEventsConformanceFunction'
       prerun: 'invoker/conformance/prerun.sh'
-      builder-runtime: 'java11'
-      builder-runtime-version: '11'
+      builder-runtime: 'java21'
+      builder-runtime-version: '21'
       builder-url: gcr.io/serverless-runtimes/google-22-full/builder/java:latest
   java17-buildpack-test:
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@main

.github/workflows/conformance.yaml

@@ -14,7 +14,8 @@ jobs:
     strategy:
       matrix:
         java: [
-          11.x,
+          17.x,
+          21.x
         ]
     steps:
     - name: Harden Runner

.github/workflows/lint.yaml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
-        java-version: 11.x
+        java-version: 17.x
         distribution: temurin
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)

.github/workflows/unit.yaml

@@ -13,9 +13,8 @@ jobs:
     strategy:
       matrix:
         java: [
-          11.x,
           17.x,
-          21-ea
+          21.x
         ]
     steps:
     - name: Harden Runner
@@ -37,4 +36,4 @@ jobs:
     - name: Build with Maven
       run: (cd functions-framework-api/ && mvn install)
     - name: Test
-      run: (cd invoker/ && mvn test)
+      run: (cd invoker/ && mvn test)

.kokoro/release.sh

@@ -64,7 +64,7 @@ fi
 echo "pwd=$(pwd)"
 
 # Make sure `JAVA_HOME` is set and using jdk11.
-export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64
 echo "JAVA_HOME=$JAVA_HOME"
 mvn clean deploy -B -q \
   -P sonatype-oss-release \

CONTRIBUTING.md

@@ -38,15 +38,15 @@ This project is divided into multiple packages, primarily:
   - `function-maven-plugin` - The Maven plugin for building functions
   - `conformance` - A set of functions used for conformance testing
 
-### Setup JDK 11 / 17
+### Setup JDK 17 / 21
 
-Install JDK 11 and 17. One way to install these is through [SDK man](https://sdkman.io/).
+Install JDK 17 and 21. One way to install these is through [SDK man](https://sdkman.io/).
 
 ```sh
-sdk install java 11.0.2-open
 sdk install java 17-open
+sdk install java 21-open
 sdk use java 17-open
-sdk use java 11.0.2-open
+sdk use java 21-open
 ```
 
 Verify Java version with:

function-maven-plugin/pom.xml

@@ -47,8 +47,8 @@
   </licenses>
 
   <properties>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>

function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java

@@ -98,13 +98,13 @@ public class DeployFunction extends CloudSdkMojo {
    * Runtime in which to run the function.
    *
    * <p>Required when deploying a new function; optional when updating an existing function. Default
-   * to Java11.
+   * to Java17.
    */
   @Parameter(
       alias = "deploy.runtime",
-      defaultValue = "java11",
+      defaultValue = "java17",
       property = "function.deploy.runtime")
-  String runtime = "java11";
+  String runtime = "java17";
 
   /**
    * The email address of the IAM service account associated with the function at runtime. The

function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java

@@ -53,7 +53,7 @@ public void testDeployFunctionCommandLine() {
             "--env-vars-file=myfile",
             "--set-build-env-vars=env1=a,env2=b",
             "--build-env-vars-file=myfile2",
-            "--runtime=java11",
+            "--runtime=java17",
             "--quiet");
     assertThat(mojo.getCommands()).isEqualTo(expected);
   }

functions-framework-api/pom.xml

@@ -77,8 +77,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven-compiler-plugin.version}</version>
         <configuration>
-          <source>11</source>
-          <target>11</target>
+          <source>17</source>
+          <target>17</target>
         </configuration>
       </plugin>
       <plugin>

invoker/conformance/pom.xml

@@ -20,8 +20,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencies>

invoker/core/pom.xml

@@ -20,8 +20,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
   </properties>
 

invoker/pom.xml

@@ -56,8 +56,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-    <maven.compiler.source>11</maven.compiler.source>
-    <maven.compiler.target>11</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
   </properties>
 
   <dependencyManagement>