From 4276e3035aa883d6b1025b399529902816cafd43 Mon Sep 17 00:00:00 2001
From: ludo <ludo@google.com>
Date: Mon, 9 Mar 2020 13:19:11 -0700
Subject: [PATCH 001/308] Update plugin description to mention the function
 deploy capability.

PiperOrigin-RevId: 299917488
---
 invoker/function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index c98d65e7..7c6b5c2b 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -12,7 +12,7 @@
   <packaging>maven-plugin</packaging>
   <version>0.9.1-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
-  <description>A Maven plugin that allows functions to be run locally
+  <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
   <url>http://maven.apache.org</url>
 

From 6f12d068e6ba645d6e12cbe4b828f48cba54c3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Wed, 11 Mar 2020 15:22:20 -0700
Subject: [PATCH 002/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.0-alpha-2-rc4

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 1c543968..ff21acef 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+    <version>1.0.0-alpha-2-rc4</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+  <version>1.0.0-alpha-2-rc4</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-alpha-3-SNAPSHOT</version>
+      <version>1.0.0-alpha-3</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 7c6b5c2b..d748cd5f 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+    <version>1.0.0-alpha-2-rc4</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.1-SNAPSHOT</version>
+  <version>0.9.1</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+      <version>1.0.0-alpha-2-rc4</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b09fdbd5..b5608bf6 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+  <version>1.0.0-alpha-2-rc4</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d9659932..de5a2dbe 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+    <version>1.0.0-alpha-2-rc4</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-alpha-3-SNAPSHOT</version>
+  <version>1.0.0-alpha-3</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 0862d452dac438b04ae73d2c944ad5c6c51f639b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Wed, 11 Mar 2020 15:22:29 -0700
Subject: [PATCH 003/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index ff21acef..26efdd7f 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc4</version>
+    <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-alpha-2-rc4</version>
+  <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-alpha-3</version>
+      <version>1.0.0-alpha-4-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index d748cd5f..94bb6280 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc4</version>
+    <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.1</version>
+  <version>0.9.2-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-alpha-2-rc4</version>
+      <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b5608bf6..01af5b92 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-alpha-2-rc4</version>
+  <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index de5a2dbe..b7b9d820 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc4</version>
+    <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-alpha-3</version>
+  <version>1.0.0-alpha-4-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 9f350c66e3f18d974dd60b9bc418b6966b810633 Mon Sep 17 00:00:00 2001
From: emcmanus <emcmanus@google.com>
Date: Wed, 11 Mar 2020 17:48:10 -0700
Subject: [PATCH 004/308] Import the modified pom.xml files from the latest
 release, and update the README to reflect the new version numbers.

PiperOrigin-RevId: 300445429
---
 README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 15173130..15a9d87a 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ You can configure the plugin in `pom.xml`:
 <plugin>
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
-  <version>0.9</version>
+  <version>0.9.1</version>
   <configuration>
     <functionTarget>com.example.function.Echo</functionTarget>
   </configuration>
@@ -153,7 +153,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function:0.9:run \
+  mvn com.google.cloud.functions:function:0.9.1:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 
@@ -164,7 +164,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc3' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc4' \
     -DoutputDirectory=.
 ```
 
@@ -172,7 +172,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.0.0-alpha-2-rc3.jar \
+java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -222,7 +222,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.0.0-alpha-2-rc3.jar \
+java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From a3d23cc12df52cb10ee0102e50cd54eb943527e6 Mon Sep 17 00:00:00 2001
From: emcmanus <emcmanus@google.com>
Date: Thu, 19 Mar 2020 08:54:51 -0700
Subject: [PATCH 005/308] Set the Thread Context ClassLoader while executing
 function code.

Users justifiably expect that the TCCL will be the loader of their code, and lots of things fail to work if that is not true.

PiperOrigin-RevId: 301824288
---
 .../NewBackgroundFunctionExecutor.java        | 20 +++++++++++++------
 .../invoker/NewHttpFunctionExecutor.java      |  3 +++
 .../java/com/example/functionjar/Checker.java |  9 +++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index f70c46eb..5dbb89c9 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -168,14 +168,18 @@ private static Map<String, Object> httpHeaderMap(HttpServletRequest req) {
    *     unmarshalling this event, if it is a CloudEvent.
    */
   private abstract static class FunctionExecutor<CloudEventDataT> {
-    private final String functionName;
+    private final Class<?> functionClass;
 
-    FunctionExecutor(String functionName) {
-      this.functionName = functionName;
+    FunctionExecutor(Class<?> functionClass) {
+      this.functionClass = functionClass;
     }
 
     final String functionName() {
-      return functionName;
+      return functionClass.getCanonicalName();
+    }
+
+    final ClassLoader functionClassLoader() {
+      return functionClass.getClassLoader();
     }
 
     abstract void serviceLegacyEvent(HttpServletRequest req)
@@ -193,7 +197,7 @@ private static class RawFunctionExecutor extends FunctionExecutor<Map<?, ?>> {
     private final RawBackgroundFunction function;
 
     RawFunctionExecutor(RawBackgroundFunction function) {
-      super(function.getClass().getCanonicalName());
+      super(function.getClass());
       this.function = function;
     }
 
@@ -234,7 +238,7 @@ private static class TypedFunctionExecutor<T> extends FunctionExecutor<T> {
     private final BackgroundFunction<T> function;
 
     private TypedFunctionExecutor(Type type, BackgroundFunction<T> function) {
-      super(function.getClass().getCanonicalName());
+      super(function.getClass());
       this.type = type;
       this.function = function;
     }
@@ -287,7 +291,9 @@ Class<T> cloudEventDataType() {
   @Override
   public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
     String contentType = req.getContentType();
+    ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
+      Thread.currentThread().setContextClassLoader(functionExecutor.functionClassLoader());
       if (contentType != null && contentType.startsWith("application/cloudevents+json")) {
         serviceCloudEvent(req, CloudEventKind.STRUCTURED);
       } else if (req.getHeader("ce-specversion") != null) {
@@ -299,6 +305,8 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
     } catch (Throwable t) {
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
       logger.log(Level.WARNING, "Failed to execute " + functionExecutor.functionName(), t);
+    } finally {
+      Thread.currentThread().setContextClassLoader(oldContextLoader);
     }
   }
 
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index 65d102fb..29782301 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -61,7 +61,9 @@ public static NewHttpFunctionExecutor forClass(Class<?> functionClass) {
   public void service(HttpServletRequest req, HttpServletResponse res) {
     HttpRequestImpl reqImpl = new HttpRequestImpl(req);
     HttpResponseImpl respImpl = new HttpResponseImpl(res);
+    ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
+      Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
       function.service(reqImpl, respImpl);
     } catch (Throwable t) {
       // TODO(b/146510646): this should be logged properly as an exception, but that currently
@@ -71,6 +73,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
       t.printStackTrace();
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     } finally {
+      Thread.currentThread().setContextClassLoader(oldContextLoader);
       try {
         // We can't use HttpServletResponse.flushBuffer() because we wrap the PrintWriter
         // returned by HttpServletResponse in our own BufferedWriter to match our API.
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
index cc750b82..19c78cd2 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
@@ -18,6 +18,15 @@
 
 class Checker {
   void serviceOrAssert(String runtimeClassName) {
+    // Check that the context class loader is the loader that loaded this class.
+    if (getClass().getClassLoader() != Thread.currentThread().getContextClassLoader()) {
+      throw new AssertionError(
+          String.format(
+              "ClassLoader mismatch: mine %s; context %s",
+              getClass().getClassLoader(),
+              Thread.currentThread().getContextClassLoader()));
+    }
+
     ClassLoader myLoader = getClass().getClassLoader();
     Class<Template> templateClass = Template.class;
     ClassLoader templateLoader = templateClass.getClassLoader();

From 45b13eaa87d7f4e83803b810b894817a0d436f08 Mon Sep 17 00:00:00 2001
From: emcmanus <emcmanus@google.com>
Date: Tue, 24 Mar 2020 11:29:25 -0700
Subject: [PATCH 006/308] Make Functions Framework use StackDriver-compatible
 logging when on GCF.

In this environment, outputting a particular JSON-formatted string will produce a log entry with fields parsed from that string.

Remove the special logging.properties file. The intent was to omit information like the timestamp that would be duplicated by the StackDriver logging framework. But we are now replacing the logger completely, so this logging.properties is no longer consulted.

The logging.properties that was deleted also didn't include the
[`%6$s` field](https://docs.oracle.com/en/java/javase/11/docs/api/java.logging/java/util/logging/SimpleFormatter.html#format(java.util.logging.LogRecord))
which meant that if there was an exception associated with the log message it did not appear.

PiperOrigin-RevId: 302709439
---
 .../functions/invoker/gcf/JsonLogHandler.java | 122 ++++++++++++++++++
 .../functions/invoker/runner/Invoker.java     |  29 +++--
 .../src/main/resources/logging.properties     |   4 -
 .../functions/invoker/IntegrationTest.java    |  81 ++++++++++--
 .../functions/invoker/testfunctions/Log.java  |  28 ++++
 5 files changed, 241 insertions(+), 23 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
 delete mode 100644 invoker/core/src/main/resources/logging.properties
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
new file mode 100644
index 00000000..181354c1
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
@@ -0,0 +1,122 @@
+package com.google.cloud.functions.invoker.gcf;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+/**
+ * A log handler that publishes log messages in a json format. This is StackDriver's
+ * <a href="https://cloud.google.com/logging/docs/structured-logging">"structured
+ * logging" format</a>.
+ */
+public final class JsonLogHandler extends Handler {
+  private static final String SOURCE_LOCATION_KEY = "\"logging.googleapis.com/sourceLocation\": ";
+
+  private static final String DEBUG = "DEBUG";
+  private static final String INFO = "INFO";
+  private static final String WARNING = "WARNING";
+  private static final String ERROR = "ERROR";
+  private static final String DEFAULT = "DEFAULT";
+
+  private final PrintStream out;
+  private final boolean closePrintStreamOnClose;
+
+  public JsonLogHandler(PrintStream out, boolean closePrintStreamOnClose) {
+    this.out = out;
+    this.closePrintStreamOnClose = closePrintStreamOnClose;
+  }
+
+  @Override
+  public void publish(LogRecord record) {
+    // We avoid String.format and String.join even though they would simplify the code.
+    // Logging code often shows up in profiling so we want to make this fast and StringBuilder is
+    // more performant.
+    StringBuilder json = new StringBuilder("{");
+    appendSeverity(json, record);
+    appendSourceLocation(json, record);
+    appendMessage(json, record); // must be last, see appendMessage
+    json.append("}");
+    // We must output the log all at once (should only call println once per call to publish)
+    out.println(json);
+  }
+
+  private static void appendMessage(StringBuilder json, LogRecord record) {
+    // This must be the last item in the JSON object, because it has no trailing comma. JSON is
+    // unforgiving about commas and you can't have one just before }.
+    json.append("\"message\": \"").append(escapeString(record.getMessage()));
+    if (record.getThrown() != null) {
+      json.append("\\n")
+          .append(escapeString(getStackTraceAsString(record.getThrown())));
+    }
+    json.append("\"");
+  }
+
+  private static void appendSeverity(StringBuilder json, LogRecord record) {
+    json.append("\"severity\": \"").append(levelToSeverity(record.getLevel())).append("\", ");
+  }
+
+  private static String levelToSeverity(Level level) {
+    int intLevel = (level == null) ? 0 : level.intValue();
+    switch (intLevel) {
+      case 300: // FINEST
+      case 400: // FINER
+      case 500: // FINE
+        return DEBUG;
+      case 700: // CONFIG
+      case 800: // INFO
+        // Java's CONFIG is lower than its INFO, while Stackdriver's NOTICE is greater than its
+        // INFO. So despite the similarity, we don't try to use NOTICE for CONFIG.
+        return INFO;
+      case 900: // WARNING
+        return WARNING;
+      case 1000: // SEVERE
+        return ERROR;
+      default:
+        return DEFAULT;
+    }
+  }
+
+  private static void appendSourceLocation(StringBuilder json, LogRecord record) {
+    if (record.getSourceClassName() == null && record.getSourceMethodName() == null) {
+      return;
+    }
+    List<String> entries = new ArrayList<>();
+    if (record.getSourceClassName() != null) {
+      // TODO: Handle nested classes. If the source class name is com.example.Foo$Bar then the
+      // source file is com/example/Foo.java, not com/example/Foo$Bar.java.
+      String fileName = record.getSourceClassName().replace('.', '/') + ".java";
+      entries.add("\"file\": \"" + escapeString(fileName) + "\"");
+    }
+    if (record.getSourceMethodName() != null) {
+      entries.add("\"method\": \"" + escapeString(record.getSourceMethodName()) + "\"");
+    }
+    json.append(SOURCE_LOCATION_KEY).append("{").append(String.join(", ", entries)).append("}, ");
+  }
+
+  private static String escapeString(String s) {
+    return s.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r");
+  }
+
+  private static String getStackTraceAsString(Throwable t) {
+    StringWriter stringWriter = new StringWriter();
+    t.printStackTrace(new PrintWriter(stringWriter));
+    return stringWriter.toString();
+  }
+
+  @Override
+  public void flush() {
+    out.flush();
+  }
+
+  @Override
+  public void close() throws SecurityException {
+    if (closePrintStreamOnClose) {
+      out.close();
+    }
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index dbb19a24..3bcd4ba4 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -31,6 +31,7 @@
 import com.google.cloud.functions.invoker.HttpFunctionSignatureMatcher;
 import com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor;
 import com.google.cloud.functions.invoker.NewHttpFunctionExecutor;
+import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -50,8 +51,8 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.logging.Handler;
 import java.util.logging.Level;
-import java.util.logging.LogManager;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 import javax.servlet.ServletException;
@@ -80,17 +81,19 @@
  * </ul>
  */
 public class Invoker {
-
-  private static final Logger logger;
+  private static final Logger rootLogger = Logger.getLogger("");
+  private static final Logger logger = Logger.getLogger(Invoker.class.getName());
 
   static {
-    try {
-      LogManager.getLogManager()
-          .readConfiguration(Invoker.class.getResourceAsStream("/logging.properties"));
-    } catch (IOException e) {
-      System.out.println("Failed to read logging configuration file, error: " + e.getMessage());
+    if (isGcf()) {
+      // If we're running with Google Cloud Functions, we'll get better-looking logs if we arrange
+      // for them to be formatted using StackDriver's "structured logging" JSON format. Remove the
+      // JDK's standard logger and replace it with the JSON one.
+      for (Handler handler : rootLogger.getHandlers()) {
+        rootLogger.removeHandler(handler);
+      }
+      rootLogger.addHandler(new JsonLogHandler(System.out, false));
     }
-    logger = Logger.getLogger(Invoker.class.getName());
   }
 
   private static class Options {
@@ -365,13 +368,19 @@ private static List<URL> jarsIn(String dir) {
   }
 
   private void logServerInfo() {
-    if (isLocalRun()) {
+    if (!isGcf()) {
       logger.log(Level.INFO, "Serving function...");
       logger.log(Level.INFO, "Function: {0}", functionTarget);
       logger.log(Level.INFO, "URL: http://localhost:{0,number,#}/", port);
     }
   }
 
+  private static boolean isGcf() {
+    // This environment variable is set in the GCF environment but won't be set when invoking
+    // the Functions Framework directly. We don't use its value, just whether it is set.
+    return System.getenv("K_SERVICE") != null;
+  }
+
   /**
    * Wrapper that intercepts requests for {@code /favicon.ico} and {@code /robots.txt} and causes
    * them to produce a 404 status. Otherwise they would be sent to the function code, like any
diff --git a/invoker/core/src/main/resources/logging.properties b/invoker/core/src/main/resources/logging.properties
deleted file mode 100644
index 2f2ea883..00000000
--- a/invoker/core/src/main/resources/logging.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.SimpleFormatter.format = %4$s: %5$s%n
\ No newline at end of file
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index c62d2630..3f4a6de0 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -41,6 +41,7 @@
 import java.net.ServerSocket;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -147,6 +148,8 @@ abstract static class TestCase {
 
     abstract Optional<String> expectedContentType();
 
+    abstract Optional<String> expectedOutput();
+
     abstract String httpContentType();
 
     abstract ImmutableMap<String, String> httpHeaders();
@@ -178,6 +181,8 @@ abstract static class Builder {
 
       abstract Builder setExpectedContentType(String x);
 
+      abstract Builder setExpectedOutput(String x);
+
       abstract Builder setExpectedJsonString(String x);
 
       abstract Builder setHttpContentType(String x);
@@ -272,6 +277,41 @@ public void newEchoUrl() throws Exception {
     testHttpFunction(fullTarget("NewEchoUrl"), testCases);
   }
 
+  @Test
+  public void stackDriverLogging() throws Exception {
+    String simpleExpectedOutput =
+        "{\"severity\": \"INFO\", "
+            + "\"logging.googleapis.com/sourceLocation\": "
+            + "{\"file\": \"com/google/cloud/functions/invoker/testfunctions/Log.java\","
+            + " \"method\": \"service\"},"
+            + " \"message\": \"blim\"}";
+    TestCase simpleTestCase =
+        TestCase.builder()
+            .setUrl("/?message=blim")
+            .setExpectedOutput(simpleExpectedOutput)
+            .build();
+    String quotingExpectedOutput = "\"message\": \"foo\\nbar\\\"";
+    TestCase quotingTestCase =
+        TestCase.builder()
+            .setUrl("/?message=" + URLEncoder.encode("foo\nbar\"", "UTF-8"))
+            .setExpectedOutput(quotingExpectedOutput)
+            .build();
+    String exceptionExpectedOutput =
+        "{\"severity\": \"ERROR\", "
+            + "\"logging.googleapis.com/sourceLocation\": "
+            + "{\"file\": \"com/google/cloud/functions/invoker/testfunctions/Log.java\", "
+            + "\"method\": \"service\"}, "
+            + "\"message\": \"oops\\njava.lang.Exception: disaster\\n"
+            + "	at com.google.cloud.functions.invoker.testfunctions.Log.service(Log.java:";
+    TestCase exceptionTestCase =
+        TestCase.builder()
+            .setUrl("/?message=oops&level=severe&exception=disaster")
+            .setExpectedOutput(exceptionExpectedOutput)
+            .build();
+    testHttpFunction(
+        fullTarget("Log"), ImmutableList.of(simpleTestCase, quotingTestCase, exceptionTestCase));
+  }
+
   @Test
   public void background() throws Exception {
     File snoopFile = snoopFile();
@@ -480,6 +520,8 @@ private void testFunction(
         if (testCase.snoopFile().isPresent()) {
           checkSnoopFile(testCase.snoopFile().get(), testCase.expectedJsonString().get());
         }
+        testCase.expectedOutput()
+            .ifPresent(output -> expect.that(serverProcess.output().toString()).contains(output));
       }
     } finally {
       serverProcess.close();
@@ -505,13 +547,29 @@ public String toString() {
     }
   }
 
-  @AutoValue
-  abstract static class ServerProcess implements AutoCloseable {
-    abstract Process process();
-    abstract Future<?> outputMonitorResult();
+  private static class ServerProcess implements AutoCloseable {
+    private final Process process;
+    private final Future<?> outputMonitorResult;
+    private final StringBuilder output;
 
-    static ServerProcess of(Process process, Future<?> outputMonitorResult) {
-      return new AutoValue_IntegrationTest_ServerProcess(process, outputMonitorResult);
+    ServerProcess(Process process, Future<?> outputMonitorResult, StringBuilder output) {
+      this.process = process;
+      this.outputMonitorResult = outputMonitorResult;
+      this.output = output;
+    }
+
+    Process process() {
+      return process;
+    }
+
+    Future<?> outputMonitorResult() {
+      return outputMonitorResult;
+    }
+
+    String output() {
+      synchronized (output) {
+        return output.toString();
+      }
     }
 
     @Override
@@ -544,17 +602,19 @@ private ServerProcess startServer(
     processBuilder.environment().putAll(environment);
     Process serverProcess = processBuilder.start();
     CountDownLatch ready = new CountDownLatch(1);
+    StringBuilder output = new StringBuilder();
     Future<?> outputMonitorResult = EXECUTOR.submit(
-        () -> monitorOutput(serverProcess.getInputStream(), ready));
+        () -> monitorOutput(serverProcess.getInputStream(), ready, output));
     boolean serverReady = ready.await(5, TimeUnit.SECONDS);
     if (!serverReady) {
       serverProcess.destroy();
       throw new AssertionError("Server never became ready");
     }
-    return ServerProcess.of(serverProcess, outputMonitorResult);
+    return new ServerProcess(serverProcess, outputMonitorResult, output);
   }
 
-  private void monitorOutput(InputStream processOutput, CountDownLatch ready) {
+  private void monitorOutput(
+      InputStream processOutput, CountDownLatch ready, StringBuilder output) {
     try (BufferedReader reader = new BufferedReader(new InputStreamReader(processOutput))) {
       String line;
       while ((line = reader.readLine()) != null) {
@@ -562,6 +622,9 @@ private void monitorOutput(InputStream processOutput, CountDownLatch ready) {
           ready.countDown();
         }
         System.out.println(line);
+        synchronized (output) {
+          output.append(line).append('\n');
+        }
         if (line.contains("WARNING")) {
           throw new AssertionError("Found warning in server output:\n" + line);
         }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java
new file mode 100644
index 00000000..4b1e94fe
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java
@@ -0,0 +1,28 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import java.lang.reflect.Field;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** Emit log messages with configurable level, message, and exception. */
+public class Log implements HttpFunction {
+  private static final Logger logger = Logger.getLogger(Log.class.getName());
+
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws Exception {
+    String message = request.getFirstQueryParameter("message").orElse("Default message");
+    String levelString = request.getFirstQueryParameter("level").orElse("info");
+    Optional<String> exceptionString = request.getFirstQueryParameter("exception");
+    Field levelField = Level.class.getField(levelString.toUpperCase());
+    Level level = (Level) levelField.get(null);
+    if (exceptionString.isPresent()) {
+      logger.log(level, message, new Exception(exceptionString.get()));
+    } else {
+      logger.log(level, message);
+    }
+  }
+}

From 52382d2a4fb8812bf3cd60ac99b646b4ebe04e1f Mon Sep 17 00:00:00 2001
From: Ace Nassri <anassri@google.com>
Date: Mon, 30 Mar 2020 15:36:38 -0700
Subject: [PATCH 007/308] Fix typo (#19)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 15a9d87a..7ff94f0f 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function:0.9.1:run \
+  mvn com.google.cloud.functions:function-maven-plugin:0.9.1:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 

From fb4bae2f4232997bce28a4cb5323b25a6649f68c Mon Sep 17 00:00:00 2001
From: emcmanus <emcmanus@google.com>
Date: Thu, 2 Apr 2020 15:44:16 -0700
Subject: [PATCH 008/308] Prepare the Java Functions Framework for a coming
 change to the API, whereby background functions can throw checked exceptions
 (`throws Exception`).

PiperOrigin-RevId: 304493044
---
 README.md                                        |  2 +-
 .../invoker/NewBackgroundFunctionExecutor.java   | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 7ff94f0f..15a9d87a 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function-maven-plugin:0.9.1:run \
+  mvn com.google.cloud.functions:function:0.9.1:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index 5dbb89c9..596ffb3d 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -183,12 +183,12 @@ final ClassLoader functionClassLoader() {
     }
 
     abstract void serviceLegacyEvent(HttpServletRequest req)
-        throws IOException;
+        throws Exception;
 
     abstract void serviceCloudEvent(
         HttpServletRequest req,
         HeadersStep<AttributesImpl, CloudEventDataT, String> unmarshaller)
-        throws IOException;
+        throws Exception;
 
     abstract Class<CloudEventDataT> cloudEventDataType();
   }
@@ -202,7 +202,7 @@ private static class RawFunctionExecutor extends FunctionExecutor<Map<?, ?>> {
     }
 
     @Override
-    void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+    void serviceLegacyEvent(HttpServletRequest req) throws Exception {
       Event event = parseLegacyEvent(req);
       function.accept(new Gson().toJson(event.getData()), event.getContext());
     }
@@ -210,7 +210,7 @@ void serviceLegacyEvent(HttpServletRequest req) throws IOException {
     @Override
     void serviceCloudEvent(
         HttpServletRequest req, HeadersStep<AttributesImpl, Map<?, ?>, String> unmarshaller)
-        throws IOException {
+        throws Exception {
       Map<String, Object> httpHeaders = httpHeaderMap(req);
       String body = req.getReader().lines().collect(joining("\n"));
       CloudEvent<AttributesImpl, Map<?, ?>> cloudEvent =
@@ -250,7 +250,7 @@ static <T> TypedFunctionExecutor<T> of(Type type, BackgroundFunction<?> instance
     }
 
     @Override
-    void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+    void serviceLegacyEvent(HttpServletRequest req) throws Exception {
       Event event = parseLegacyEvent(req);
       T payload = new Gson().fromJson(event.getData(), type);
       function.accept(payload, event.getContext());
@@ -259,7 +259,7 @@ void serviceLegacyEvent(HttpServletRequest req) throws IOException {
     @Override
     void serviceCloudEvent(
         HttpServletRequest req, HeadersStep<AttributesImpl, T, String> unmarshaller)
-        throws IOException {
+        throws Exception {
       Map<String, Object> httpHeaders = httpHeaderMap(req);
       String body = req.getReader().lines().collect(joining("\n"));
       CloudEvent<AttributesImpl, T> cloudEvent =
@@ -319,7 +319,7 @@ private enum CloudEventKind {BINARY, STRUCTURED}
    *     {@link FunctionExecutor}.
    */
   private <CloudEventT> void serviceCloudEvent(
-      HttpServletRequest req, CloudEventKind kind) throws IOException {
+      HttpServletRequest req, CloudEventKind kind) throws Exception {
     @SuppressWarnings("unchecked")
     FunctionExecutor<CloudEventT> executor = (FunctionExecutor<CloudEventT>) functionExecutor;
     Class<CloudEventT> cloudEventDataType = executor.cloudEventDataType();
@@ -337,7 +337,7 @@ private <CloudEventT> void serviceCloudEvent(
     executor.serviceCloudEvent(req, unmarshaller);
   }
 
-  private void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+  private void serviceLegacyEvent(HttpServletRequest req) throws Exception {
     functionExecutor.serviceLegacyEvent(req);
   }
 }

From a7155b6d6d0be88c4e9d0823e9e8c7d8b63d1c34 Mon Sep 17 00:00:00 2001
From: emcmanus <emcmanus@google.com>
Date: Thu, 2 Apr 2020 17:59:13 -0700
Subject: [PATCH 009/308] Declare `throws Exception` in the interfaces for
 background functions. This saves users from having to catch checked
 exceptions and rethrow them as unchecked ones.

Fixes https://github.com/GoogleCloudPlatform/functions-framework-java/issues/21.

PiperOrigin-RevId: 304515456
---
 .../java/com/google/cloud/functions/BackgroundFunction.java     | 2 +-
 .../java/com/google/cloud/functions/RawBackgroundFunction.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
index bc7bf601..381423fc 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
@@ -55,5 +55,5 @@ public interface BackgroundFunction<T> {
    * @param context the context of the event. This is a set of values that every event has,
    *     separately from the payload, such as timestamp and event type.
    */
-  void accept(T payload, Context context);
+  void accept(T payload, Context context) throws Exception;
 }
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
index 472f7c4d..9b3b2439 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
@@ -70,5 +70,5 @@ public interface RawBackgroundFunction {
    * @param context the context of the event. This is a set of values that every event has,
    *     separately from the payload, such as timestamp and event type.
    */
-  void accept(String json, Context context);
+  void accept(String json, Context context) throws Exception;
 }

From 723e57e411827c88eeecc3ee5d9f6f1df5fef754 Mon Sep 17 00:00:00 2001
From: Guillaume Laforge <glaforge@gmail.com>
Date: Fri, 3 Apr 2020 18:49:23 +0200
Subject: [PATCH 010/308] Instructions for the Gradle build tool (#20)

* Add Gradle instructions
---
 README.md | 88 +++++++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 15a9d87a..cafdbfe0 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,14 @@ different environments, including:
 
 ## Installation
 
-The Functions Framework for Java requires
+The Functions Framework for Java uses
 [Java](https://java.com/en/download/help/download_options.xml) and
-[Maven](http://maven.apache.org/install.html) (the `mvn` command).
+[Maven](http://maven.apache.org/install.html) (the `mvn` command),
+for building and deploying functions from source.
+
+However, it is also possible to build your functions using
+[Gradle](https://gradle.org/), as JAR archives, that you will deploy with the 
+`gcloud` command-line.
 
 ## Quickstart: Hello, World on your local machine
 
@@ -32,6 +37,16 @@ that supports Maven to create the Maven project. Add this dependency in the
     </dependency>
 ```
 
+If you are using Gradle to build your functions, you can define the Functions
+Framework dependency in your `build.gradle` project file as follows:
+
+```groovy
+    dependencies {
+        implementation 'com.google.cloud.functions:functions-framework-api:1.0.0-alpha-2-rc3'
+    }
+
+```
+
 ### Writing an HTTP function
 
 Create a file `src/main/java/com/example/HelloWorld.java` with the following
@@ -178,17 +193,55 @@ java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
 ```
 
 
+## Running a function with Gradle
+
+From Gradle, similarily to running functions with the Functions Framework jar,
+we can invoke the `Invoker` class with a `JavaExec` task.
+
+### Configuration in `build.gradle`
+
+```groovy
+configurations {
+    invoker
+}
+
+dependencies {
+    implementation 'com.google.cloud.functions:functions-framework-api:1.0.0-alpha-2-rc3'
+    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc4'
+}
+
+tasks.register("runFunction", JavaExec) {
+    main = 'com.google.cloud.functions.invoker.runner.Invoker'
+    classpath(configurations.invoker)
+    inputs.files(configurations.runtimeClasspath, sourceSets.main.output)
+    args(
+            '--target', project.findProperty('runFunction.target'),
+            '--port', project.findProperty('runFunction.port') ?: 8080
+    )
+    doFirst {
+        args('--classpath', files(configurations.runtimeClasspath, sourceSets.main.output).asPath)
+    }
+}
+```
+
+Then in your terminal or IDE, you will be able to run the function locally with:
+
+```sh
+gradle runFunction -PrunFunction.target=com.example.HelloWorld \
+                   -PrunFunction.port=8080
+```
+
+Or if you use the Gradle wrapper provided by your Gradle project build:
+
+```sh
+./gradlew runFunction -PrunFunction.target=com.example.HelloWorld \
+                      -PrunFunction.port=8080
+```
+
 ## Functions Framework configuration
 
 There are a number of options that can be used to configure the Functions
-Framework, whether run directly or on the command line. This table summarizes
-them, and the following sections explain them in detail.
-
-| Command-line  | `pom.xml`          | Maven system property |
-|---------------|--------------------|-----------------------|
-| `--target`    | `<functionTarget>` | `run.functionTarget`  |
-| `--port`      | `<port>`           | `run.port`            |
-| `--classpath` | -                  | -                     |
+Framework, whether run directly or on the command line.
 
 ### Which function to run
 
@@ -199,19 +252,24 @@ the Functions Framework:
 --target com.example.HelloWorld
 <functionTarget>com.example.HelloWorld</functionTarget>
 -Drun.functionTarget=com.example.HelloWorld
+-Prun.functionTarget=com.example.HelloWorld
 ```
 
+* Invoker argument: `--target com.example.HelloWorld`
+* Maven `pom.xml`: `<functionTarget>com.example.HelloWorld</functionTarget>`
+* Maven CLI argument: `-Drun.functionTarget=com.example.HelloWorld`
+* Gradle CLI argument: `-Prun.functionTarget=com.example.HelloWorld`
+
 ### Which port to listen on
 
 The Functions Framework is an HTTP server that directs incoming HTTP requests to
 the function code. By default this server listens on port 8080. Specify an
 alternative value like this:
 
-```
---port 12345
-<port>12345</port>
--Drun.port=12345
-```
+* Invoker argument: `--port 12345`
+* Maven `pom.xml`: `<port>12345</port>`
+* Maven CLI argument: `-Drun.port=12345`
+* Gradle CLI argument: `-Prun.port=12345`
 
 ### Function classpath
 

From 50b977c451f56e7945d954a785fb7dd0c3e6a2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 7 Apr 2020 10:03:07 -0700
Subject: [PATCH 011/308] Wait for process completion after each test method.
 (#22)

Otherwise we may get a BindException when the next test method runs,
since the previous process hasn't exited yet and is still listening
to the server port.
---
 .../com/google/cloud/functions/invoker/IntegrationTest.java  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 3f4a6de0..6c0a7e3d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -575,6 +575,11 @@ String output() {
     @Override
     public void close() {
       process().destroy();
+      try {
+        process().waitFor();
+      } catch (InterruptedException e) {
+        // Should not happen.
+      }
     }
   }
 

From 894c80ef6bec99dec9042a5864e5fd9dd61016a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 7 Apr 2020 11:26:46 -0700
Subject: [PATCH 012/308] Update Travis config so it actually does something.
 (#23)

* Update Travis config so it actually does something.
---
 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0e2a7547..51708b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,4 @@
 language: java
 jdk:
   - openjdk11
-# Use a Build Matrix for subdirs (https://lord.io/blog/2014/travis-multiple-subdirs/)
-env:
-  - DIR=functions-framework-api/
-script: cd $DIR && gradle build # gradle -q run
+script: (cd functions-framework-api/ && mvn install) && (cd invoker/ && mvn test)

From 16e9b1553fa4660dd8165573d7e93a34dacb6775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 7 Apr 2020 13:35:23 -0700
Subject: [PATCH 013/308] Add `Context.attributes()`. (#24)

* Add `Context.attributes()`.

The main purpose is to reflect attributes defined by the CloudEvents spec
when the event source conforms to that spec.
---
 functions-framework-api/pom.xml               |  5 ++-
 .../com/google/cloud/functions/Context.java   | 19 ++++++++
 .../invoker/CloudFunctionsContext.java        | 14 +++++-
 .../NewBackgroundFunctionExecutor.java        |  2 +
 .../functions/invoker/IntegrationTest.java    | 44 +++++++++++++------
 .../testfunctions/NewBackgroundSnoop.java     |  1 +
 .../NewTypedBackgroundSnoop.java              |  1 +
 invoker/pom.xml                               |  2 +-
 8 files changed, 70 insertions(+), 18 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 396c6a3f..b92c5fa8 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.0-alpha-2-rc3-SNAPSHOT</version>
+  <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -65,6 +65,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -139,7 +140,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java b/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
index 8969a8f9..f4e3df8a 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
@@ -14,6 +14,9 @@
 
 package com.google.cloud.functions;
 
+import java.util.Collections;
+import java.util.Map;
+
 /** An interface for event function context. */
 public interface Context {
   /** Returns event ID. */
@@ -27,4 +30,20 @@ public interface Context {
 
   /** Returns event resource. */
   String resource();
+
+  /**
+   * Returns additional attributes from this event. For CloudEvents, the entries in this map will
+   * include the
+   * <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#required-attributes">required
+   * attributes</a> and may include
+   * <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#required-attributes">optional
+   * attributes</a> and
+   * <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#extension-context-attributes">
+   * extension attributes</a>.
+   *
+   * <p>The map returned by this method may be empty but is never null.</p>
+   */
+  default Map<String, String> attributes() {
+    return Collections.emptyMap();
+  }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index 867efb74..fe1983d2 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -20,6 +20,8 @@
 import com.google.gson.TypeAdapter;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.Collections;
+import java.util.Map;
 
 /** Event context (metadata) for events handled by Cloud Functions. */
 @AutoValue
@@ -28,24 +30,32 @@ abstract class CloudFunctionsContext implements Context {
   @Retention(RetentionPolicy.SOURCE)
   @interface Nullable {}
 
+  @Override
   @Nullable
   public abstract String eventId();
 
+  @Override
   @Nullable
   public abstract String timestamp();
 
+  @Override
   @Nullable
   public abstract String eventType();
 
+  @Override
   @Nullable
   public abstract String resource();
 
+  @Override
+  public abstract Map<String, String> attributes();
+
   public static TypeAdapter<CloudFunctionsContext> typeAdapter(Gson gson) {
     return new AutoValue_CloudFunctionsContext.GsonTypeAdapter(gson);
   }
 
   static Builder builder() {
-    return new AutoValue_CloudFunctionsContext.Builder();
+    return new AutoValue_CloudFunctionsContext.Builder()
+        .setAttributes(Collections.emptyMap());
   }
 
   @AutoValue.Builder
@@ -54,6 +64,8 @@ abstract static class Builder {
     abstract Builder setTimestamp(String x);
     abstract Builder setEventType(String x);
     abstract Builder setResource(String x);
+    abstract Builder setAttributes(Map<String, String> value);
+
     abstract CloudFunctionsContext build();
   }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index 596ffb3d..b41778c9 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -133,11 +133,13 @@ private static Context contextFromCloudEvent(CloudEvent<AttributesImpl, ?> cloud
     // We don't have an obvious replacement for the Context.resource field, which with legacy events
     // corresponded to a value present for some proprietary Google event types.
     String resource = "{}";
+    Map<String, String> attributesMap = AttributesImpl.marshal(attributes);
     return CloudFunctionsContext.builder()
         .setEventId(attributes.getId())
         .setEventType(attributes.getType())
         .setResource(resource)
         .setTimestamp(timestampString)
+        .setAttributes(attributesMap)
         .build();
   }
 
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 6c0a7e3d..00ec3b42 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -115,6 +115,18 @@ private static CloudEventImpl<Map<String, Object>> sampleCloudEvent(File snoopFi
         .build();
   }
 
+  private static JsonObject expectedCloudEventAttributes() {
+    JsonObject attributes = new JsonObject();
+    attributes.addProperty("datacontenttype", "application/json");
+    attributes.addProperty("specversion", "1.0");
+    attributes.addProperty("id", "B234-1234-1234");
+    attributes.addProperty("source", "/source");
+    attributes.addProperty("time", "2018-04-05T17:31:00Z");
+    attributes.addProperty("type", "com.example.someevent.new");
+    attributes.addProperty("dataschema", "/schema");
+    return attributes;
+  }
+
   private static int serverPort;
 
   /**
@@ -144,7 +156,7 @@ abstract static class TestCase {
 
     abstract Optional<String> expectedResponseText();
 
-    abstract Optional<String> expectedJsonString();
+    abstract Optional<JsonObject> expectedJson();
 
     abstract Optional<String> expectedContentType();
 
@@ -183,7 +195,7 @@ abstract static class Builder {
 
       abstract Builder setExpectedOutput(String x);
 
-      abstract Builder setExpectedJsonString(String x);
+      abstract Builder setExpectedJson(JsonObject x);
 
       abstract Builder setHttpContentType(String x);
 
@@ -319,7 +331,7 @@ public void background() throws Exception {
     TestCase testCase = TestCase.builder()
         .setRequestText(requestText)
         .setSnoopFile(snoopFile)
-        .setExpectedJsonString(requestText)
+        .setExpectedJson(new Gson().fromJson(requestText, JsonObject.class))
         .build();
     backgroundTest(fullTarget("BackgroundSnoop.snoop"), ImmutableList.of(testCase));
   }
@@ -337,10 +349,13 @@ public void newTypedBackground() throws Exception {
   private void newBackgroundTest(String target) throws Exception {
     File snoopFile = snoopFile();
     String gcfRequestText = sampleLegacyEvent(snoopFile);
+    JsonObject expectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
+    // We don't currently put anything in the attributes() map for legacy events.
+    expectedJson.add("attributes", new JsonObject());
     TestCase gcfTestCase = TestCase.builder()
         .setRequestText(gcfRequestText)
         .setSnoopFile(snoopFile)
-        .setExpectedJsonString(gcfRequestText)
+        .setExpectedJson(expectedJson)
         .build();
 
     // A CloudEvent using the "structured content mode", where both the metadata and the payload
@@ -348,13 +363,14 @@ private void newBackgroundTest(String target) throws Exception {
     String cloudEventRequestText = Json.encode(sampleCloudEvent(snoopFile));
     // For CloudEvents, we don't currently populate Context#getResource with anything interesting,
     // so we excise that from the expected text we would have with legacy events.
-    String cloudEventExpectedJsonString =
-        gcfRequestText.replaceAll("\"resource\":\\s*\\{[^}]*\\}", "\"resource\":{}");
+    JsonObject cloudEventExpectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
+    cloudEventExpectedJson.getAsJsonObject("context").add("resource", new JsonObject());
+    cloudEventExpectedJson.add("attributes", expectedCloudEventAttributes());
     TestCase cloudEventsStructuredTestCase = TestCase.builder()
         .setSnoopFile(snoopFile)
         .setRequestText(cloudEventRequestText)
         .setHttpContentType("application/cloudevents+json; charset=utf-8")
-        .setExpectedJsonString(cloudEventExpectedJsonString)
+        .setExpectedJson(cloudEventExpectedJson)
         .build();
 
     // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
@@ -367,7 +383,7 @@ private void newBackgroundTest(String target) throws Exception {
         .setRequestText(wire.getPayload().get())
         .setHttpContentType("application/json")
         .setHttpHeaders(ImmutableMap.copyOf(wire.getHeaders()))
-        .setExpectedJsonString(cloudEventExpectedJsonString)
+        .setExpectedJson(cloudEventExpectedJson)
         .build();
     // TODO(emcmanus): Update the Content-Type to "application/json; charset=utf-8" when
     // https://github.com/cloudevents/sdk-java/issues/89 has been fixed.
@@ -458,19 +474,19 @@ private void backgroundTest(String functionTarget, List<TestCase> testCases) thr
       String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
       Gson gson = new Gson();
       JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
-      String expectedJsonString = testCase.expectedJsonString().get();
-      JsonObject expectedJson = gson.fromJson(expectedJsonString, JsonObject.class);
+      JsonObject expectedJson = testCase.expectedJson().get();
       expect.withMessage("Testing %s with %s", functionTarget, testCase)
           .that(snoopedJson).isEqualTo(expectedJson);
     }
   }
 
-  private void checkSnoopFile(File snoopFile, String expectedJsonString) throws IOException {
+  private void checkSnoopFile(TestCase testCase) throws IOException {
+    File snoopFile = testCase.snoopFile().get();
+    JsonObject expectedJson = testCase.expectedJson().get();
     String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
     Gson gson = new Gson();
     JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
-    JsonObject expectedJson = gson.fromJson(expectedJsonString, JsonObject.class);
-    expect.that(snoopedJson).isEqualTo(expectedJson);
+    expect.withMessage("Testing with %s", testCase).that(snoopedJson).isEqualTo(expectedJson);
   }
 
   private void testHttpFunction(String target, List<TestCase> testCases) throws Exception {
@@ -518,7 +534,7 @@ private void testFunction(
         testCase.expectedContentType()
             .ifPresent(type -> expect.that(response.getMediaType()).isEqualTo(type));
         if (testCase.snoopFile().isPresent()) {
-          checkSnoopFile(testCase.snoopFile().get(), testCase.expectedJsonString().get());
+          checkSnoopFile(testCase);
         }
         testCase.expectedOutput()
             .ifPresent(output -> expect.that(serverProcess.output().toString()).contains(output));
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
index e20123fa..ca89c816 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
@@ -34,6 +34,7 @@ public void accept(String json, Context context) {
     JsonObject contextAndPayloadJson = new JsonObject();
     contextAndPayloadJson.add("data", jsonObject);
     contextAndPayloadJson.add("context", contextJson);
+    contextAndPayloadJson.add("attributes", gson.toJsonTree(context.attributes()));
     try (FileWriter fileWriter = new FileWriter(targetFile);
         PrintWriter writer = new PrintWriter(fileWriter)) {
       writer.println(contextAndPayloadJson);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
index b156cbb2..68457fd5 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
@@ -40,6 +40,7 @@ public void accept(Payload payload, Context context) {
     JsonObject contextAndPayloadJson = new JsonObject();
     contextAndPayloadJson.add("data", gson.toJsonTree(payload));
     contextAndPayloadJson.add("context", contextJson);
+    contextAndPayloadJson.add("attributes", gson.toJsonTree(context.attributes()));
     try (FileWriter fileWriter = new FileWriter(targetFile);
         PrintWriter writer = new PrintWriter(fileWriter)) {
       writer.println(contextAndPayloadJson);
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 01af5b92..009a547e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.0-alpha-2-rc3</version>
+        <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From 33a8928b644f64af500250c144b4cd56f440c684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 13 Apr 2020 11:06:40 -0700
Subject: [PATCH 014/308] Restore the corrected plugin invocation line. (#25)

It was accidentally uncorrected in a previous commit.
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index cafdbfe0..d7d4d735 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function:0.9.1:run \
+  mvn com.google.cloud.functions:function-maven-plugin:0.9.1:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 

From 09078144d8782a882bb13a4cdc23c0ce7f9ac60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 13 Apr 2020 13:54:42 -0700
Subject: [PATCH 015/308] Fix multipart support for HTTP functions. (#27)

Jetty requires a servlet to be configured explicitly before it will accept multipart input.
---
 .../functions/invoker/runner/Invoker.java     |  5 ++-
 .../functions/invoker/IntegrationTest.java    | 40 ++++++++++++++++---
 .../invoker/testfunctions/Multipart.java      | 36 +++++++++++++++++
 3 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 3bcd4ba4..e999fc8a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -55,6 +55,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
+import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -284,7 +285,9 @@ public void startServer() throws Exception {
           functionSignatureType);
       throw new RuntimeException(error);
     }
-    servletContextHandler.addServlet(new ServletHolder(servlet), "/*");
+    ServletHolder servletHolder = new ServletHolder(servlet);
+    servletHolder.getRegistration().setMultipartConfig(new MultipartConfigElement(""));
+    servletContextHandler.addServlet(servletHolder, "/*");
 
     server.start();
     logServerInfo();
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 00ec3b42..4ccecd16 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -59,9 +59,13 @@
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
 import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.api.ContentProvider;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
+import org.eclipse.jetty.client.util.BytesContentProvider;
+import org.eclipse.jetty.client.util.MultiPartContentProvider;
 import org.eclipse.jetty.client.util.StringContentProvider;
+import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
 import org.junit.BeforeClass;
@@ -150,7 +154,7 @@ abstract static class TestCase {
 
     abstract String url();
 
-    abstract String requestText();
+    abstract ContentProvider requestContent();
 
     abstract int expectedResponseCode();
 
@@ -162,7 +166,7 @@ abstract static class TestCase {
 
     abstract Optional<String> expectedOutput();
 
-    abstract String httpContentType();
+    abstract Optional<String> httpContentType();
 
     abstract ImmutableMap<String, String> httpHeaders();
 
@@ -183,7 +187,11 @@ abstract static class Builder {
 
       abstract Builder setUrl(String x);
 
-      abstract Builder setRequestText(String x);
+      abstract Builder setRequestContent(ContentProvider x);
+
+      Builder setRequestText(String text) {
+        return setRequestContent(new StringContentProvider(text));
+      }
 
       abstract Builder setExpectedResponseCode(int x);
 
@@ -199,6 +207,8 @@ abstract static class Builder {
 
       abstract Builder setHttpContentType(String x);
 
+      abstract Builder setHttpContentType(Optional<String> x);
+
       abstract Builder setHttpHeaders(ImmutableMap<String, String> x);
 
       abstract Builder setSnoopFile(File x);
@@ -408,6 +418,25 @@ public void packageless() throws Exception {
         ImmutableList.of(TestCase.builder().setExpectedResponseText("hello, world\n").build()));
   }
 
+  @Test
+  public void multipart() throws Exception {
+    MultiPartContentProvider multiPartProvider = new MultiPartContentProvider();
+    byte[] bytes = new byte[17];
+    multiPartProvider.addFieldPart("bytes", new BytesContentProvider(bytes), new HttpFields());
+    String string = "1234567890";
+    multiPartProvider.addFieldPart("string", new StringContentProvider(string), new HttpFields());
+    String expectedResponse = "part bytes type application/octet-stream length 17\n"
+        + "part string type text/plain;charset=UTF-8 length 10\n";
+    testHttpFunction(
+        fullTarget("Multipart"),
+        ImmutableList.of(
+            TestCase.builder()
+                .setHttpContentType(Optional.empty())
+                .setRequestContent(multiPartProvider)
+                .setExpectedResponseText(expectedResponse)
+                .build()));
+  }
+
   private File snoopFile() throws IOException {
     return temporaryFolder.newFile(testName.getMethodName() + ".txt");
   }
@@ -522,9 +551,10 @@ private void testFunction(
         testCase.snoopFile().ifPresent(File::delete);
         String uri = "http://localhost:" + serverPort + testCase.url();
         Request request = httpClient.POST(uri);
-        request.header(HttpHeader.CONTENT_TYPE, testCase.httpContentType());
+        testCase.httpContentType().ifPresent(
+            contentType -> request.header(HttpHeader.CONTENT_TYPE, contentType));
         testCase.httpHeaders().forEach((header, value) -> request.header(header, value));
-        request.content(new StringContentProvider(testCase.requestText()));
+        request.content(testCase.requestContent());
         ContentResponse response = request.send();
         expect
             .withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
new file mode 100644
index 00000000..edb44606
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
@@ -0,0 +1,36 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpRequest.HttpPart;
+import com.google.cloud.functions.HttpResponse;
+import java.io.PrintWriter;
+import java.util.NavigableMap;
+import java.util.TreeMap;
+
+/**
+ * A simple proof-of-concept function for multipart handling.
+ *
+ * {@code HttpFunctionTest} contains more detailed testing, but this function is part of the
+ * integration test that shows that we can indeed access the multipart API from a function.
+ */
+public class Multipart implements HttpFunction {
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws Exception {
+    response.setContentType("text/plain");
+    String contentType = request.getContentType().orElse("<unknown>");
+    if (!contentType.startsWith("multipart/form-data")) {
+      response.getWriter().write("Content-Type is " + contentType + " not multipart/form-data");
+      return;
+    }
+    PrintWriter writer = new PrintWriter(response.getWriter());
+    NavigableMap<String, HttpPart> parts = new TreeMap<>(request.getParts());
+    parts.forEach(
+        (name, contents) -> {
+          writer.printf(
+              "part %s type %s length %d\n",
+              name, contents.getContentType().get(), contents.getContentLength());
+        }
+    );
+  }
+}

From 809d05a3b1255bca8e8adcb36c170b7b40ab0b7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 13 Apr 2020 14:39:26 -0700
Subject: [PATCH 016/308] Keep ClassNotFoundException as cause when reporting
 function not found. (#26)

The code is complicated by the support for legacy "ClassName.method" way of
specifying function targets, which we will delete when we delete java8 support
from GCF. Under the assumption that the user did mean to use the new form, we
remember what the ClassNotFoundException was that caused us to fail, and we
include that in the cause chain of the final exception. That way the user can
see a possible ExceptionInInitializerError or the like that might be the
underlying reason for the failure.
---
 .../functions/invoker/FunctionLoader.java     | 10 ++-
 .../functions/invoker/runner/Invoker.java     | 89 ++++++++++++++-----
 .../invoker/BackgroundFunctionTest.java       |  7 +-
 .../functions/invoker/HttpFunctionTest.java   |  2 +-
 4 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
index c5b2dc08..509a5e3a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
@@ -22,14 +22,17 @@ public class FunctionLoader<T extends CloudFunction> {
   private final String functionTarget;
   private final ClassLoader classLoader;
   private final FunctionSignatureMatcher<T> matcher;
+  private final ClassNotFoundException newStyleException;
 
   public FunctionLoader(
       String functionTarget,
       ClassLoader classLoader,
-      FunctionSignatureMatcher<T> matcher) {
+      FunctionSignatureMatcher<T> matcher,
+      ClassNotFoundException newStyleException) {
     this.functionTarget = functionTarget;
     this.classLoader = classLoader;
     this.matcher = matcher;
+    this.newStyleException = newStyleException;
   }
 
   /**
@@ -40,7 +43,7 @@ public FunctionLoader(
   public T loadUserFunction() throws Exception {
     int lastDotIndex = functionTarget.lastIndexOf(".");
     if (lastDotIndex == -1) {
-      throw new ClassNotFoundException(functionTarget);
+      throw newStyleException;
     }
     String targetClassName = functionTarget.substring(0, lastDotIndex);
     String targetMethodName = functionTarget.substring(lastDotIndex + 1);
@@ -50,7 +53,8 @@ public T loadUserFunction() throws Exception {
     } catch (ClassNotFoundException e) {
       throw new RuntimeException(
           "Could not load either " + functionTarget + " (new form) or "
-              + targetClassName + " (old form)");
+              + targetClassName + " (old form)",
+          newStyleException);
     }
 
     Object targetInstance = targetClass.getDeclaredConstructor().newInstance();
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index e999fc8a..6f17b6d2 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -19,6 +19,7 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
+import com.google.auto.value.AutoOneOf;
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
@@ -250,34 +251,48 @@ public void startServer() throws Exception {
     servletContextHandler.setContextPath("/");
     server.setHandler(NotFoundHandler.forServlet(servletContextHandler));
 
-    Optional<Class<?>> functionClass = loadFunctionClass();
+    ClassOrException functionClass = loadFunctionClass();
 
     HttpServlet servlet;
     if ("http".equals(functionSignatureType)) {
-      if (functionClass.isPresent()) {
-        servlet = NewHttpFunctionExecutor.forClass(functionClass.get());
-      } else {
-        FunctionLoader<HttpCloudFunction> loader = new FunctionLoader<>(
-            functionTarget, functionClassLoader, new HttpFunctionSignatureMatcher());
-        HttpCloudFunction function = loader.loadUserFunction();
-        servlet = new HttpFunctionExecutor(function);
+      switch (functionClass.getKind()) {
+        case LOADED_CLASS:
+          servlet = NewHttpFunctionExecutor.forClass(functionClass.loadedClass());
+          break;
+        default:
+          FunctionLoader<HttpCloudFunction> loader =
+              new FunctionLoader<>(
+                  functionTarget,
+                  functionClassLoader,
+                  new HttpFunctionSignatureMatcher(),
+                  functionClass.exception());
+          HttpCloudFunction function = loader.loadUserFunction();
+          servlet = new HttpFunctionExecutor(function);
       }
     } else if ("event".equals(functionSignatureType)) {
-      if (functionClass.isPresent()) {
-        servlet = NewBackgroundFunctionExecutor.forClass(functionClass.get());
-      } else {
-        FunctionLoader<BackgroundCloudFunction> loader =
-            new FunctionLoader<>(
-                functionTarget, functionClassLoader, new BackgroundFunctionSignatureMatcher());
-        BackgroundCloudFunction function = loader.loadUserFunction();
-        servlet = new BackgroundFunctionExecutor(function);
+      switch (functionClass.getKind()) {
+        case LOADED_CLASS:
+          servlet = NewBackgroundFunctionExecutor.forClass(functionClass.loadedClass());
+          break;
+        default:
+          FunctionLoader<BackgroundCloudFunction> loader =
+              new FunctionLoader<>(
+                  functionTarget,
+                  functionClassLoader,
+                  new BackgroundFunctionSignatureMatcher(),
+                  functionClass.exception());
+          BackgroundCloudFunction function = loader.loadUserFunction();
+          servlet = new BackgroundFunctionExecutor(function);
       }
     } else if (functionSignatureType == null) {
-      if (functionClass.isPresent()) {
-        servlet = servletForDeducedSignatureType(functionClass.get());
-      } else {
-        throw new RuntimeException(
-            "Class " + functionTarget + " does not exist or could not be loaded");
+      switch (functionClass.getKind()) {
+        case LOADED_CLASS:
+          servlet = servletForDeducedSignatureType(functionClass.loadedClass());
+          break;
+        default:
+          throw new RuntimeException(
+              "Class " + functionTarget + " does not exist or could not be loaded",
+              functionClass.exception());
       }
     } else {
       String error = String.format(
@@ -294,18 +309,44 @@ public void startServer() throws Exception {
     server.join();
   }
 
-  private Optional<Class<?>> loadFunctionClass() {
+  @AutoOneOf(ClassOrException.Kind.class)
+  abstract static class ClassOrException {
+    enum Kind {LOADED_CLASS, EXCEPTION}
+
+    abstract Kind getKind();
+
+    abstract Class<?> loadedClass();
+
+    abstract ClassNotFoundException exception();
+
+    static ClassOrException of(Class<?> c) {
+      return AutoOneOf_Invoker_ClassOrException.loadedClass(c);
+    }
+
+    static ClassOrException of(ClassNotFoundException e) {
+      return AutoOneOf_Invoker_ClassOrException.exception(e);
+    }
+  }
+
+  private ClassOrException loadFunctionClass() {
     String target = functionTarget;
+    ClassNotFoundException firstException = null;
     while (true) {
       try {
-        return Optional.of(functionClassLoader.loadClass(target));
+        return ClassOrException.of(functionClassLoader.loadClass(target));
       } catch (ClassNotFoundException e) {
+        if (firstException == null) {
+          firstException = e;
+        }
         // This might be a nested class like com.example.Foo.Bar. That will actually appear as
         // com.example.Foo$Bar as far as Class.forName is concerned. So we try to replace every dot
         // from the last to the first with a $ in the hope of finding a class we can load.
         int lastDot = target.lastIndexOf('.');
         if (lastDot < 0) {
-          return Optional.empty();
+          // We're going to try to load the function target using the old form, classname.method.
+          // But it's at least as likely that the class does exist, but we failed to load it for
+          // some other reason. So ensure that we keep the exception to show to the user.
+          return ClassOrException.of(firstException);
         }
         target = target.substring(0, lastDot) + '$' + target.substring(lastDot + 1);
       }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
index f52071d6..7b0273cb 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
@@ -84,8 +84,11 @@ public void adder() throws Exception {
     HttpServletResponse res = Mockito.mock(HttpServletResponse.class);
     String fullTarget = "com.google.cloud.functions.invoker.BackgroundFunctionTest$" + target;
     FunctionLoader<BackgroundCloudFunction> loader =
-        new FunctionLoader<>(fullTarget, getClass().getClassLoader(),
-            new BackgroundFunctionSignatureMatcher());
+        new FunctionLoader<>(
+            fullTarget,
+            getClass().getClassLoader(),
+            new BackgroundFunctionSignatureMatcher(),
+            null);
     BackgroundCloudFunction function = loader.loadUserFunction();
     BackgroundFunctionExecutor executor = new BackgroundFunctionExecutor(function);
     Mockito.when(req.getReader())
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
index 4f51315e..d1ee811d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
@@ -45,7 +45,7 @@ public void adder() throws Exception {
         "com.google.cloud.functions.invoker.HttpFunctionTest$HttpWriter.writeResponse";
     String requestData = "testData";
     FunctionLoader<HttpCloudFunction> loader = new FunctionLoader<>(
-        fullTarget, getClass().getClassLoader(), new HttpFunctionSignatureMatcher());
+        fullTarget, getClass().getClassLoader(), new HttpFunctionSignatureMatcher(), null);
     HttpCloudFunction function = loader.loadUserFunction();
     HttpFunctionExecutor executor = new HttpFunctionExecutor(function);
     Mockito.when(req.getParameter("data")).thenReturn(requestData);

From 5172361aa8f74e8bba3a05500dac3b7538f77fe5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Mon, 13 Apr 2020 15:48:19 -0700
Subject: [PATCH 017/308] [maven-release-plugin] prepare release
 functions-framework-api-1.0.1

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index b92c5fa8..e7fa69d4 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+  <version>1.0.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>HEAD</tag>
+    <tag>functions-framework-api-1.0.1</tag>
   </scm>
 
   <build>

From 747b9d7bd64a1b517e6a40e5f5616b45c5dd5a0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Mon, 13 Apr 2020 16:05:08 -0700
Subject: [PATCH 018/308] [maven-release-plugin] prepare for next development
 iteration

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index e7fa69d4..5470ab2a 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>functions-framework-api-1.0.1</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <build>

From efcfe7d8df9a60f0b76b8d4a97bd86900f3dc10d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 14 Apr 2020 07:39:31 -0700
Subject: [PATCH 019/308] Update to reference newly-released API. (#28)

---
 README.md       | 6 +++---
 invoker/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index d7d4d735..2c488bdf 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ that supports Maven to create the Maven project. Add this dependency in the
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.0.0-alpha-2-rc3</version>
+      <version>1.0.1</version>
       <scope>provided</scope>
     </dependency>
 ```
@@ -42,7 +42,7 @@ Framework dependency in your `build.gradle` project file as follows:
 
 ```groovy
     dependencies {
-        implementation 'com.google.cloud.functions:functions-framework-api:1.0.0-alpha-2-rc3'
+        implementation 'com.google.cloud.functions:functions-framework-api:1.0.1'
     }
 
 ```
@@ -206,7 +206,7 @@ configurations {
 }
 
 dependencies {
-    implementation 'com.google.cloud.functions:functions-framework-api:1.0.0-alpha-2-rc3'
+    implementation 'com.google.cloud.functions:functions-framework-api:1.0.1'
     invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc4'
 }
 
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 009a547e..99b02c7c 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.0-alpha-2-rc4-SNAPSHOT</version>
+        <version>1.0.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From 611c1368fff8054fa7c6ac5c13d3d0c488167667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Tue, 14 Apr 2020 13:49:51 -0700
Subject: [PATCH 020/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.0-alpha-2-rc5

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 26efdd7f..f6735c19 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
+    <version>1.0.0-alpha-2-rc5</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
+  <version>1.0.0-alpha-2-rc5</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-alpha-4-SNAPSHOT</version>
+      <version>1.0.0-alpha-4</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 94bb6280..7dd25dbf 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
+    <version>1.0.0-alpha-2-rc5</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.2-SNAPSHOT</version>
+  <version>0.9.2</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
+      <version>1.0.0-alpha-2-rc5</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 99b02c7c..5a07a79a 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
+  <version>1.0.0-alpha-2-rc5</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index b7b9d820..2bf70d76 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc5-SNAPSHOT</version>
+    <version>1.0.0-alpha-2-rc5</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-alpha-4-SNAPSHOT</version>
+  <version>1.0.0-alpha-4</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From e78694ccad68ed208705ca9a47be4b24d98cf846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Tue, 14 Apr 2020 13:50:01 -0700
Subject: [PATCH 021/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index f6735c19..bdc75287 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc5</version>
+    <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-alpha-2-rc5</version>
+  <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-alpha-4</version>
+      <version>1.0.0-alpha-5-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 7dd25dbf..8eb7236f 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc5</version>
+    <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.2</version>
+  <version>0.9.3-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-alpha-2-rc5</version>
+      <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 5a07a79a..b4dacbb1 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-alpha-2-rc5</version>
+  <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 2bf70d76..51836e8c 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc5</version>
+    <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-alpha-4</version>
+  <version>1.0.0-alpha-5-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 2ec1cab07fde9e303e88d8db51413bcaf9332360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 19 May 2020 12:38:22 -0700
Subject: [PATCH 022/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.0-beta1

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index bdc75287..c5930175 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
+    <version>1.0.0-beta1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
+  <version>1.0.0-beta1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-alpha-5-SNAPSHOT</version>
+      <version>1.0.0-beta1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 8eb7236f..bb5d59fe 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
+    <version>1.0.0-beta1</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.3-SNAPSHOT</version>
+  <version>0.9.3</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
+      <version>1.0.0-beta1</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b4dacbb1..71f810e2 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
+  <version>1.0.0-beta1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 51836e8c..4c4531d8 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-alpha-2-rc6-SNAPSHOT</version>
+    <version>1.0.0-beta1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-alpha-5-SNAPSHOT</version>
+  <version>1.0.0-beta1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 7d1ab74e8b5ee39a4c81f3ef2214ab0632b99ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 19 May 2020 12:38:31 -0700
Subject: [PATCH 023/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index c5930175..ff867ac5 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta1</version>
+    <version>1.0.0-beta2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-beta1</version>
+  <version>1.0.0-beta2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-beta1</version>
+      <version>1.0.0-beta2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index bb5d59fe..a8be2c04 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta1</version>
+    <version>1.0.0-beta2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.3</version>
+  <version>0.9.4-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-beta1</version>
+      <version>1.0.0-beta2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 71f810e2..b13bdd77 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-beta1</version>
+  <version>1.0.0-beta2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 4c4531d8..d79efa09 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta1</version>
+    <version>1.0.0-beta2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-beta1</version>
+  <version>1.0.0-beta2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From cd643808b37d41473115a5a350b007026a369ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 25 May 2020 08:19:44 -0700
Subject: [PATCH 024/308] Improve the javadoc for the API. (#33)

* Some code extracts had strange spacing because of longstanding bugs in the javadoc tool.

* Most javadoc warnings have been fixed, often at the cost of annoyingly redundant
  `@param` and `@return` tags.
---
 .../cloud/functions/BackgroundFunction.java   |  9 ++++--
 .../google/cloud/functions/HttpFunction.java  |  4 +++
 .../google/cloud/functions/HttpMessage.java   | 29 ++++++++++++++---
 .../google/cloud/functions/HttpRequest.java   | 31 ++++++++++++++++---
 .../google/cloud/functions/HttpResponse.java  | 27 ++++++++++++++--
 .../functions/RawBackgroundFunction.java      |  9 ++++--
 6 files changed, 92 insertions(+), 17 deletions(-)

diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
index 381423fc..890a5ade 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
@@ -23,11 +23,13 @@
  * <p>Here is an example of an implementation that accesses the {@code messageId} property from
  * a payload that matches a user-defined {@code PubSubMessage} class:
  *
+ * <!-- The {@code} placement is a bit strange here, to prevent spurious spaces introduced by the
+ *      javadoc tool. -->
  * <pre>
- * public class Example implements {@code BackgroundFunction<PubSubMessage>} {
+ * public class Example implements{@code BackgroundFunction<PubSubMessage>} {
  *   private static final Logger logger = Logger.getLogger(Example.class.getName());
  *
- *   {@code @Override}
+ *  {@code @Override}
  *   public void accept(PubSubMessage pubSubMessage, Context context) {
  *     logger.info("Got messageId " + pubSubMessage.messageId);
  *   }
@@ -36,7 +38,7 @@
  * // Where PubSubMessage is a user-defined class like this:
  * public class PubSubMessage {
  *   String data;
- *   {@code Map<String, String>} attributes;
+ *  {@code Map<String, String>} attributes;
  *   String messageId;
  *   String publishTime;
  * }
@@ -54,6 +56,7 @@ public interface BackgroundFunction<T> {
    * @param payload the payload of the event, deserialized from the original JSON string.
    * @param context the context of the event. This is a set of values that every event has,
    *     separately from the payload, such as timestamp and event type.
+   * @throws Exception to produce a 500 status code in the HTTP response.
    */
   void accept(T payload, Context context) throws Exception;
 }
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java
index 3f8e4239..59065ef6 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java
@@ -23,6 +23,10 @@ public interface HttpFunction {
    * Called to service an incoming HTTP request. This interface is implemented by user code to
    * provide the action for a given function. If the method throws any exception (including any
    * {@link Error}) then the HTTP response will have a 500 status code.
+   *
+   * @param request a representation of the incoming HTTP request.
+   * @param response an object that can be used to provide the corresponding HTTP response.
+   * @throws Exception if thrown, the HTTP response will have a 500 status code.
    */
   void service(HttpRequest request, HttpResponse response) throws Exception;
 }
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java
index b946cafc..43b56da3 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java
@@ -25,16 +25,26 @@
  * Represents an HTTP message, either an HTTP request or a part of a multipart HTTP request.
  */
 public interface HttpMessage {
-  /** Returns the value of the {@code Content-Type} header, if any. */
+  /**
+   * Returns the value of the {@code Content-Type} header, if any.
+   *
+   * @return the content type, if any.
+   */
   Optional<String> getContentType();
 
-  /** Returns the numeric value of the {@code Content-Length} header. */
+  /**
+   * Returns the numeric value of the {@code Content-Length} header.
+   *
+   * @return the content length.
+   */
   long getContentLength();
 
   /**
    * Returns the character encoding specified in the {@code Content-Type} header,
    * or {@code Optional.empty()} if there is no {@code Content-Type} header or it does not have the
    * {@code charset} parameter.
+   *
+   * @return the character encoding for the content type, if one is specified.
    */
   Optional<String> getCharacterEncoding();
 
@@ -44,6 +54,7 @@ public interface HttpMessage {
    * This method is typically used to read binary data. If the body is text, the
    * {@link #getReader()} method is more appropriate.
    *
+   * @return an {@link InputStream} that can be used to read the body of this HTTP request.
    * @throws IOException if a valid {@link InputStream} cannot be returned for some reason.
    * @throws IllegalStateException if {@link #getReader()} has already been called on this instance.
    */
@@ -53,6 +64,7 @@ public interface HttpMessage {
    * Returns a {@link BufferedReader} that can be used to read the text body of this HTTP request.
    * Every call to this method on the same {@link HttpMessage} will return the same object.
    *
+   * @return a {@link BufferedReader} that can be used to read the text body of this HTTP request.
    * @throws IOException if a valid {@link BufferedReader} cannot be returned for some reason.
    * @throws IllegalStateException if {@link #getInputStream()} has already been called on this
    *     instance.
@@ -69,9 +81,12 @@ public interface HttpMessage {
    *   Some-Header: another value
    * </pre>
    *
-   * ...then the returned value will map {@code Content-Type} to a one-element list containing
-   * {@code text/plain}, and {@code Some-Header} to a two-element list containing {@code some value}
-   * and {@code another value}.
+   * ...then the returned value will map {@code "Content-Type"} to a one-element list containing
+   * {@code "text/plain"}, and {@code "Some-Header"} to a two-element list containing
+   * {@code "some value"} and {@code "another value"}.
+   *
+   * @return a map where each key is an HTTP header and the corresponding {@code List} value has
+   *     one element for each occurrence of that header.
    */
   Map<String, List<String>> getHeaders();
 
@@ -87,6 +102,10 @@ public interface HttpMessage {
    *
    * ...then {@code getFirstHeader("Some-Header")} will return {@code Optional.of("some value")},
    * and {@code getFirstHeader("Another-Header")} will return {@code Optional.empty()}.
+   *
+   * @param name an HTTP header name.
+   *
+   * @return the first value of the given header, if present.
    */
   default Optional<String> getFirstHeader(String name) {
     List<String> headers = getHeaders().get(name);
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java
index 829f309b..fb1999cf 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java
@@ -22,15 +22,25 @@
  * Represents the contents of an HTTP request that is being serviced by a Cloud Function.
  */
 public interface HttpRequest extends HttpMessage {
-  /** The HTTP method of this request, such as {@code "POST"} or {@code "GET"}. */
+  /**
+   * The HTTP method of this request, such as {@code "POST"} or {@code "GET"}.
+   *
+   * @return the HTTP method of this request.
+   */
   String getMethod();
 
-  /** The full URI of this request as it arrived at the server. */
+  /**
+   * The full URI of this request as it arrived at the server.
+   *
+   * @return the full URI of this request.
+   */
   String getUri();
 
   /**
    * The path part of the URI for this request, without any query. If the full URI is
    * {@code http://foo.com/bar/baz?this=that}, then this method will return {@code /bar/baz}.
+   *
+   * @return the path part of the URI for this request.
    */
   String getPath();
 
@@ -38,14 +48,19 @@ public interface HttpRequest extends HttpMessage {
    * The query part of the URI for this request. If the full URI is
    * {@code http://foo.com/bar/baz?this=that}, then this method will return {@code this=that}.
    * If there is no query part, the returned {@code Optional} is empty.
+   *
+   * @return the query part of the URI, if any.
    */
   Optional<String> getQuery();
 
   /**
    * The query parameters of this request. If the full URI is
    * {@code http://foo.com/bar?thing=thing1&thing=thing2&cat=hat}, then the returned map will map
-   * {@code thing} to the list {@code "thing1", "thing2"} and {@code cat} to the list with the
+   * {@code thing} to the list {@code ["thing1", "thing2"]} and {@code cat} to the list with the
    * single element {@code "hat"}.
+   *
+   * @return a map where each key is the name of a query parameter and the corresponding
+   *     {@code List} value indicates every value that was associated with that name.
    */
   Map<String, List<String>> getQueryParameters();
 
@@ -55,6 +70,9 @@ public interface HttpRequest extends HttpMessage {
    * {@code getFirstQueryParameter("thing")} will return {@code Optional.of("thing1")} and
    * {@code getFirstQueryParameter("something")} will return {@code Optional.empty()}. This is a
    * more convenient alternative to {@link #getQueryParameters}.
+   *
+   * @param name a query parameter name.
+   * @return the first query parameter value with the given name, if any.
    */
   default Optional<String> getFirstQueryParameter(String name) {
     List<String> parameters = getQueryParameters().get(name);
@@ -70,7 +88,11 @@ default Optional<String> getFirstQueryParameter(String name) {
    * {@link HttpMessage}.
    */
   interface HttpPart extends HttpMessage {
-    /** Returns the filename associated with this part, if any. */
+    /**
+     * Returns the filename associated with this part, if any.
+     *
+     * @return the filename associated with this part, if any.
+     */
     Optional<String> getFileName();
   }
 
@@ -79,6 +101,7 @@ interface HttpPart extends HttpMessage {
    * in the returned map has the name of the part as its key and the contents as the associated
    * value.
    *
+   * @return a map from part names to part contents.
    * @throws IllegalStateException if the {@link #getContentType() content type} is not
    *     {@code multipart/form-data}.
    */
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java
index 7d5188a1..9098315d 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java
@@ -29,7 +29,12 @@ public interface HttpResponse {
   /**
    * Sets the numeric HTTP
    * <a href="https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml">status
-   * code</a> to use in the response. Most often this will be 200, which is the OK status.
+   * code</a> to use in the response. Most often this will be 200, which is the OK status. The
+   * named constants in {@link java.net.HttpURLConnection}, such as
+   * {@link java.net.HttpURLConnection#HTTP_OK HTTP_OK}, can be used as an alternative to writing
+   * numbers in your source code.
+   *
+   * @param code the status code.
    */
   void setStatusCode(int code);
 
@@ -37,13 +42,21 @@ public interface HttpResponse {
    * Sets the numeric HTTP
    * <a href="https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml">status
    * code</a> and reason message to use in the response. For example<br>
-   * {@code setStatusCode(400, "Something went wrong")}.
+   * {@code setStatusCode(400, "Something went wrong")}. The
+   * named constants in {@link java.net.HttpURLConnection}, such as
+   * {@link java.net.HttpURLConnection#HTTP_BAD_REQUEST HTTP_BAD_REQUEST}, can be used as an
+   * alternative to writing numbers in your source code.
+   *
+   * @param code the status code.
+   * @param message the status message.
    */
   void setStatusCode(int code, String message);
 
   /**
    * Sets the value to use for the {@code Content-Type} header in the response. This may include
    * a character encoding, for example {@code setContentType("text/plain; charset=utf-8")}.
+   *
+   * @param contentType the content type.
    */
   void setContentType(String contentType);
 
@@ -51,6 +64,8 @@ public interface HttpResponse {
    * Returns the {@code Content-Type} that was previously set by {@link #setContentType}, or by
    * {@link #appendHeader} with a header name of {@code Content-Type}. If no {@code Content-Type}
    * has been set, returns {@code Optional.empty()}.
+   *
+   * @return the content type, if any.
    */
   Optional<String> getContentType();
 
@@ -58,6 +73,9 @@ public interface HttpResponse {
    * Includes the given header name with the given value in the response. This method may be called
    * several times for the same header, in which case the response will contain the header the same
    * number of times.
+   *
+   * @param header an HTTP header, such as {@code Content-Type}.
+   * @param value a value to associate with that header.
    */
   void appendHeader(String header, String value);
 
@@ -65,6 +83,9 @@ public interface HttpResponse {
    * Returns the headers that have been defined for the response so far. This will contain at least
    * the headers that have been set via {@link #appendHeader} or {@link #setContentType}, and may
    * contain additional headers such as {@code Date}.
+   *
+   * @return a map where each key is a header name and the corresponding {@code List} value has one
+   *     entry for every value associated with that header.
    */
   Map<String, List<String>> getHeaders();
 
@@ -73,6 +94,7 @@ public interface HttpResponse {
    * This method is typically used to write binary data. If the body is text, the
    * {@link #getWriter()} method is more appropriate.
    *
+   * @return the output stream.
    * @throws IOException if a valid {@link OutputStream} cannot be returned for some reason.
    * @throws IllegalStateException if {@link #getWriter} has already been called on this instance.
    */
@@ -85,6 +107,7 @@ public interface HttpResponse {
    * {@link #appendHeader appendHeader("Content-Type", "text/foo; charset=bar")}
    * before calling this method.
    *
+   * @return the writer.
    * @throws IOException if a valid {@link BufferedWriter} cannot be returned for some reason.
    * @throws IllegalStateException if {@link #getOutputStream} has already been called on this
    *     instance.
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
index 9b3b2439..6eff26d2 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
@@ -22,11 +22,13 @@
  * <p>Here is an example of an implementation that parses the JSON payload using Gson, to access its
  * {@code messageId} property:
  *
+ * <!-- The {@code} placement is a bit strange here, to prevent spurious spaces introduced by the
+ *      javadoc tool. -->
  * <pre>
  * public class Example implements RawBackgroundFunction {
  *   private static final Logger logger = Logger.getLogger(Example.class.getName());
  *
- *   {@code @Override}
+ *  {@code @Override}
  *   public void accept(String json, Context context) {
  *     JsonObject jsonObject = new Gson().fromJson(json, JsonObject.class);
  *     JsonElement messageId = jsonObject.get("messageId");
@@ -43,7 +45,7 @@
  * public class Example implements RawBackgroundFunction {
  *   private static final Logger logger = Logger.getLogger(Example.class.getName());
  *
- *   {@code @Override}
+ *  {@code @Override}
  *   public void accept(String json, Context context) {
  *     PubSubMessage message = new Gson().fromJson(json, PubSubMessage.class);
  *     logger.info("Got messageId " + message.messageId);
@@ -53,7 +55,7 @@
  * // Where PubSubMessage is a user-defined class like this:
  * public class PubSubMessage {
  *   String data;
- *   {@code Map<String, String>} attributes;
+ *  {@code Map<String, String>} attributes;
  *   String messageId;
  *   String publishTime;
  * }
@@ -69,6 +71,7 @@ public interface RawBackgroundFunction {
    * @param json the payload of the event, as a JSON string.
    * @param context the context of the event. This is a set of values that every event has,
    *     separately from the payload, such as timestamp and event type.
+   * @throws Exception to produce a 500 status code in the HTTP response.
    */
   void accept(String json, Context context) throws Exception;
 }

From a854c95a3a83151b0d733a604d7d0aa5ca410000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 25 May 2020 08:20:12 -0700
Subject: [PATCH 025/308] Update README.md to reflect latest releases. (#31)

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2c488bdf..8aa3cb4a 100644
--- a/README.md
+++ b/README.md
@@ -150,7 +150,7 @@ You can configure the plugin in `pom.xml`:
 <plugin>
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
-  <version>0.9.1</version>
+  <version>0.9.2</version>
   <configuration>
     <functionTarget>com.example.function.Echo</functionTarget>
   </configuration>
@@ -168,7 +168,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function-maven-plugin:0.9.1:run \
+  mvn com.google.cloud.functions:function-maven-plugin:0.9.2:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 
@@ -179,7 +179,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc4' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc5' \
     -DoutputDirectory=.
 ```
 
@@ -187,7 +187,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
+java -jar java-function-invoker-1.0.0-alpha-2-rc5.jar \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -207,7 +207,7 @@ configurations {
 
 dependencies {
     implementation 'com.google.cloud.functions:functions-framework-api:1.0.1'
-    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc4'
+    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc5'
 }
 
 tasks.register("runFunction", JavaExec) {
@@ -280,7 +280,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
+java -jar java-function-invoker-1.0.0-alpha-2-rc5.jar \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From 5d9ff6d9eb21f001dd9feb018bd9f93a5a299195 Mon Sep 17 00:00:00 2001
From: Graeme Rocher <graeme.rocher@gmail.com>
Date: Mon, 25 May 2020 19:58:40 +0200
Subject: [PATCH 026/308] Correctly resolve function runtime classpath in Maven
 plugin. Fixes #30 (#32)

* Correctly resolve function runtime classpath. Fixes #30
---
 .../google/cloud/functions/plugin/RunFunction.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
index dd5cb83c..2e3d70dc 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
@@ -39,11 +39,12 @@
  */
 @Mojo(name = "run",
     defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
-    requiresDependencyResolution = ResolutionScope.COMPILE,
-    requiresDependencyCollection = ResolutionScope.COMPILE)
+    requiresDependencyResolution = ResolutionScope.RUNTIME,
+    requiresDependencyCollection = ResolutionScope.RUNTIME)
 @Execute(phase = LifecyclePhase.COMPILE)
 public class RunFunction extends AbstractMojo {
 
+
   /**
    * The name of the function to run. This is the name of a class that implements one of the
    * interfaces in {@code com.google.cloud.functions}.
@@ -61,11 +62,11 @@ public class RunFunction extends AbstractMojo {
    * Used to determine what classpath needs to be used to load the function. This parameter is
    * injected by Maven and can't be set explicitly in a pom.xml file.
    */
-  @Parameter(defaultValue = "${project.compileClasspathElements}", readonly = true, required = true)
-  private List<String> compilePath;
+  @Parameter(defaultValue = "${project.runtimeClasspathElements}", readonly = true, required = true)
+  private List<String> runtimePath;
 
   public void execute() throws MojoExecutionException {
-    String classpath = String.join(File.pathSeparator, compilePath);
+    String classpath = String.join(File.pathSeparator, runtimePath);
     List<String> args = new ArrayList<>();
     args.addAll(Arrays.asList("--classpath", classpath));
     if (functionTarget != null) {

From d60ce1afdd98c0a7bebfa045ee3f9750d6db3b59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 1 Jun 2020 18:27:54 -0700
Subject: [PATCH 027/308] Remove code for old-style function signatures. (#38)

* Remove code for old-style function signatures.

The old style was package.name.ClassName.methodName, which was the only form
recognized by the obsolete GCF java8 runtime. The new style is just
package.name.ClassName, which we retain.

A later step will rename classes like NewHttpFunctionExecutor to just
HttpFunctionExecutor.

* Fix a race condition in the logging test. If we are expecting a certain output
from the subprocess, we should wait for it to complete before looking for that.

* Fix a javadoc comment that referenced the old style.
---
 .../invoker/BackgroundCloudFunction.java      |  53 ---------
 .../invoker/BackgroundFunctionExecutor.java   |  59 ----------
 .../BackgroundFunctionSignatureMatcher.java   |  59 ----------
 .../functions/invoker/CloudFunction.java      |  44 --------
 .../functions/invoker/FunctionLoader.java     |  63 -----------
 .../invoker/FunctionSignatureMatcher.java     |  40 -------
 .../functions/invoker/HttpCloudFunction.java  |  33 ------
 .../invoker/HttpFunctionExecutor.java         |  40 -------
 .../invoker/HttpFunctionSignatureMatcher.java |  49 ---------
 .../functions/invoker/runner/Invoker.java     |  89 ++-------------
 .../invoker/BackgroundFunctionTest.java       | 104 ------------------
 .../functions/invoker/HttpFunctionTest.java   |  70 ------------
 .../functions/invoker/IntegrationTest.java    |  51 ++-------
 .../functions/invoker/runner/InvokerTest.java |   2 +-
 .../testfunctions/BackgroundSnoop.java        |  38 -------
 .../functions/invoker/testfunctions/Echo.java |  29 -----
 .../invoker/testfunctions/EchoUrl.java        |  15 ---
 .../invoker/testfunctions/HelloWorld.java     |  12 --
 .../invoker/testfunctions/Multipart.java      |   2 +-
 .../test/resources/adder_gcf_beta_event.json  |  10 --
 .../adder_gcf_beta_event_json_resource.json   |  14 ---
 21 files changed, 18 insertions(+), 858 deletions(-)
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
 delete mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
 delete mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
 delete mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
 delete mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
 delete mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
 delete mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
 delete mode 100644 invoker/core/src/test/resources/adder_gcf_beta_event.json
 delete mode 100644 invoker/core/src/test/resources/adder_gcf_beta_event_json_resource.json

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
deleted file mode 100644
index 1e5189b4..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import com.google.cloud.functions.Context;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/** Wrapper for user background function. */
-public class BackgroundCloudFunction extends CloudFunction {
-
-  BackgroundCloudFunction(Object o, Method m) {
-    super(o, m);
-  }
-
-  void execute(JsonElement dataJson, Context context) throws InvocationTargetException {
-
-    Object data;
-    Class<?> dataParameterType = functionMethod.getParameterTypes()[0];
-    if (dataParameterType == JsonElement.class) {
-      data = dataJson;
-    } else {
-      Gson gson = new Gson();
-      try {
-        data = gson.fromJson(dataJson, dataParameterType);
-      } catch (JsonParseException e) {
-        throw new RuntimeException("Could not parse received event payload into type "
-            + dataParameterType.getCanonicalName(), e);
-      }
-    }
-
-    if (functionMethod.getParameterCount() == 2) {
-      rawExecute(data, context);
-    } else {
-      rawExecute(data);
-    }
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
deleted file mode 100644
index e18934e7..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.TypeAdapter;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/** Executes the user's background function. */
-public class BackgroundFunctionExecutor extends HttpServlet {
-
-  private final BackgroundCloudFunction function;
-
-  public BackgroundFunctionExecutor(BackgroundCloudFunction function) {
-    this.function = function;
-  }
-
-  /** Executes the user's background function, can handle all HTTP type methods. */
-  @Override
-  public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
-    BufferedReader body = req.getReader();
-
-    // A Type Adapter is required to set the type of the JsonObject because CloudFunctionsContext
-    // is abstract and Gson default behavior instantiates the type provided.
-    TypeAdapter<CloudFunctionsContext> typeAdapter =
-        CloudFunctionsContext.typeAdapter(new Gson());
-    Gson gson = new GsonBuilder()
-        .registerTypeAdapter(CloudFunctionsContext.class, typeAdapter)
-        .registerTypeAdapter(Event.class, new Event.EventDeserializer())
-        .create();
-
-    Event event = gson.fromJson(body, Event.class);
-    try {
-      function.execute(event.getData(), event.getContext());
-      res.setStatus(HttpServletResponse.SC_OK);
-    } catch (InvocationTargetException e) {
-      res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-      e.getCause().printStackTrace();
-    }
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
deleted file mode 100644
index 54180966..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import com.google.cloud.functions.Context;
-import java.lang.reflect.Method;
-
-/**
- * Implements {@link FunctionSignatureMatcher} for background functions. A valid background
- * functions has a first parameter that can be of any type (JSON payload is deserialized into this
- * parameter), and an optional second parameter of type {@link Context}.
- */
-public class BackgroundFunctionSignatureMatcher
-    implements FunctionSignatureMatcher<BackgroundCloudFunction> {
-
-  @Override
-  public BackgroundCloudFunction match(
-      Class<?> functionClass,
-      Object functionInstance,
-      String functionMethodName,
-      String functionTarget) {
-
-    for (Method method : functionClass.getMethods()) {
-      if (method.getName().equals(functionMethodName)) {
-        switch (method.getParameterCount()) {
-          case 1:
-            break;
-          case 2:
-            if (method.getParameterTypes()[1] == Context.class) {
-              break;
-            }
-            continue;
-          default:
-            continue;
-        }
-      }
-      return new BackgroundCloudFunction(functionInstance, method);
-    }
-    throw new RuntimeException(
-        String.format(
-            "%1$s didn't match any of the supported handler signatures for background functions."
-                + " Expected method signature of the form:"
-                + " %1$s(com.google.gson.JsonElement [, com.google.functions.Context]) or"
-                + " %1$s(your.CustomType [, com.google.functions.Context])",
-            functionTarget));
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
deleted file mode 100644
index ec73d26c..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-/**
- * A container for user function method and an instance of the associated class.
- * It allows to execute the function via {@link #rawExecute(Object...)}.
- */
-class CloudFunction {
-  final Object functionObject;
-  final Method functionMethod;
-
-  CloudFunction(Object functionObject, Method functionMethod) {
-    this.functionObject = functionObject;
-    this.functionMethod = functionMethod;
-
-    if (!functionMethod.getDeclaringClass().isAssignableFrom(functionObject.getClass())) {
-      throw new RuntimeException("Internal error: function object and method type mismatch");
-    }
-  }
-
-  Object rawExecute(Object... args) throws InvocationTargetException {
-    try {
-      return functionMethod.invoke(functionObject, args);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException("Could not access function method: is it public?", e);
-    }
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
deleted file mode 100644
index 509a5e3a..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-/**
- * Dynamically loads the user's function class and returns an instance of {@link CloudFunction}.
- */
-public class FunctionLoader<T extends CloudFunction> {
-
-  private final String functionTarget;
-  private final ClassLoader classLoader;
-  private final FunctionSignatureMatcher<T> matcher;
-  private final ClassNotFoundException newStyleException;
-
-  public FunctionLoader(
-      String functionTarget,
-      ClassLoader classLoader,
-      FunctionSignatureMatcher<T> matcher,
-      ClassNotFoundException newStyleException) {
-    this.functionTarget = functionTarget;
-    this.classLoader = classLoader;
-    this.matcher = matcher;
-    this.newStyleException = newStyleException;
-  }
-
-  /**
-   * Tries to dynamically load the class containing user function using a class loader.
-   * Automatically determines function signature type from the method signature and returns an
-   * instance of either {@link HttpCloudFunction} or {@link BackgroundCloudFunction}.
-   */
-  public T loadUserFunction() throws Exception {
-    int lastDotIndex = functionTarget.lastIndexOf(".");
-    if (lastDotIndex == -1) {
-      throw newStyleException;
-    }
-    String targetClassName = functionTarget.substring(0, lastDotIndex);
-    String targetMethodName = functionTarget.substring(lastDotIndex + 1);
-    Class<?> targetClass;
-    try {
-      targetClass = classLoader.loadClass(targetClassName);
-    } catch (ClassNotFoundException e) {
-      throw new RuntimeException(
-          "Could not load either " + functionTarget + " (new form) or "
-              + targetClassName + " (old form)",
-          newStyleException);
-    }
-
-    Object targetInstance = targetClass.getDeclaredConstructor().newInstance();
-    return matcher.match(targetClass, targetInstance, targetMethodName, functionTarget);
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
deleted file mode 100644
index bd2259c3..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-/**
- * An interface for classes that contain logic for matching user function method signature with
- * one of the supported signatures.
- *
- * @param <T> subtype of CloudFunction that is matched
- */
-public interface FunctionSignatureMatcher<T extends CloudFunction> {
-
-  /**
-   * Matches user function method with given name with the expected signature.
-   *
-   * @param functionClass user function class
-   * @param functionInstance instance of user function class
-   * @param functionMethodName name of the user function method specified in function target
-   * @param functionTarget
-   * @return instance of T if successfully matched
-   */
-  T match(
-      Class<?> functionClass,
-      Object functionInstance,
-      String functionMethodName,
-      String functionTarget)
-      throws RuntimeException;
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
deleted file mode 100644
index 95717fd6..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/** Wrapper for user HTTP function. */
-public class HttpCloudFunction extends CloudFunction {
-
-  public HttpCloudFunction(Object o, Method m) {
-    super(o, m);
-  }
-
-  public void execute(HttpServletRequest req, HttpServletResponse res)
-      throws InvocationTargetException {
-    rawExecute(req, res);
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
deleted file mode 100644
index 08d339de..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import java.lang.reflect.InvocationTargetException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/** Executes the user's method. */
-public class HttpFunctionExecutor extends HttpServlet {
-  private final HttpCloudFunction function;
-
-  public HttpFunctionExecutor(HttpCloudFunction function) {
-    this.function = function;
-  }
-
-  /** Executes the user's method, can handle all HTTP type methods. */
-  @Override
-  public void service(HttpServletRequest req, HttpServletResponse res) {
-    try {
-      function.execute(req, res);
-    } catch (InvocationTargetException e) {
-      res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-      e.getCause().printStackTrace();
-    }
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
deleted file mode 100644
index 2d4d9490..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import java.lang.reflect.Method;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * Implements {@link FunctionSignatureMatcher} for HTTP functions with signature:
- * void function(HttpServletRequest req, HttpServletResponse res);
- */
-public class HttpFunctionSignatureMatcher implements FunctionSignatureMatcher<HttpCloudFunction> {
-
-  @Override
-  public HttpCloudFunction match(
-      Class<?> functionClass,
-      Object functionInstance,
-      String functionMethodName,
-      String functionTarget) {
-    Method functionMethod;
-    try {
-      functionMethod =
-          functionClass.getMethod(
-              functionMethodName, HttpServletRequest.class, HttpServletResponse.class);
-    } catch (NoSuchMethodException e) {
-        throw new RuntimeException(
-            String.format(
-                "%1$s didn't match any of the supported handler signatures for HTTP functions."
-                    + " Expected method signature of the form:"
-                    + " %1$s(javax.servlet.http.HttpServletRequest,"
-                    + " javax.servlet.http.HttpServletResponse)",
-                functionTarget));
-    }
-    return new HttpCloudFunction(functionInstance, functionMethod);
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 6f17b6d2..e01329a1 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -19,17 +19,9 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
-import com.google.auto.value.AutoOneOf;
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
-import com.google.cloud.functions.invoker.BackgroundCloudFunction;
-import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
-import com.google.cloud.functions.invoker.BackgroundFunctionSignatureMatcher;
-import com.google.cloud.functions.invoker.FunctionLoader;
-import com.google.cloud.functions.invoker.HttpCloudFunction;
-import com.google.cloud.functions.invoker.HttpFunctionExecutor;
-import com.google.cloud.functions.invoker.HttpFunctionSignatureMatcher;
 import com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor;
 import com.google.cloud.functions.invoker.NewHttpFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
@@ -77,7 +69,7 @@
  *
  * <ul>
  *   <li>PORT - defines the port on which this server listens to HTTP requests.
- *   <li>FUNCTION_TARGET - defines the name of the method within user's class to execute.
+ *   <li>FUNCTION_TARGET - defines the name of the class defining the function.
  *   <li>FUNCTION_SIGNATURE_TYPE - determines whether the loaded code defines an HTTP or event
  *       function.
  * </ul>
@@ -105,14 +97,11 @@ private static class Options {
     )
     private String port = System.getenv().getOrDefault("PORT", "8080");
 
-    // TODO(emcmanus): the default value here no longer makes sense and should be changed to a
-    //    class name once we have finished retiring the java8 runtime.
     @Parameter(
         description = "Name of function class to execute when servicing incoming requests.",
         names = "--target"
     )
-    private String target =
-        System.getenv().getOrDefault("FUNCTION_TARGET", "TestFunction.function");
+    private String target = System.getenv().getOrDefault("FUNCTION_TARGET", "Function");
 
     @Parameter(
         description = "List of files or directories where the compiled Java classes making up"
@@ -199,10 +188,6 @@ private static void usage(JCommander jCommander) {
     jCommander.getConsole().println(usage);
   }
 
-  private static boolean isLocalRun() {
-    return System.getenv("K_SERVICE") == null;
-  }
-
   private static ClassLoader makeClassLoader(Optional<String> functionClasspath) {
     ClassLoader runtimeLoader = Invoker.class.getClassLoader();
     if (functionClasspath.isPresent()) {
@@ -251,49 +236,15 @@ public void startServer() throws Exception {
     servletContextHandler.setContextPath("/");
     server.setHandler(NotFoundHandler.forServlet(servletContextHandler));
 
-    ClassOrException functionClass = loadFunctionClass();
+    Class<?> functionClass = loadFunctionClass();
 
     HttpServlet servlet;
     if ("http".equals(functionSignatureType)) {
-      switch (functionClass.getKind()) {
-        case LOADED_CLASS:
-          servlet = NewHttpFunctionExecutor.forClass(functionClass.loadedClass());
-          break;
-        default:
-          FunctionLoader<HttpCloudFunction> loader =
-              new FunctionLoader<>(
-                  functionTarget,
-                  functionClassLoader,
-                  new HttpFunctionSignatureMatcher(),
-                  functionClass.exception());
-          HttpCloudFunction function = loader.loadUserFunction();
-          servlet = new HttpFunctionExecutor(function);
-      }
+        servlet = NewHttpFunctionExecutor.forClass(functionClass);
     } else if ("event".equals(functionSignatureType)) {
-      switch (functionClass.getKind()) {
-        case LOADED_CLASS:
-          servlet = NewBackgroundFunctionExecutor.forClass(functionClass.loadedClass());
-          break;
-        default:
-          FunctionLoader<BackgroundCloudFunction> loader =
-              new FunctionLoader<>(
-                  functionTarget,
-                  functionClassLoader,
-                  new BackgroundFunctionSignatureMatcher(),
-                  functionClass.exception());
-          BackgroundCloudFunction function = loader.loadUserFunction();
-          servlet = new BackgroundFunctionExecutor(function);
-      }
+        servlet = NewBackgroundFunctionExecutor.forClass(functionClass);
     } else if (functionSignatureType == null) {
-      switch (functionClass.getKind()) {
-        case LOADED_CLASS:
-          servlet = servletForDeducedSignatureType(functionClass.loadedClass());
-          break;
-        default:
-          throw new RuntimeException(
-              "Class " + functionTarget + " does not exist or could not be loaded",
-              functionClass.exception());
-      }
+        servlet = servletForDeducedSignatureType(functionClass);
     } else {
       String error = String.format(
           "Function signature type %s is unknown; should be \"http\" or \"event\"",
@@ -309,31 +260,12 @@ public void startServer() throws Exception {
     server.join();
   }
 
-  @AutoOneOf(ClassOrException.Kind.class)
-  abstract static class ClassOrException {
-    enum Kind {LOADED_CLASS, EXCEPTION}
-
-    abstract Kind getKind();
-
-    abstract Class<?> loadedClass();
-
-    abstract ClassNotFoundException exception();
-
-    static ClassOrException of(Class<?> c) {
-      return AutoOneOf_Invoker_ClassOrException.loadedClass(c);
-    }
-
-    static ClassOrException of(ClassNotFoundException e) {
-      return AutoOneOf_Invoker_ClassOrException.exception(e);
-    }
-  }
-
-  private ClassOrException loadFunctionClass() {
+  private Class<?> loadFunctionClass() throws ClassNotFoundException {
     String target = functionTarget;
     ClassNotFoundException firstException = null;
     while (true) {
       try {
-        return ClassOrException.of(functionClassLoader.loadClass(target));
+        return functionClassLoader.loadClass(target);
       } catch (ClassNotFoundException e) {
         if (firstException == null) {
           firstException = e;
@@ -343,10 +275,7 @@ private ClassOrException loadFunctionClass() {
         // from the last to the first with a $ in the hope of finding a class we can load.
         int lastDot = target.lastIndexOf('.');
         if (lastDot < 0) {
-          // We're going to try to load the function target using the old form, classname.method.
-          // But it's at least as likely that the class does exist, but we failed to load it for
-          // some other reason. So ensure that we keep the exception to show to the user.
-          return ClassOrException.of(firstException);
+          throw firstException;
         }
         target = target.substring(0, lastDot) + '$' + target.substring(lastDot + 1);
       }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
deleted file mode 100644
index 7b0273cb..00000000
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import com.google.cloud.functions.Context;
-import com.google.gson.JsonElement;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.util.Arrays;
-import java.util.Collection;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameter;
-import org.junit.runners.Parameterized.Parameters;
-import org.mockito.Mockito;
-
-@RunWith(Parameterized.class)
-public class BackgroundFunctionTest {
-
-  @Parameters
-  public static Collection<Object[]> data() {
-    return Arrays.asList(new Object[][]{
-        {"JsonAdder.add", "/adder_gcf_ga_event.json"},
-        {"CustomTypeAdder.add", "/adder_gcf_ga_event.json"},
-        {"JsonAdder.add", "/adder_gcf_beta_event.json"},
-        {"CustomTypeAdder.add", "/adder_gcf_beta_event.json"},
-        {"JsonAdder.add", "/adder_gcf_beta_event_json_resource.json"},
-        {"CustomTypeAdder.add", "/adder_gcf_beta_event_json_resource.json"},
-    });
-  }
-
-  @Parameter(0)
-  public String target;
-
-  @Parameter(1)
-  public String eventFilePath;
-
-  private static int lastSum = 0;
-  private static String lastEventType = "";
-
-  public static class JsonAdder {
-
-    public void add(JsonElement data, Context context) {
-      lastSum =
-          data.getAsJsonObject().get("a").getAsInt() + data.getAsJsonObject().get("b").getAsInt();
-      lastEventType = context.eventType();
-    }
-  }
-
-  public static class CustomTypeAdder {
-
-    public static class Data {
-
-      int a;
-      int b;
-    }
-
-    public void add(Data data, Context context) {
-      lastSum = data.a + data.b;
-      lastEventType = context.eventType();
-    }
-  }
-
-  @Test
-  public void adder() throws Exception {
-    HttpServletRequest req = Mockito.mock(HttpServletRequest.class);
-    HttpServletResponse res = Mockito.mock(HttpServletResponse.class);
-    String fullTarget = "com.google.cloud.functions.invoker.BackgroundFunctionTest$" + target;
-    FunctionLoader<BackgroundCloudFunction> loader =
-        new FunctionLoader<>(
-            fullTarget,
-            getClass().getClassLoader(),
-            new BackgroundFunctionSignatureMatcher(),
-            null);
-    BackgroundCloudFunction function = loader.loadUserFunction();
-    BackgroundFunctionExecutor executor = new BackgroundFunctionExecutor(function);
-    Mockito.when(req.getReader())
-        .thenReturn(
-            new BufferedReader(
-                new InputStreamReader(this.getClass().getResourceAsStream(eventFilePath))));
-
-    executor.service(req, res);
-
-    assertThat(lastSum).isEqualTo(5);
-    assertThat(lastEventType).isEqualTo("com.example.someevent.new");
-  }
-}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
deleted file mode 100644
index d1ee811d..00000000
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class HttpFunctionTest {
-
-  private static String lastResponse = "";
-
-  public static class HttpWriter {
-
-    public void writeResponse(HttpServletRequest request, HttpServletResponse response)
-        throws IOException {
-      PrintWriter writer = response.getWriter();
-      writer.write(request.getParameter("data"));
-    }
-  }
-
-  @Test
-  public void adder() throws Exception {
-    HttpServletRequest req = Mockito.mock(HttpServletRequest.class);
-    HttpServletResponse res = Mockito.mock(HttpServletResponse.class);
-    String fullTarget =
-        "com.google.cloud.functions.invoker.HttpFunctionTest$HttpWriter.writeResponse";
-    String requestData = "testData";
-    FunctionLoader<HttpCloudFunction> loader = new FunctionLoader<>(
-        fullTarget, getClass().getClassLoader(), new HttpFunctionSignatureMatcher(), null);
-    HttpCloudFunction function = loader.loadUserFunction();
-    HttpFunctionExecutor executor = new HttpFunctionExecutor(function);
-    Mockito.when(req.getParameter("data")).thenReturn(requestData);
-
-    Mockito.when(res.getWriter()).thenReturn(new MockPrintWriter("fooFile"));
-
-    executor.service(req, res);
-
-    assertThat(lastResponse).isEqualTo(requestData);
-  }
-
-  private class MockPrintWriter extends java.io.PrintWriter {
-
-    public MockPrintWriter(String s) throws FileNotFoundException {
-      super(s);
-    }
-
-    public void write(String s) {
-      lastResponse = s;
-    }
-  }
-}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 4ccecd16..036a4e24 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -146,8 +146,8 @@ public static void allocateServerPort() throws IOException {
 
   /**
    * Description of a test case. When we send an HTTP POST to the given {@link #url()} in the
-   * server, with the given {@link #requestText()} as the body of the POST, then we expect to get
-   * back the given {@link #expectedResponseText()} in the body of the response.
+   * server, with the given {@link #requestContent()} ()} as the body of the POST, then we expect to
+   * get back the given {@link #expectedResponseText()} in the body of the response.
    */
   @AutoValue
   abstract static class TestCase {
@@ -235,15 +235,6 @@ private static String fullTarget(String nameWithoutPackage) {
           .setExpectedResponseText(Optional.empty())
           .build();
 
-  @Test
-  public void helloWorld() throws Exception {
-    testHttpFunction(fullTarget("HelloWorld.helloWorld"),
-        ImmutableList.of(
-            TestCase.builder().setExpectedResponseText("hello\n").build(),
-            FAVICON_TEST_CASE,
-            ROBOTS_TXT_TEST_CASE));
-  }
-
   @Test
   public void newHelloWorld() throws Exception {
     testHttpFunction(fullTarget("NewHelloWorld"),
@@ -253,15 +244,6 @@ public void newHelloWorld() throws Exception {
             ROBOTS_TXT_TEST_CASE));
   }
 
-  @Test
-  public void echo() throws Exception {
-    String testText = "hello\nworld\n";
-    testHttpFunction(
-        fullTarget("Echo.echo"),
-        ImmutableList.of(
-            TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build()));
-  }
-
   @Test
   public void newEcho() throws Exception {
     String testText = "hello\nworld\n";
@@ -281,15 +263,6 @@ public void newEcho() throws Exception {
                 .build()));
   }
 
-  @Test
-  public void echoUrl() throws Exception {
-    String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
-    List<TestCase> testCases = Arrays.stream(testUrls)
-        .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
-        .collect(toList());
-    testHttpFunction(fullTarget("EchoUrl.echoUrl"), testCases);
-  }
-
   @Test
   public void newEchoUrl() throws Exception {
     String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
@@ -334,18 +307,6 @@ public void stackDriverLogging() throws Exception {
         fullTarget("Log"), ImmutableList.of(simpleTestCase, quotingTestCase, exceptionTestCase));
   }
 
-  @Test
-  public void background() throws Exception {
-    File snoopFile = snoopFile();
-    String requestText = sampleLegacyEvent(snoopFile);
-    TestCase testCase = TestCase.builder()
-        .setRequestText(requestText)
-        .setSnoopFile(snoopFile)
-        .setExpectedJson(new Gson().fromJson(requestText, JsonObject.class))
-        .build();
-    backgroundTest(fullTarget("BackgroundSnoop.snoop"), ImmutableList.of(testCase));
-  }
-
   @Test
   public void newBackground() throws Exception {
     newBackgroundTest("NewBackgroundSnoop");
@@ -442,7 +403,7 @@ private File snoopFile() throws IOException {
   }
 
   /** Any runtime class that user code shouldn't be able to see. */
-  private static final Class<?> INTERNAL_CLASS = CloudFunction.class;
+  private static final Class<?> INTERNAL_CLASS = CloudFunctionsContext.class;
 
   private String functionJarString() throws IOException {
     Path functionJarTargetDir = Paths.get("../testfunction/target");
@@ -566,12 +527,14 @@ private void testFunction(
         if (testCase.snoopFile().isPresent()) {
           checkSnoopFile(testCase);
         }
-        testCase.expectedOutput()
-            .ifPresent(output -> expect.that(serverProcess.output().toString()).contains(output));
       }
     } finally {
       serverProcess.close();
     }
+    for (TestCase testCase : testCases) {
+      testCase.expectedOutput()
+          .ifPresent(output -> expect.that(serverProcess.output()).contains(output));
+    }
     // Wait for the output monitor task to terminate. If it threw an exception, we will get an
     // ExecutionException here.
     serverProcess.outputMonitorResult().get();
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
index b2e86900..6c90963d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
@@ -49,7 +49,7 @@ public void explicitPort() {
   @Test
   public void defaultTarget() {
     Optional<Invoker> invoker = Invoker.makeInvoker();
-    assertThat(invoker.get().getFunctionTarget()).isEqualTo("TestFunction.function");
+    assertThat(invoker.get().getFunctionTarget()).isEqualTo("Function");
   }
 
   @Test
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
deleted file mode 100644
index baf96da7..00000000
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.google.cloud.functions.invoker.testfunctions;
-
-import com.google.cloud.functions.Context;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * Extract the targetFile property from the data of the JSON payload, and write to it a JSON
- * encoding of this payload and the context. The JSON format is chosen to be identical to the
- * EventFlow format that we currently use in GCF, and the file that we write should in fact be
- * identical to the JSON payload that the Functions Framework received from the client in the test.
- * This will need to be rewritten when we switch to CloudEvents.
- */
-public class BackgroundSnoop {
-  public void snoop(JsonElement jsonElement, Context context) throws IOException {
-    String targetFile = jsonElement.getAsJsonObject().get("targetFile").getAsString();
-    if (targetFile == null) {
-      throw new IllegalArgumentException("Expected targetFile in JSON payload");
-    }
-    JsonObject resourceJson = JsonParser.parseString(context.resource()).getAsJsonObject();
-    JsonObject contextJson = new JsonObject();
-    contextJson.addProperty("eventId", context.eventId());
-    contextJson.addProperty("timestamp", context.timestamp());
-    contextJson.addProperty("eventType", context.eventType());
-    contextJson.add("resource", resourceJson);
-    JsonObject contextAndPayloadJson = new JsonObject();
-    contextAndPayloadJson.add("data", jsonElement);
-    contextAndPayloadJson.add("context", contextJson);
-    try (FileWriter fileWriter = new FileWriter(targetFile);
-        PrintWriter writer = new PrintWriter(fileWriter)) {
-      writer.println(contextAndPayloadJson);
-    }
-  }
-}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
deleted file mode 100644
index 16eb03a8..00000000
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker.testfunctions;
-
-import java.io.IOException;
-import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class Echo {
-  public void echo(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    String body = request.getReader().lines().collect(Collectors.joining("\n")) + "\n";
-    response.setContentType("text/plain");
-    response.getWriter().write(body);
-    response.getWriter().flush();
-  }
-}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
deleted file mode 100644
index c708c80c..00000000
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.google.cloud.functions.invoker.testfunctions;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class EchoUrl {
-  public void echoUrl(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    String url = request.getRequestURI();
-    if (request.getQueryString() != null) {
-      url += "?" + request.getQueryString();
-    }
-    response.getWriter().println(url);
-  }
-}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
deleted file mode 100644
index 05c0c3c1..00000000
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.google.cloud.functions.invoker.testfunctions;
-
-import java.io.IOException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class HelloWorld {
-  public void helloWorld(HttpServletRequest request, HttpServletResponse response)
-      throws IOException {
-    response.getWriter().println("hello");
-  }
-}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
index edb44606..aa766663 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
@@ -11,7 +11,7 @@
 /**
  * A simple proof-of-concept function for multipart handling.
  *
- * {@code HttpFunctionTest} contains more detailed testing, but this function is part of the
+ * {@code HttpTest} contains more detailed testing, but this function is part of the
  * integration test that shows that we can indeed access the multipart API from a function.
  */
 public class Multipart implements HttpFunction {
diff --git a/invoker/core/src/test/resources/adder_gcf_beta_event.json b/invoker/core/src/test/resources/adder_gcf_beta_event.json
deleted file mode 100644
index 77ce0059..00000000
--- a/invoker/core/src/test/resources/adder_gcf_beta_event.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "eventId": "B234-1234-1234",
-  "timestamp": "2018-04-05T17:31:00Z",
-  "eventType": "com.example.someevent.new",
-  "resource": "/mycontext",
-  "data": {
-    "a": 2,
-    "b": 3
-  }
-}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/adder_gcf_beta_event_json_resource.json b/invoker/core/src/test/resources/adder_gcf_beta_event_json_resource.json
deleted file mode 100644
index 335b4174..00000000
--- a/invoker/core/src/test/resources/adder_gcf_beta_event_json_resource.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "eventId": "B234-1234-1234",
-  "timestamp": "2018-04-05T17:31:00Z",
-  "eventType": "com.example.someevent.new",
-  "resource": {
-    "service":"test-service",
-    "name":"test-name",
-    "type":"test-type"
-  },
-  "data": {
-    "a": 2,
-    "b": 3
-  }
-}
\ No newline at end of file

From 3aefc2f6c474435efe9b9256c0b741f6c7edaa5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Wed, 15 Jul 2020 15:55:58 -0700
Subject: [PATCH 028/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.0-beta2

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index ff867ac5..c1de774c 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta2-SNAPSHOT</version>
+    <version>1.0.0-beta2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-beta2-SNAPSHOT</version>
+  <version>1.0.0-beta2</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-beta2-SNAPSHOT</version>
+      <version>1.0.0-beta2</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index a8be2c04..006ff696 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta2-SNAPSHOT</version>
+    <version>1.0.0-beta2</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.4-SNAPSHOT</version>
+  <version>0.9.4</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-beta2-SNAPSHOT</version>
+      <version>1.0.0-beta2</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b13bdd77..4632a5c4 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-beta2-SNAPSHOT</version>
+  <version>1.0.0-beta2</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d79efa09..c5ec521f 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta2-SNAPSHOT</version>
+    <version>1.0.0-beta2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-beta2-SNAPSHOT</version>
+  <version>1.0.0-beta2</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 0544d31e67a132a2a8b32e7f7fc27cf2c9dc1e20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Wed, 15 Jul 2020 15:56:08 -0700
Subject: [PATCH 029/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index c1de774c..05277f19 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta2</version>
+    <version>1.0.0-beta3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-beta2</version>
+  <version>1.0.0-beta3-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-beta2</version>
+      <version>1.0.0-beta3-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 006ff696..1a8c7769 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta2</version>
+    <version>1.0.0-beta3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.4</version>
+  <version>0.9.5-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-beta2</version>
+      <version>1.0.0-beta3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 4632a5c4..2ac8f3df 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-beta2</version>
+  <version>1.0.0-beta3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index c5ec521f..1602fd9f 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta2</version>
+    <version>1.0.0-beta3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-beta2</version>
+  <version>1.0.0-beta3-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 945eb58faa6b554bc82d2801370572e37e10a154 Mon Sep 17 00:00:00 2001
From: Pavel Svistetsky <damir17022000@gmail.com>
Date: Tue, 21 Jul 2020 03:52:04 +0300
Subject: [PATCH 030/308] Patch (#44)

* Add Maven goal `-Drun.port` argument support
---
 .../java/com/google/cloud/functions/plugin/RunFunction.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
index 2e3d70dc..c4c9fed4 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
@@ -72,6 +72,9 @@ public void execute() throws MojoExecutionException {
     if (functionTarget != null) {
       args.addAll(Arrays.asList("--target", functionTarget));
     }
+    if (port != null) {
+      args.addAll(Arrays.asList("--port", String.valueOf(port)));
+    }
     try {
       getLog().info("Calling Invoker with " + args);
       Invoker.main(args.toArray(new String[0]));

From d4b51556f987524d0c2e1f3c2495bb0b5595c4bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Wed, 19 Aug 2020 16:21:52 -0700
Subject: [PATCH 031/308] Switch to V2 of the CloudEvents SDK. (#50)

* Switch to V2 of the CloudEvents SDK. Also explicitly require Java version 11, since we no longer suport Java 8.

This version of the SDK makes a cleaner separation between API and implementation, and our use of it is accordingly simplified.

* Remove things that don't belong in this commit.

* Fix Java version, 11 not 1.11.

* Fix one source of javadoc problems.

* Remove some stray code from a later change.

* Add missing class.
---
 functions-framework-api/pom.xml               |   5 +-
 invoker/core/pom.xml                          |  14 ++-
 ...CloudEventsServletBinaryMessageReader.java |  70 +++++++++++
 .../NewBackgroundFunctionExecutor.java        | 109 +++++++-----------
 .../functions/invoker/IntegrationTest.java    |  97 ++++++++++++----
 .../NewBackgroundFunctionExecutorTest.java    |   6 +-
 invoker/pom.xml                               |   4 +-
 7 files changed, 210 insertions(+), 95 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 5470ab2a..b7f79ab4 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -54,8 +54,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>${maven-compiler-plugin.version}</version>
         <configuration>
-          <source>1.8</source>
-          <target>1.8</target>
+          <source>11</source>
+          <target>11</target>
         </configuration>
       </plugin>
       <plugin>
@@ -108,6 +108,7 @@
             </additionalOptions>
             <linksource>true</linksource>
             <source>8</source>
+            <detectJavaApiLink>false</detectJavaApiLink>
           </configuration>
           <executions>
             <execution>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 05277f19..50722aac 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -20,6 +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>
   </properties>
 
   <licenses>
@@ -50,7 +52,17 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>1.2.0</version>
+      <version>2.0.0-milestone1</version>
+    </dependency>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-core</artifactId>
+      <version>2.0.0-milestone1</version>
+    </dependency>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-json-jackson</artifactId>
+      <version>2.0.0-milestone1</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
new file mode 100644
index 00000000..17458b2c
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
@@ -0,0 +1,70 @@
+package com.google.cloud.functions.invoker;
+
+import io.cloudevents.SpecVersion;
+import io.cloudevents.core.message.impl.BaseGenericBinaryMessageReaderImpl;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.function.BiConsumer;
+import javax.servlet.http.HttpServletRequest;
+
+class CloudEventsServletBinaryMessageReader extends BaseGenericBinaryMessageReaderImpl<String, String> {
+  private final Map<String, List<String>> headers;
+
+  private CloudEventsServletBinaryMessageReader(Map<String, List<String>> headers, byte[] body) {
+    super(SpecVersion.V1, body);
+    this.headers = headers;
+  }
+
+  static CloudEventsServletBinaryMessageReader from(HttpServletRequest request, byte[] body) {
+    Map<String, List<String>> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    for (String header : Collections.list(request.getHeaderNames())) {
+      for (String value : Collections.list(request.getHeaders(header))) {
+        headerMap.computeIfAbsent(header, unused -> new ArrayList<>()).add(value);
+      }
+    }
+    return new CloudEventsServletBinaryMessageReader(headerMap, body);
+  }
+
+  @Override
+  protected boolean isContentTypeHeader(String header) {
+    return header.equalsIgnoreCase("content-type");
+  }
+
+  @Override
+  protected boolean isCloudEventsHeader(String header) {
+    return header.toLowerCase(Locale.ENGLISH).startsWith("ce-");
+  }
+
+  @Override
+  protected String toCloudEventsKey(String header) {
+    if (!isCloudEventsHeader(header)) {
+      throw new IllegalArgumentException("Not a CloudEvents header: " + header);
+    }
+    return header.substring(3).toLowerCase(Locale.ENGLISH);
+  }
+
+  @Override
+  protected void forEachHeader(BiConsumer<String, String> consumer) {
+    headers.forEach((header, values) -> values.forEach(value -> consumer.accept(header, value)));
+  }
+
+  @Override
+  protected String toCloudEventsValue(String value) {
+    return value;
+  }
+
+  static Map<String, List<String>> headerMap(HttpServletRequest request) {
+    Map<String, List<String>> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    for (String header : Collections.list(request.getHeaderNames())) {
+      for (String value : Collections.list(request.getHeaders(header))) {
+        headerMap.computeIfAbsent(header, unused -> new ArrayList<>()).add(value);
+      }
+    }
+    return headerMap;
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index b41778c9..a6bf7380 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -14,6 +14,7 @@
 
 package com.google.cloud.functions.invoker;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
 
@@ -24,9 +25,10 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
 import io.cloudevents.CloudEvent;
-import io.cloudevents.format.builder.HeadersStep;
-import io.cloudevents.v1.AttributesImpl;
-import io.cloudevents.v1.http.Unmarshallers;
+import io.cloudevents.core.message.MessageReader;
+import io.cloudevents.core.message.impl.GenericStructuredMessageReader;
+import io.cloudevents.core.message.impl.MessageUtils;
+import io.cloudevents.core.message.impl.UnknownEncodingMessageReader;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.lang.reflect.Type;
@@ -34,6 +36,7 @@
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
@@ -78,8 +81,10 @@ public static NewBackgroundFunctionExecutor forClass(Class<?> functionClass) {
       executor = new RawFunctionExecutor((RawBackgroundFunction) instance);
     } else {
       BackgroundFunction<?> backgroundFunction = (BackgroundFunction<?>) instance;
-      Optional<Type> maybeTargetType =
-          backgroundFunctionTypeArgument(backgroundFunction.getClass());
+      @SuppressWarnings("unchecked")
+      Class<? extends BackgroundFunction<?>> c =
+          (Class<? extends BackgroundFunction<?>>) backgroundFunction.getClass();
+      Optional<Type> maybeTargetType = backgroundFunctionTypeArgument(c);
       if (!maybeTargetType.isPresent()) {
         // This is probably because the user implemented just BackgroundFunction rather than
         // BackgroundFunction<T>.
@@ -99,7 +104,7 @@ public static NewBackgroundFunctionExecutor forClass(Class<?> functionClass) {
    * {@code T} can't be determined.
    */
   static Optional<Type> backgroundFunctionTypeArgument(
-      Class<? extends BackgroundFunction> functionClass) {
+      Class<? extends BackgroundFunction<?>> functionClass) {
     // If this is BackgroundFunction<Foo> then the user must have implemented a method
     // accept(Foo, Context), so we look for that method and return the type of its first argument.
     // We must be careful because the compiler will also have added a synthetic method
@@ -126,35 +131,24 @@ private static Event parseLegacyEvent(HttpServletRequest req) throws IOException
     }
   }
 
-  private static Context contextFromCloudEvent(CloudEvent<AttributesImpl, ?> cloudEvent) {
-    AttributesImpl attributes = cloudEvent.getAttributes();
-    ZonedDateTime timestamp = attributes.getTime().orElse(ZonedDateTime.now());
+  private static Context contextFromCloudEvent(CloudEvent cloudEvent) {
+    ZonedDateTime timestamp = Optional.ofNullable(cloudEvent.getTime()).orElse(ZonedDateTime.now());
     String timestampString = DateTimeFormatter.ISO_INSTANT.format(timestamp);
     // We don't have an obvious replacement for the Context.resource field, which with legacy events
     // corresponded to a value present for some proprietary Google event types.
     String resource = "{}";
-    Map<String, String> attributesMap = AttributesImpl.marshal(attributes);
+    Map<String, String> attributesMap =
+        cloudEvent.getAttributeNames().stream()
+            .collect(toMap(a -> a, a -> String.valueOf(cloudEvent.getAttribute(a))));
     return CloudFunctionsContext.builder()
-        .setEventId(attributes.getId())
-        .setEventType(attributes.getType())
+        .setEventId(cloudEvent.getId())
+        .setEventType(cloudEvent.getType())
         .setResource(resource)
         .setTimestamp(timestampString)
         .setAttributes(attributesMap)
         .build();
   }
 
-  /**
-   * Convert the HTTP headers from the given request into a Map. The headers of interest are
-   * the CE-* headers defined for CloudEvents in the binary encoding (where the metadata is in
-   * the HTTP headers and the payload is the HTTP body), plus Content-Type. In both cases we don't
-   * need to worry about repeated headers, so {@link HttpServletRequest#getHeader(String)} is fine.
-   */
-  private static Map<String, Object> httpHeaderMap(HttpServletRequest req) {
-    return Collections.list(req.getHeaderNames())
-        .stream()
-        .collect(toMap(header -> header, req::getHeader));
-  }
-
   /**
    * A background function, either "raw" or "typed". A raw background function is one where the user
    * code receives a String parameter that is the JSON payload of the triggering event. A typed
@@ -187,10 +181,7 @@ final ClassLoader functionClassLoader() {
     abstract void serviceLegacyEvent(HttpServletRequest req)
         throws Exception;
 
-    abstract void serviceCloudEvent(
-        HttpServletRequest req,
-        HeadersStep<AttributesImpl, CloudEventDataT, String> unmarshaller)
-        throws Exception;
+    abstract void serviceCloudEvent(CloudEvent cloudEvent) throws Exception;
 
     abstract Class<CloudEventDataT> cloudEventDataType();
   }
@@ -210,18 +201,9 @@ void serviceLegacyEvent(HttpServletRequest req) throws Exception {
     }
 
     @Override
-    void serviceCloudEvent(
-        HttpServletRequest req, HeadersStep<AttributesImpl, Map<?, ?>, String> unmarshaller)
-        throws Exception {
-      Map<String, Object> httpHeaders = httpHeaderMap(req);
-      String body = req.getReader().lines().collect(joining("\n"));
-      CloudEvent<AttributesImpl, Map<?, ?>> cloudEvent =
-          unmarshaller
-              .withHeaders(() -> httpHeaders)
-              .withPayload(() -> body)
-              .unmarshal();
+    void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
       Context context = contextFromCloudEvent(cloudEvent);
-      String jsonData = cloudEvent.getData().map(data -> new Gson().toJson(data)).orElse("{}");
+      String jsonData = cloudEvent.getData() == null ? "{}" : new String(cloudEvent.getData(), UTF_8);
       function.accept(jsonData, context);
     }
 
@@ -259,18 +241,12 @@ void serviceLegacyEvent(HttpServletRequest req) throws Exception {
     }
 
     @Override
-    void serviceCloudEvent(
-        HttpServletRequest req, HeadersStep<AttributesImpl, T, String> unmarshaller)
-        throws Exception {
-      Map<String, Object> httpHeaders = httpHeaderMap(req);
-      String body = req.getReader().lines().collect(joining("\n"));
-      CloudEvent<AttributesImpl, T> cloudEvent =
-          unmarshaller
-              .withHeaders(() -> httpHeaders)
-              .withPayload(() -> body).unmarshal();
-      if (cloudEvent.getData().isPresent()) {
+    void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
+      if (cloudEvent.getData() != null) {
+        String data = new String(cloudEvent.getData(), UTF_8);
+        T payload = new Gson().fromJson(data, type);
         Context context = contextFromCloudEvent(cloudEvent);
-        function.accept(cloudEvent.getData().get(), context);
+        function.accept(payload, context);
       } else {
         throw new IllegalStateException("Event has no \"data\" component");
       }
@@ -296,10 +272,9 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
     ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
       Thread.currentThread().setContextClassLoader(functionExecutor.functionClassLoader());
-      if (contentType != null && contentType.startsWith("application/cloudevents+json")) {
-        serviceCloudEvent(req, CloudEventKind.STRUCTURED);
-      } else if (req.getHeader("ce-specversion") != null) {
-        serviceCloudEvent(req, CloudEventKind.BINARY);
+      if ((contentType != null && contentType.startsWith("application/cloudevents+json"))
+          || req.getHeader("ce-specversion") != null) {
+        serviceCloudEvent(req);
       } else {
         serviceLegacyEvent(req);
       }
@@ -320,23 +295,19 @@ private enum CloudEventKind {BINARY, STRUCTURED}
    * @param <CloudEventT> a fake type parameter, which corresponds to the type parameter of
    *     {@link FunctionExecutor}.
    */
-  private <CloudEventT> void serviceCloudEvent(
-      HttpServletRequest req, CloudEventKind kind) throws Exception {
+  private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exception {
     @SuppressWarnings("unchecked")
     FunctionExecutor<CloudEventT> executor = (FunctionExecutor<CloudEventT>) functionExecutor;
-    Class<CloudEventT> cloudEventDataType = executor.cloudEventDataType();
-    HeadersStep<AttributesImpl, CloudEventT, String> unmarshaller;
-    switch (kind) {
-      case BINARY:
-        unmarshaller = Unmarshallers.binary(cloudEventDataType);
-        break;
-      case STRUCTURED:
-        unmarshaller = Unmarshallers.structured(cloudEventDataType);
-        break;
-      default:
-        throw new AssertionError(kind);
-    }
-    executor.serviceCloudEvent(req, unmarshaller);
+    Map<String, List<String>> headers = CloudEventsServletBinaryMessageReader.headerMap(req);
+    byte[] body = req.getInputStream().readAllBytes();
+    List<String> listOfNull = Collections.singletonList(null);
+    MessageReader reader = MessageUtils.parseStructuredOrBinaryMessage(
+        () -> headers.getOrDefault("content-type", listOfNull).get(0),
+        format -> new GenericStructuredMessageReader(format, body),
+        () -> headers.getOrDefault("ce-specversion", listOfNull).get(0),
+        unusedSpecVersion -> CloudEventsServletBinaryMessageReader.from(req, body),
+        UnknownEncodingMessageReader::new);
+    executor.serviceCloudEvent(reader.toEvent());
   }
 
   private void serviceLegacyEvent(HttpServletRequest req) throws Exception {
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 036a4e24..34f3e8ba 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -16,6 +16,7 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
+import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
 
 import com.google.auto.value.AutoValue;
@@ -27,11 +28,15 @@
 import com.google.common.truth.Expect;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
-import io.cloudevents.format.Wire;
-import io.cloudevents.json.Json;
-import io.cloudevents.v1.CloudEventBuilder;
-import io.cloudevents.v1.CloudEventImpl;
-import io.cloudevents.v1.http.Marshallers;
+import io.cloudevents.CloudEvent;
+import io.cloudevents.SpecVersion;
+import io.cloudevents.core.builder.CloudEventBuilder;
+import io.cloudevents.core.format.EventFormat;
+import io.cloudevents.core.message.MessageWriter;
+import io.cloudevents.core.message.impl.MessageUtils;
+import io.cloudevents.core.provider.EventFormatProvider;
+import io.cloudevents.jackson.JsonFormat;
+import io.cloudevents.rw.CloudEventWriter;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -52,6 +57,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -107,14 +113,14 @@ private static String sampleLegacyEvent(File snoopFile) {
         + "}";
   }
 
-  private static CloudEventImpl<Map<String, Object>> sampleCloudEvent(File snoopFile) {
-    return CloudEventBuilder.<Map<String, Object>>builder()
+  private static CloudEvent sampleCloudEvent(File snoopFile) {
+    return CloudEventBuilder.v1()
         .withId("B234-1234-1234")
         .withSource(URI.create("/source"))
         .withType("com.example.someevent.new")
-        .withDataschema(URI.create("/schema"))
+        .withDataSchema(URI.create("/schema"))
         .withDataContentType("application/json")
-        .withData(ImmutableMap.of("a", 2, "b", 3, "targetFile", snoopFile.toString()))
+        .withData(("{\"a\": 2, \"b\": 3, \"targetFile\": \"" + snoopFile + "\"}").getBytes(UTF_8))
         .withTime(ZonedDateTime.of(2018, 4, 5, 17, 31, 0, 0, ZoneOffset.UTC))
         .build();
   }
@@ -125,7 +131,7 @@ private static JsonObject expectedCloudEventAttributes() {
     attributes.addProperty("specversion", "1.0");
     attributes.addProperty("id", "B234-1234-1234");
     attributes.addProperty("source", "/source");
-    attributes.addProperty("time", "2018-04-05T17:31:00Z");
+    attributes.addProperty("time", "2018-04-05T17:31Z");
     attributes.addProperty("type", "com.example.someevent.new");
     attributes.addProperty("dataschema", "/schema");
     return attributes;
@@ -331,7 +337,8 @@ private void newBackgroundTest(String target) throws Exception {
 
     // A CloudEvent using the "structured content mode", where both the metadata and the payload
     // are in the body of the HTTP request.
-    String cloudEventRequestText = Json.encode(sampleCloudEvent(snoopFile));
+    EventFormat jsonFormat = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    String cloudEventRequestText = new String(jsonFormat.serialize(sampleCloudEvent(snoopFile)), UTF_8);
     // For CloudEvents, we don't currently populate Context#getResource with anything interesting,
     // so we excise that from the expected text we would have with legacy events.
     JsonObject cloudEventExpectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
@@ -346,18 +353,15 @@ private void newBackgroundTest(String target) throws Exception {
 
     // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
     // payload is the body of the HTTP request.
-    Wire<String, String, String> wire = Marshallers.<Map<String, Object>>binary()
-        .withEvent(() -> sampleCloudEvent(snoopFile))
-        .marshal();
+    BinaryWriter binaryWriter = new BinaryWriter();
+    Map<String, String> headers = binaryWriter.writeBinary(sampleCloudEvent(snoopFile));
     TestCase cloudEventsBinaryTestCase = TestCase.builder()
         .setSnoopFile(snoopFile)
-        .setRequestText(wire.getPayload().get())
-        .setHttpContentType("application/json")
-        .setHttpHeaders(ImmutableMap.copyOf(wire.getHeaders()))
+        .setRequestText(new String(binaryWriter.body, UTF_8))
+        .setHttpContentType(headers.get("Content-Type"))
+        .setHttpHeaders(ImmutableMap.copyOf(headers))
         .setExpectedJson(cloudEventExpectedJson)
         .build();
-    // TODO(emcmanus): Update the Content-Type to "application/json; charset=utf-8" when
-    // https://github.com/cloudevents/sdk-java/issues/89 has been fixed.
 
     backgroundTest(
         fullTarget(target),
@@ -465,7 +469,7 @@ private void backgroundTest(String functionTarget, List<TestCase> testCases) thr
       Gson gson = new Gson();
       JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
       JsonObject expectedJson = testCase.expectedJson().get();
-      expect.withMessage("Testing %s with %s", functionTarget, testCase)
+      expect.withMessage("Testing %s with %s\nGOT %s\nNOT %s", functionTarget, testCase, snoopedJson, expectedJson)
           .that(snoopedJson).isEqualTo(expectedJson);
     }
   }
@@ -648,4 +652,57 @@ private void monitorOutput(
       throw new UncheckedIOException(e);
     }
   }
+
+  // I might be missing something, but as far as I can tell the V2 SDK forces us to go through all this
+  // rigmarole just so we can tell what HTTP headers should be set for a Binary CloudEvent. With the
+  // V1 SDK it was much simpler.
+  // https://github.com/cloudevents/sdk-java/issues/212
+  private static class BinaryWriter
+      implements MessageWriter<CloudEventWriter<Map<String, String>>, Map<String, String>> {
+
+    private static final Map<String, String> ATTRIBUTES_TO_HEADERS =
+        MessageUtils.generateAttributesToHeadersMapping(v ->
+            v.equals("datacontenttype") ? "Content-Type" : ("ce-" + v));
+
+    final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    byte[] body;
+
+    @Override
+    public CloudEventWriter<Map<String, String>> create(SpecVersion version) {
+      headers.put("ce-specversion", version.toString());
+      return new EventWriter();
+    }
+
+    @Override
+    public Map<String, String> setEvent(EventFormat format, byte[] bytes) {
+      throw new UnsupportedOperationException("Only binary events supported, not structured");
+    }
+
+    private class EventWriter implements CloudEventWriter<Map<String, String>> {
+      @Override
+      public Map<String, String> end(byte[] bytes) {
+        body = bytes;
+        return headers;
+      }
+
+      @Override
+      public Map<String, String> end() {
+        return end(new byte[0]);
+      }
+
+      @Override
+      public void setAttribute(String name, String value) {
+        if (ATTRIBUTES_TO_HEADERS.containsKey(name)) {
+          headers.put(ATTRIBUTES_TO_HEADERS.get(name), value);
+        } else {
+          throw new IllegalArgumentException("Unknown attribute: " + name);
+        }
+      }
+
+      @Override
+      public void setExtension(String name, String value) {
+        headers.put("ce-" + name, value);
+      }
+    }
+  }
 }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
index 59a3a171..68b11e3f 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
@@ -50,12 +50,16 @@ public void backgroundFunctionTypeArgument_genericInterface() {
     assertThat(backgroundFunctionTypeArgument(GenericChild.class)).hasValue(PubSubMessage.class);
   }
 
+  @SuppressWarnings("rawtypes")
   private static class ForgotTypeParameter implements BackgroundFunction {
     @Override public void accept(Object payload, Context context) {}
   }
 
   @Test
   public void backgroundFunctionTypeArgument_raw() {
-    assertThat(backgroundFunctionTypeArgument(ForgotTypeParameter.class)).isEmpty();
+    @SuppressWarnings("unchecked")
+    Class<? extends BackgroundFunction<?>> c =
+        (Class<? extends BackgroundFunction<?>>) (Class<?>) ForgotTypeParameter.class;
+    assertThat(backgroundFunctionTypeArgument(c)).isEmpty();
   }
 }
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 2ac8f3df..523d50cc 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -33,8 +33,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <dependencyManagement>

From 118c407fbc04740764cc24478222fe31b98b0b4c Mon Sep 17 00:00:00 2001
From: Grant Timmerman <timmerman+devrel@google.com>
Date: Thu, 20 Aug 2020 12:56:15 -0500
Subject: [PATCH 032/308] ci: change to github actions (#52)

* ci: change to github actions

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* ci: add pull_request trigger too

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
---
 .github/workflows/ci.yaml | 16 ++++++++++++++++
 .travis.yml               |  4 ----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 .github/workflows/ci.yaml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 00000000..d4fabff6
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,16 @@
+name: Java CI
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 1.11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.11
+      - name: Build with Maven
+        run: (cd functions-framework-api/ && mvn install)
+      - name: Test
+        run: (cd invoker/ && mvn test)
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 51708b4e..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: java
-jdk:
-  - openjdk11
-script: (cd functions-framework-api/ && mvn install) && (cd invoker/ && mvn test)

From 320d56b89d109ef9f2519022fd359cb0fa52936c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 14:54:31 -0700
Subject: [PATCH 033/308] Add a function type for functions that receive
 CloudEvents. (#51)

This is not yet connected to anything.
---
 functions-framework-api/pom.xml               |  8 +++++++
 .../ExperimentalCloudEventsFunction.java      | 22 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index b7f79ab4..caf77b67 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -48,6 +48,14 @@
     <tag>HEAD</tag>
   </scm>
 
+  <dependencies>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-api</artifactId>
+      <version>2.0.0-milestone1</version>
+    </dependency>
+  </dependencies>
+
   <build>
     <plugins>
       <plugin>
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java
new file mode 100644
index 00000000..516a0456
--- /dev/null
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java
@@ -0,0 +1,22 @@
+package com.google.cloud.functions;
+
+import io.cloudevents.CloudEvent;
+
+/**
+ * Represents a Cloud Function that is activated by an event and parsed into a {@link CloudEvent} object.
+ * Because the {@link CloudEvent} API is not yet stable, a function implemented using this class may not
+ * build or work correctly with later versions of that API. Once the API is stable, this interface will
+ * become {@code CloudEventsFunction} and will also be stable.
+ */
+@FunctionalInterface
+public interface ExperimentalCloudEventsFunction {
+  /**
+   * Called to service an incoming event. This interface is implemented by user code to
+   * provide the action for a given background function. If this method throws any exception
+   * (including any {@link Error}) then the HTTP response will have a 500 status code.
+   *
+   * @param event the event.
+   * @throws Exception to produce a 500 status code in the HTTP response.
+   */
+  void accept(CloudEvent event) throws Exception;
+}

From 171745e2bc568cc45ede72a9dd8adbceb095d284 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 15:09:01 -0700
Subject: [PATCH 034/308] [maven-release-plugin] prepare release
 functions-framework-api-1.0.2

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index caf77b67..6b0bc82f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>HEAD</tag>
+    <tag>functions-framework-api-1.0.2</tag>
   </scm>
 
   <dependencies>

From bde9c6b58cef3fda815d9ce9b94deb98f703972f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 15:09:09 -0700
Subject: [PATCH 035/308] [maven-release-plugin] prepare for next development
 iteration

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 6b0bc82f..5779c635 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>functions-framework-api-1.0.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>

From 35838ad1c9f90cbddf1efd186df9eea7d0a63b00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 15:45:25 -0700
Subject: [PATCH 036/308] Undo partial release.

---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 5779c635..caf77b67 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.2-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 81e1d16c2d5549ca9d7b2884f203b6d4ebffe686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 16:16:23 -0700
Subject: [PATCH 037/308] [maven-release-plugin] prepare release
 functions-framework-api-1.0.2

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index caf77b67..6b0bc82f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>HEAD</tag>
+    <tag>functions-framework-api-1.0.2</tag>
   </scm>
 
   <dependencies>

From 3c2556ac62d83d29c26b5cde3fc0a7d6e611a615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 16:23:00 -0700
Subject: [PATCH 038/308] Undo partial release.

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 6b0bc82f..caf77b67 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.2-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>functions-framework-api-1.0.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>

From ea2dd8eaf0b6b936e7aaf4201ff288b7d9a4fdb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 16:23:17 -0700
Subject: [PATCH 039/308] [maven-release-plugin] prepare release
 functions-framework-api-1.0.2

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index caf77b67..6b0bc82f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>HEAD</tag>
+    <tag>functions-framework-api-1.0.2</tag>
   </scm>
 
   <dependencies>

From acb84a34a9c1b9535b4f6c2ccc4bec80aaf932d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 16:23:24 -0700
Subject: [PATCH 040/308] [maven-release-plugin] prepare for next development
 iteration

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 6b0bc82f..5779c635 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>functions-framework-api-1.0.2</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>

From 03ed53d47ba721c7522d0475a930a511bf237470 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 18:09:18 -0700
Subject: [PATCH 041/308] Switch invoker to API version 1.0.2. (#53)

---
 invoker/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/pom.xml b/invoker/pom.xml
index 523d50cc..da30eda4 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.1</version>
+        <version>1.0.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From 954338267678e26a5d9a8575222a1c9766e3cadb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 21 Aug 2020 18:09:44 -0700
Subject: [PATCH 042/308] Rename NewFoo to Foo. (#54)

* Switch invoker to API version 1.0.2.

* Rename NewFoo to Foo.

Previously we had `BackgroundFunction` and `NewBackgroundFunction`, where the former was the original design where functions were methods that needed to have a particular signature and the latter was the newer design where functions are classes that implement a given interface. We retired `BackgroundFunction` etc a while ago, so we can rename `NewBackgroundFunction` to just `BackgroundFunction`.

* Add a couple of missed cases.
---
 ...r.java => BackgroundFunctionExecutor.java} | 10 ++++-----
 ...xecutor.java => HttpFunctionExecutor.java} | 10 ++++-----
 .../functions/invoker/runner/Invoker.java     | 12 +++++-----
 ...va => BackgroundFunctionExecutorTest.java} |  4 ++--
 .../functions/invoker/IntegrationTest.java    | 22 +++++++++----------
 ...kgroundSnoop.java => BackgroundSnoop.java} |  2 +-
 .../testfunctions/{NewEcho.java => Echo.java} |  2 +-
 .../{NewEchoUrl.java => EchoUrl.java}         |  2 +-
 .../{NewHelloWorld.java => HelloWorld.java}   |  2 +-
 ...ndSnoop.java => TypedBackgroundSnoop.java} |  4 ++--
 10 files changed, 35 insertions(+), 35 deletions(-)
 rename invoker/core/src/main/java/com/google/cloud/functions/invoker/{NewBackgroundFunctionExecutor.java => BackgroundFunctionExecutor.java} (97%)
 rename invoker/core/src/main/java/com/google/cloud/functions/invoker/{NewHttpFunctionExecutor.java => HttpFunctionExecutor.java} (91%)
 rename invoker/core/src/test/java/com/google/cloud/functions/invoker/{NewBackgroundFunctionExecutorTest.java => BackgroundFunctionExecutorTest.java} (92%)
 rename invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/{NewBackgroundSnoop.java => BackgroundSnoop.java} (96%)
 rename invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/{NewEcho.java => Echo.java} (95%)
 rename invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/{NewEchoUrl.java => EchoUrl.java} (90%)
 rename invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/{NewHelloWorld.java => HelloWorld.java} (86%)
 rename invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/{NewTypedBackgroundSnoop.java => TypedBackgroundSnoop.java} (95%)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
similarity index 97%
rename from invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index a6bf7380..a5f5da2f 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -46,23 +46,23 @@
 import javax.servlet.http.HttpServletResponse;
 
 /** Executes the user's background function. */
-public final class NewBackgroundFunctionExecutor extends HttpServlet {
+public final class BackgroundFunctionExecutor extends HttpServlet {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final FunctionExecutor<?> functionExecutor;
 
-  private NewBackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
+  private BackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
     this.functionExecutor = functionExecutor;
   }
 
   /**
-   * Makes a {@link NewHttpFunctionExecutor} for the given class.
+   * Makes a {@link HttpFunctionExecutor} for the given class.
    *
    * @throws RuntimeException if either the class does not implement one of
    *    {@link BackgroundFunction} or {@link RawBackgroundFunction},
    *    or we are unable to construct an instance using its no-arg constructor.
    */
-  public static NewBackgroundFunctionExecutor forClass(Class<?> functionClass) {
+  public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
     if (!BackgroundFunction.class.isAssignableFrom(functionClass)
         && !RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
       throw new RuntimeException(
@@ -95,7 +95,7 @@ public static NewBackgroundFunctionExecutor forClass(Class<?> functionClass) {
       }
       executor = new TypedFunctionExecutor<>(maybeTargetType.get(), backgroundFunction);
     }
-    return new NewBackgroundFunctionExecutor(executor);
+    return new BackgroundFunctionExecutor(executor);
   }
 
   /**
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
similarity index 91%
rename from invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 29782301..d2a46afd 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -25,22 +25,22 @@
 import javax.servlet.http.HttpServletResponse;
 
 /** Executes the user's method. */
-public class NewHttpFunctionExecutor extends HttpServlet {
+public class HttpFunctionExecutor extends HttpServlet {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final HttpFunction function;
 
-  private NewHttpFunctionExecutor(HttpFunction function) {
+  private HttpFunctionExecutor(HttpFunction function) {
     this.function = function;
   }
 
   /**
-   * Makes a {@link NewHttpFunctionExecutor} for the given class.
+   * Makes a {@link HttpFunctionExecutor} for the given class.
    *
    * @throws RuntimeException if either the given class does not implement {@link HttpFunction}
    *    or we are unable to construct an instance using its no-arg constructor.
    */
-  public static NewHttpFunctionExecutor forClass(Class<?> functionClass) {
+  public static HttpFunctionExecutor forClass(Class<?> functionClass) {
     if (!HttpFunction.class.isAssignableFrom(functionClass)) {
       throw new RuntimeException(
           "Class " + functionClass.getName() + " does not implement "
@@ -49,7 +49,7 @@ public static NewHttpFunctionExecutor forClass(Class<?> functionClass) {
     Class<? extends HttpFunction> httpFunctionClass = functionClass.asSubclass(HttpFunction.class);
     try {
       HttpFunction httpFunction = httpFunctionClass.getConstructor().newInstance();
-      return new NewHttpFunctionExecutor(httpFunction);
+      return new HttpFunctionExecutor(httpFunction);
     } catch (ReflectiveOperationException e) {
       throw new RuntimeException(
           "Could not construct an instance of " + functionClass.getName() + ": " + e, e);
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index e01329a1..6fef3377 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -22,8 +22,8 @@
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
-import com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor;
-import com.google.cloud.functions.invoker.NewHttpFunctionExecutor;
+import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
+import com.google.cloud.functions.invoker.HttpFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
 import java.io.File;
 import java.io.IOException;
@@ -240,9 +240,9 @@ public void startServer() throws Exception {
 
     HttpServlet servlet;
     if ("http".equals(functionSignatureType)) {
-        servlet = NewHttpFunctionExecutor.forClass(functionClass);
+        servlet = HttpFunctionExecutor.forClass(functionClass);
     } else if ("event".equals(functionSignatureType)) {
-        servlet = NewBackgroundFunctionExecutor.forClass(functionClass);
+        servlet = BackgroundFunctionExecutor.forClass(functionClass);
     } else if (functionSignatureType == null) {
         servlet = servletForDeducedSignatureType(functionClass);
     } else {
@@ -284,11 +284,11 @@ private Class<?> loadFunctionClass() throws ClassNotFoundException {
 
   private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     if (HttpFunction.class.isAssignableFrom(functionClass)) {
-      return NewHttpFunctionExecutor.forClass(functionClass);
+      return HttpFunctionExecutor.forClass(functionClass);
     }
     if (BackgroundFunction.class.isAssignableFrom(functionClass)
         || RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
-      return NewBackgroundFunctionExecutor.forClass(functionClass);
+      return BackgroundFunctionExecutor.forClass(functionClass);
     }
     String error = String.format(
         "Could not determine function signature type from target %s. Either this should be"
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
similarity index 92%
rename from invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
index 68b11e3f..02c5d630 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
@@ -1,6 +1,6 @@
 package com.google.cloud.functions.invoker;
 
-import static com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor.backgroundFunctionTypeArgument;
+import static com.google.cloud.functions.invoker.BackgroundFunctionExecutor.backgroundFunctionTypeArgument;
 import static com.google.common.truth.Truth8.assertThat;
 
 import com.google.cloud.functions.BackgroundFunction;
@@ -11,7 +11,7 @@
 import org.junit.runners.JUnit4;
 
 @RunWith(JUnit4.class)
-public class NewBackgroundFunctionExecutorTest {
+public class BackgroundFunctionExecutorTest {
   private static class PubSubMessage {
     String data;
     Map<String, String> attributes;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 34f3e8ba..57395f63 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -242,8 +242,8 @@ private static String fullTarget(String nameWithoutPackage) {
           .build();
 
   @Test
-  public void newHelloWorld() throws Exception {
-    testHttpFunction(fullTarget("NewHelloWorld"),
+  public void helloWorld() throws Exception {
+    testHttpFunction(fullTarget("HelloWorld"),
         ImmutableList.of(
             TestCase.builder().setExpectedResponseText("hello\n").build(),
             FAVICON_TEST_CASE,
@@ -251,10 +251,10 @@ public void newHelloWorld() throws Exception {
   }
 
   @Test
-  public void newEcho() throws Exception {
+  public void echo() throws Exception {
     String testText = "hello\nworld\n";
     testHttpFunction(
-        fullTarget("NewEcho"),
+        fullTarget("Echo"),
         ImmutableList.of(
             TestCase.builder()
                 .setRequestText(testText)
@@ -270,12 +270,12 @@ public void newEcho() throws Exception {
   }
 
   @Test
-  public void newEchoUrl() throws Exception {
+  public void echoUrl() throws Exception {
     String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
     List<TestCase> testCases = Arrays.stream(testUrls)
         .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
         .collect(toList());
-    testHttpFunction(fullTarget("NewEchoUrl"), testCases);
+    testHttpFunction(fullTarget("EchoUrl"), testCases);
   }
 
   @Test
@@ -314,16 +314,16 @@ public void stackDriverLogging() throws Exception {
   }
 
   @Test
-  public void newBackground() throws Exception {
-    newBackgroundTest("NewBackgroundSnoop");
+  public void background() throws Exception {
+    backgroundTest("BackgroundSnoop");
   }
 
   @Test
-  public void newTypedBackground() throws Exception {
-    newBackgroundTest("NewTypedBackgroundSnoop");
+  public void typedBackground() throws Exception {
+    backgroundTest("TypedBackgroundSnoop");
   }
 
-  private void newBackgroundTest(String target) throws Exception {
+  private void backgroundTest(String target) throws Exception {
     File snoopFile = snoopFile();
     String gcfRequestText = sampleLegacyEvent(snoopFile);
     JsonObject expectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
similarity index 96%
rename from invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
index ca89c816..825de1f0 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
@@ -16,7 +16,7 @@
  * identical to the JSON payload that the Functions Framework received from the client in the test.
  * This will need to be rewritten when we switch to CloudEvents.
  */
-public class NewBackgroundSnoop implements RawBackgroundFunction {
+public class BackgroundSnoop implements RawBackgroundFunction {
   @Override
   public void accept(String json, Context context) {
     Gson gson = new Gson();
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
similarity index 95%
rename from invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
index ef087d7a..6cde3152 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
@@ -7,7 +7,7 @@
 import java.io.OutputStream;
 import java.util.stream.Collectors;
 
-public class NewEcho implements HttpFunction {
+public class Echo implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response) throws Exception {
     boolean binary = "application/octet-stream".equals(request.getContentType().orElse(null));
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
similarity index 90%
rename from invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
index 2df181f4..7b446a59 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
@@ -4,7 +4,7 @@
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 
-public class NewEchoUrl implements HttpFunction {
+public class EchoUrl implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response) throws Exception {
     StringBuilder url = new StringBuilder(request.getPath());
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
similarity index 86%
rename from invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
index f1f9c21a..2caaad40 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
@@ -4,7 +4,7 @@
 import com.google.cloud.functions.HttpRequest;
 import com.google.cloud.functions.HttpResponse;
 
-public class NewHelloWorld implements HttpFunction {
+public class HelloWorld implements HttpFunction {
   @Override
   public void service(HttpRequest request, HttpResponse response) throws Exception {
     response.getWriter().write("hello\n");
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
similarity index 95%
rename from invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
index 68457fd5..7335f5a3 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
@@ -16,8 +16,8 @@
  * identical to the JSON payload that the Functions Framework received from the client in the test.
  * This will need to be rewritten when we switch to CloudEvents.
  */
-public class NewTypedBackgroundSnoop
-    implements BackgroundFunction<NewTypedBackgroundSnoop.Payload> {
+public class TypedBackgroundSnoop
+    implements BackgroundFunction<TypedBackgroundSnoop.Payload> {
   public static class Payload {
     public int a;
     public int b;

From a114c0195dd7763a3db1b0972ccda7f482e70543 Mon Sep 17 00:00:00 2001
From: Felix Garcia Borrego <fgarcia@viafirma.com>
Date: Thu, 27 Aug 2020 00:50:53 +0200
Subject: [PATCH 043/308] Use the command env-vars-file instead of
 env-var-file. (#45)

As defined in the docs, the command should be  '--env-vars-file' https://cloud.google.com/functions/docs/env-var

Running the original code we just get Error: ` unrecognized arguments: --env-var-file=ci-env.yaml (did you mean '--env-vars-file'?)`
---
 .../java/com/google/cloud/functions/plugin/DeployFunction.java  | 2 +-
 .../com/google/cloud/functions/plugin/DeployFunctionTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index 6afe2456..74e0b73f 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -329,7 +329,7 @@ public List<String> getCommands() {
       commands.add("--set-env-vars=" + mapJoiner.join(environmentVariables));
     }
     if (envVarsFile != null) {
-      commands.add("--env-var-file=" + envVarsFile);
+      commands.add("--env-vars-file=" + envVarsFile);
     }
     commands.add("--runtime=" + runtime);
 
diff --git a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
index 3b8b4503..f1730b96 100644
--- a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
+++ b/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
@@ -48,7 +48,7 @@ public void testDeployFunctionCommandLine() {
             "--vpc-connector=a connector",
             "--max-instances=3",
             "--set-env-vars=env1=a,env2=b",
-            "--env-var-file=myfile",
+            "--env-vars-file=myfile",
             "--runtime=java11");
     assertThat(mojo.getCommands()).isEqualTo(expected);
   }

From 1ca4d06da8785fdfac1423bdecaa490c6313b45b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Wed, 2 Sep 2020 17:29:17 -0700
Subject: [PATCH 044/308] Update to Milestone 2 of the CloudEvents SDK. (#56)

Temporarily switch the Functions Framework to use a SNAPSHOT version of the API.
---
 functions-framework-api/pom.xml                             | 2 +-
 invoker/core/pom.xml                                        | 6 +++---
 .../cloud/functions/invoker/BackgroundFunctionExecutor.java | 5 ++---
 .../com/google/cloud/functions/invoker/IntegrationTest.java | 4 ++--
 invoker/pom.xml                                             | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 5779c635..9fd85e7d 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>2.0.0-milestone1</version>
+      <version>2.0.0-milestone2</version>
     </dependency>
   </dependencies>
 
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 50722aac..e7e6536f 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -52,17 +52,17 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>2.0.0-milestone1</version>
+      <version>2.0.0-milestone2</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
-      <version>2.0.0-milestone1</version>
+      <version>2.0.0-milestone2</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>2.0.0-milestone1</version>
+      <version>2.0.0-milestone2</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index a5f5da2f..77f5b0e1 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -15,7 +15,6 @@
 package com.google.cloud.functions.invoker;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toMap;
 
 import com.google.cloud.functions.BackgroundFunction;
@@ -32,7 +31,7 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.lang.reflect.Type;
-import java.time.ZonedDateTime;
+import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Arrays;
 import java.util.Collections;
@@ -132,7 +131,7 @@ private static Event parseLegacyEvent(HttpServletRequest req) throws IOException
   }
 
   private static Context contextFromCloudEvent(CloudEvent cloudEvent) {
-    ZonedDateTime timestamp = Optional.ofNullable(cloudEvent.getTime()).orElse(ZonedDateTime.now());
+    OffsetDateTime timestamp = Optional.ofNullable(cloudEvent.getTime()).orElse(OffsetDateTime.now());
     String timestampString = DateTimeFormatter.ISO_INSTANT.format(timestamp);
     // We don't have an obvious replacement for the Context.resource field, which with legacy events
     // corresponded to a value present for some proprietary Google event types.
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 57395f63..40b0db17 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -51,8 +51,8 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -121,7 +121,7 @@ private static CloudEvent sampleCloudEvent(File snoopFile) {
         .withDataSchema(URI.create("/schema"))
         .withDataContentType("application/json")
         .withData(("{\"a\": 2, \"b\": 3, \"targetFile\": \"" + snoopFile + "\"}").getBytes(UTF_8))
-        .withTime(ZonedDateTime.of(2018, 4, 5, 17, 31, 0, 0, ZoneOffset.UTC))
+        .withTime(OffsetDateTime.of(2018, 4, 5, 17, 31, 0, 0, ZoneOffset.UTC))
         .build();
   }
 
diff --git a/invoker/pom.xml b/invoker/pom.xml
index da30eda4..e17db0bd 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From a3774863f2daa563e359da74e722d1991a67f2c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 3 Sep 2020 17:40:56 -0700
Subject: [PATCH 045/308] Add support for native CloudEvents functions. (#58)

* Add support for native CloudEvents functions.

This means functions that receive a CloudEvent payload and dispatch it to a user function that expects a CloudEvent object. We do not yet handle converting a CloudEvent payload to the form expected by legacy GCF functions.

* Add explanatory comments to the new code in BackgroundFunctionExecutor.
---
 .../invoker/BackgroundFunctionExecutor.java   | 183 ++++++++++++------
 ...CloudEventsServletBinaryMessageReader.java |   1 -
 .../functions/invoker/runner/Invoker.java     |  28 ++-
 .../functions/invoker/IntegrationTest.java    |  38 +++-
 .../testfunctions/CloudEventSnoop.java        |  30 +++
 5 files changed, 214 insertions(+), 66 deletions(-)
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 77f5b0e1..6c81ddc8 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -15,10 +15,12 @@
 package com.google.cloud.functions.invoker;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.Context;
+import com.google.cloud.functions.ExperimentalCloudEventsFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -54,20 +56,63 @@ private BackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
     this.functionExecutor = functionExecutor;
   }
 
+  private enum FunctionKind {
+    BACKGROUND(BackgroundFunction.class),
+    RAW_BACKGROUND(RawBackgroundFunction.class),
+    CLOUD_EVENTS(ExperimentalCloudEventsFunction.class);
+
+    static final List<FunctionKind> VALUES = Arrays.asList(values());
+
+    final Class<?> functionClass;
+
+    FunctionKind(Class<?> functionClass) {
+      this.functionClass = functionClass;
+    }
+
+    /** Returns the {@link FunctionKind} that the given class implements, if any. */
+    static Optional<FunctionKind> forClass(Class<?> functionClass) {
+      return VALUES.stream().filter(v -> v.functionClass.isAssignableFrom(functionClass)).findFirst();
+    }
+  }
+
   /**
-   * Makes a {@link HttpFunctionExecutor} for the given class.
+   * Optionally makes a {@link BackgroundFunctionExecutor} for the given class, if it implements one
+   * of {@link BackgroundFunction}, {@link RawBackgroundFunction}, or
+   * {@link ExperimentalCloudEventsFunction}. Otherwise returns {@link Optional#empty()}.
+   *
+   * @param functionClass the class of a possible background function implementation.
+   * @throws RuntimeException if the given class does implement one of the required interfaces, but we are
+   *     unable to construct an instance using its no-arg constructor.
+   */
+  public static Optional<BackgroundFunctionExecutor> maybeForClass(Class<?> functionClass) {
+    Optional<FunctionKind> maybeFunctionKind = FunctionKind.forClass(functionClass);
+    if (!maybeFunctionKind.isPresent()) {
+      return Optional.empty();
+    }
+    return Optional.of(forClass(functionClass, maybeFunctionKind.get()));
+  }
+
+  /**
+   * Makes a {@link BackgroundFunctionExecutor} for the given class.
    *
    * @throws RuntimeException if either the class does not implement one of
-   *    {@link BackgroundFunction} or {@link RawBackgroundFunction},
-   *    or we are unable to construct an instance using its no-arg constructor.
+   *    {@link BackgroundFunction}, {@link RawBackgroundFunction}, or
+   *    {@link ExperimentalCloudEventsFunction}; or we are unable to construct an instance using its no-arg
+   *     constructor.
    */
   public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
-    if (!BackgroundFunction.class.isAssignableFrom(functionClass)
-        && !RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
+    Optional<FunctionKind> maybeFunctionKind = FunctionKind.forClass(functionClass);
+    if (!maybeFunctionKind.isPresent()) {
+      List<String> classNames =
+          FunctionKind.VALUES.stream().map(v -> v.functionClass.getName()).collect(toList());
       throw new RuntimeException(
-          "Class " + functionClass.getName() + " implements neither " + BackgroundFunction.class
-              .getName() + " nor " + RawBackgroundFunction.class.getName());
+          "Class " + functionClass.getName() + " must implement one of these interfaces: "
+              + String.join(", ", classNames));
     }
+    return forClass(functionClass, maybeFunctionKind.get());
+  }
+
+  private static BackgroundFunctionExecutor forClass(Class<?> functionClass, FunctionKind functionKind) {
     Object instance;
     try {
       instance = functionClass.getConstructor().newInstance();
@@ -76,23 +121,31 @@ public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
           "Could not construct an instance of " + functionClass.getName() + ": " + e, e);
     }
     FunctionExecutor<?> executor;
-    if (instance instanceof RawBackgroundFunction) {
-      executor = new RawFunctionExecutor((RawBackgroundFunction) instance);
-    } else {
-      BackgroundFunction<?> backgroundFunction = (BackgroundFunction<?>) instance;
-      @SuppressWarnings("unchecked")
-      Class<? extends BackgroundFunction<?>> c =
-          (Class<? extends BackgroundFunction<?>>) backgroundFunction.getClass();
-      Optional<Type> maybeTargetType = backgroundFunctionTypeArgument(c);
-      if (!maybeTargetType.isPresent()) {
-        // This is probably because the user implemented just BackgroundFunction rather than
-        // BackgroundFunction<T>.
-        throw new RuntimeException(
-            "Could not determine the payload type for BackgroundFunction of type "
-                + instance.getClass().getName()
-                + "; must implement BackgroundFunction<T> for some T");
-      }
-      executor = new TypedFunctionExecutor<>(maybeTargetType.get(), backgroundFunction);
+    switch (functionKind) {
+      case RAW_BACKGROUND:
+        executor = new RawFunctionExecutor((RawBackgroundFunction) instance);
+        break;
+      case BACKGROUND:
+        BackgroundFunction<?> backgroundFunction = (BackgroundFunction<?>) instance;
+        @SuppressWarnings("unchecked")
+        Class<? extends BackgroundFunction<?>> c =
+            (Class<? extends BackgroundFunction<?>>) backgroundFunction.getClass();
+        Optional<Type> maybeTargetType = backgroundFunctionTypeArgument(c);
+        if (!maybeTargetType.isPresent()) {
+          // This is probably because the user implemented just BackgroundFunction rather than
+          // BackgroundFunction<T>.
+          throw new RuntimeException(
+              "Could not determine the payload type for BackgroundFunction of type "
+                  + instance.getClass().getName()
+                  + "; must implement BackgroundFunction<T> for some T");
+        }
+        executor = new TypedFunctionExecutor<>(maybeTargetType.get(), backgroundFunction);
+        break;
+      case CLOUD_EVENTS:
+        executor = new CloudEventFunctionExecutor((ExperimentalCloudEventsFunction) instance);
+        break;
+      default: // can't happen, we've listed all the FunctionKind values already.
+        throw new AssertionError(functionKind);
     }
     return new BackgroundFunctionExecutor(executor);
   }
@@ -177,12 +230,9 @@ final ClassLoader functionClassLoader() {
       return functionClass.getClassLoader();
     }
 
-    abstract void serviceLegacyEvent(HttpServletRequest req)
-        throws Exception;
+    abstract void serviceLegacyEvent(Event legacyEvent) throws Exception;
 
     abstract void serviceCloudEvent(CloudEvent cloudEvent) throws Exception;
-
-    abstract Class<CloudEventDataT> cloudEventDataType();
   }
 
   private static class RawFunctionExecutor extends FunctionExecutor<Map<?, ?>> {
@@ -194,9 +244,8 @@ private static class RawFunctionExecutor extends FunctionExecutor<Map<?, ?>> {
     }
 
     @Override
-    void serviceLegacyEvent(HttpServletRequest req) throws Exception {
-      Event event = parseLegacyEvent(req);
-      function.accept(new Gson().toJson(event.getData()), event.getContext());
+    void serviceLegacyEvent(Event legacyEvent) throws Exception {
+      function.accept(new Gson().toJson(legacyEvent.getData()), legacyEvent.getContext());
     }
 
     @Override
@@ -205,15 +254,6 @@ void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
       String jsonData = cloudEvent.getData() == null ? "{}" : new String(cloudEvent.getData(), UTF_8);
       function.accept(jsonData, context);
     }
-
-    @Override
-    Class<Map<?, ?>> cloudEventDataType() {
-      // This messing about with casts and @SuppressWarnings allows us to limit the use of the raw
-      // Map type to just here.
-      @SuppressWarnings("unchecked")
-      Class<Map<?, ?>> c = (Class<Map<?, ?>>) (Class<?>) Map.class;
-      return c;
-    }
   }
 
   private static class TypedFunctionExecutor<T> extends FunctionExecutor<T> {
@@ -233,10 +273,9 @@ static <T> TypedFunctionExecutor<T> of(Type type, BackgroundFunction<?> instance
     }
 
     @Override
-    void serviceLegacyEvent(HttpServletRequest req) throws Exception {
-      Event event = parseLegacyEvent(req);
-      T payload = new Gson().fromJson(event.getData(), type);
-      function.accept(payload, event.getContext());
+    void serviceLegacyEvent(Event legacyEvent) throws Exception {
+      T payload = new Gson().fromJson(legacyEvent.getData(), type);
+      function.accept(payload, legacyEvent.getContext());
     }
 
     @Override
@@ -250,17 +289,25 @@ void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
         throw new IllegalStateException("Event has no \"data\" component");
       }
     }
+  }
+
+  private static class CloudEventFunctionExecutor extends FunctionExecutor<Void>{
+    private final ExperimentalCloudEventsFunction function;
+
+    CloudEventFunctionExecutor(ExperimentalCloudEventsFunction function) {
+      super(function.getClass());
+      this.function = function;
+    }
 
     @Override
-    Class<T> cloudEventDataType() {
-      if (!(type instanceof Class<?>)) {
-        throw new IllegalStateException(
-            "CloudEvents SDK currently does not permit deserializing types other than classes:"
-            + " cannot deserialize " + type);
-      }
-      @SuppressWarnings("unchecked")
-      Class<T> c = (Class<T>) type;
-      return c;
+    void serviceLegacyEvent(Event legacyEvent) throws Exception {
+      throw new UnsupportedOperationException(
+          "Conversion from legacy events to CloudEvents not yet implemented");
+    }
+
+    @Override
+    void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
+      function.accept(cloudEvent);
     }
   }
 
@@ -268,9 +315,7 @@ Class<T> cloudEventDataType() {
   @Override
   public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
     String contentType = req.getContentType();
-    ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
-      Thread.currentThread().setContextClassLoader(functionExecutor.functionClassLoader());
       if ((contentType != null && contentType.startsWith("application/cloudevents+json"))
           || req.getHeader("ce-specversion") != null) {
         serviceCloudEvent(req);
@@ -281,8 +326,6 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
     } catch (Throwable t) {
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
       logger.log(Level.WARNING, "Failed to execute " + functionExecutor.functionName(), t);
-    } finally {
-      Thread.currentThread().setContextClassLoader(oldContextLoader);
     }
   }
 
@@ -306,10 +349,32 @@ private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exce
         () -> headers.getOrDefault("ce-specversion", listOfNull).get(0),
         unusedSpecVersion -> CloudEventsServletBinaryMessageReader.from(req, body),
         UnknownEncodingMessageReader::new);
-    executor.serviceCloudEvent(reader.toEvent());
+    // It's important not to set the context ClassLoader earlier, because MessageUtils will use
+    // ServiceLoader.load(EventFormat.class) to find a handler to deserialize a binary CloudEvent
+    // and if it finds something from the function ClassLoader then that something will implement
+    // the EventFormat interface as defined by that ClassLoader rather than ours. Then ServiceLoader.load
+    // will throw ServiceConfigurationError. At this point we're still running with the default
+    // context ClassLoader, which is the system ClassLoader that has loaded the code here.
+    runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent()));
   }
 
   private void serviceLegacyEvent(HttpServletRequest req) throws Exception {
-    functionExecutor.serviceLegacyEvent(req);
+    Event event = parseLegacyEvent(req);
+    runWithContextClassLoader(() -> functionExecutor.serviceLegacyEvent(event));
+  }
+
+  private void runWithContextClassLoader(ContextClassLoaderTask task) throws Exception {
+    ClassLoader oldLoader = Thread.currentThread().getContextClassLoader();
+    try {
+      Thread.currentThread().setContextClassLoader(functionExecutor.functionClassLoader());
+      task.run();
+    } finally {
+      Thread.currentThread().setContextClassLoader(oldLoader);
+    }
+  }
+
+  @FunctionalInterface
+  private interface ContextClassLoaderTask {
+    void run() throws Exception;
   }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
index 17458b2c..f9eb0e4d 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
@@ -2,7 +2,6 @@
 
 import io.cloudevents.SpecVersion;
 import io.cloudevents.core.message.impl.BaseGenericBinaryMessageReaderImpl;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 6fef3377..588d6aec 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -20,6 +20,7 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
 import com.google.cloud.functions.BackgroundFunction;
+import com.google.cloud.functions.ExperimentalCloudEventsFunction;
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
 import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
@@ -192,11 +193,18 @@ private static ClassLoader makeClassLoader(Optional<String> functionClasspath) {
     ClassLoader runtimeLoader = Invoker.class.getClassLoader();
     if (functionClasspath.isPresent()) {
       ClassLoader parent = new OnlyApiClassLoader(runtimeLoader);
-      return new URLClassLoader(classpathToUrls(functionClasspath.get()), parent);
+      return new FunctionClassLoader(classpathToUrls(functionClasspath.get()), parent);
     }
     return runtimeLoader;
   }
 
+  // This is a subclass just so we can identify it from its toString().
+  private static class FunctionClassLoader extends URLClassLoader {
+    FunctionClassLoader(URL[] urls, ClassLoader parent) {
+      super(urls, parent);
+    }
+  }
+
   private final Integer port;
   private final String functionTarget;
   private final String functionSignatureType;
@@ -286,9 +294,10 @@ private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     if (HttpFunction.class.isAssignableFrom(functionClass)) {
       return HttpFunctionExecutor.forClass(functionClass);
     }
-    if (BackgroundFunction.class.isAssignableFrom(functionClass)
-        || RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
-      return BackgroundFunctionExecutor.forClass(functionClass);
+    Optional<BackgroundFunctionExecutor> maybeExecutor =
+        BackgroundFunctionExecutor.maybeForClass(functionClass);
+    if (maybeExecutor.isPresent()) {
+      return maybeExecutor.get();
     }
     String error = String.format(
         "Could not determine function signature type from target %s. Either this should be"
@@ -405,12 +414,21 @@ private static class OnlyApiClassLoader extends ClassLoader {
     protected Class<?> findClass(String name) throws ClassNotFoundException {
       String prefix = "com.google.cloud.functions.";
       if ((name.startsWith(prefix) && Character.isUpperCase(name.charAt(prefix.length())))
-              || name.startsWith("javax.servlet.")) {
+              || name.startsWith("javax.servlet.")
+              || isCloudEventsApiClass(name)) {
         return runtimeClassLoader.loadClass(name);
       }
       return super.findClass(name); // should throw ClassNotFoundException
     }
 
+    private static final String CLOUD_EVENTS_API_PREFIX = "io.cloudevents.";
+    private static final int CLOUD_EVENTS_API_PREFIX_LENGTH = CLOUD_EVENTS_API_PREFIX.length();
+
+    private static boolean isCloudEventsApiClass(String name) {
+      return name.startsWith(CLOUD_EVENTS_API_PREFIX)
+          && Character.isUpperCase(name.charAt(CLOUD_EVENTS_API_PREFIX_LENGTH));
+    }
+
     private static ClassLoader getSystemOrBootstrapClassLoader() {
       try {
         // We're still building against the Java 8 API, so we have to use reflection for now.
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 40b0db17..a668483d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -368,6 +368,41 @@ private void backgroundTest(String target) throws Exception {
         ImmutableList.of(gcfTestCase, cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
   }
 
+  /** Tests a CloudEvent being handled by a CloudEvent handler (no translation to or from legacy). */
+  @Test
+  public void nativeCloudEvent() throws Exception {
+    File snoopFile = snoopFile();
+    CloudEvent cloudEvent = sampleCloudEvent(snoopFile);
+    EventFormat jsonFormat = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    String cloudEventJson = new String(jsonFormat.serialize(cloudEvent), UTF_8);
+
+    // A CloudEvent using the "structured content mode", where both the metadata and the payload
+    // are in the body of the HTTP request.
+    JsonObject cloudEventJsonObject = new Gson().fromJson(cloudEventJson, JsonObject.class);
+    TestCase cloudEventsStructuredTestCase = TestCase.builder()
+        .setSnoopFile(snoopFile)
+        .setRequestText(cloudEventJson)
+        .setHttpContentType("application/cloudevents+json; charset=utf-8")
+        .setExpectedJson(cloudEventJsonObject)
+        .build();
+
+    // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
+    // payload is the body of the HTTP request.
+    BinaryWriter binaryWriter = new BinaryWriter();
+    Map<String, String> headers = binaryWriter.writeBinary(cloudEvent);
+    TestCase cloudEventsBinaryTestCase = TestCase.builder()
+        .setSnoopFile(snoopFile)
+        .setRequestText(new String(binaryWriter.body, UTF_8))
+        .setHttpContentType(headers.get("Content-Type"))
+        .setHttpHeaders(ImmutableMap.copyOf(headers))
+        .setExpectedJson(cloudEventJsonObject)
+        .build();
+
+    backgroundTest(
+        fullTarget("CloudEventSnoop"),
+        ImmutableList.of(cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
+  }
+
   @Test
   public void nested() throws Exception {
     String testText = "sic transit gloria mundi";
@@ -469,7 +504,8 @@ private void backgroundTest(String functionTarget, List<TestCase> testCases) thr
       Gson gson = new Gson();
       JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
       JsonObject expectedJson = testCase.expectedJson().get();
-      expect.withMessage("Testing %s with %s\nGOT %s\nNOT %s", functionTarget, testCase, snoopedJson, expectedJson)
+      expect.withMessage(
+              "Testing %s with %s\nGOT %s\nNOT %s", functionTarget, testCase, snoopedJson, expectedJson)
           .that(snoopedJson).isEqualTo(expectedJson);
     }
   }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
new file mode 100644
index 00000000..e1dda80c
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
@@ -0,0 +1,30 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.cloud.functions.ExperimentalCloudEventsFunction;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import io.cloudevents.CloudEvent;
+import io.cloudevents.core.format.EventFormat;
+import io.cloudevents.core.provider.EventFormatProvider;
+import io.cloudevents.jackson.JsonFormat;
+import java.io.FileOutputStream;
+
+public class CloudEventSnoop implements ExperimentalCloudEventsFunction {
+  @Override
+  public void accept(CloudEvent event) throws Exception {
+    String payloadJson = new String(event.getData(), UTF_8);
+    Gson gson = new Gson();
+    JsonObject jsonObject = gson.fromJson(payloadJson, JsonObject.class);
+    String targetFile = jsonObject.get("targetFile").getAsString();
+    if (targetFile == null) {
+      throw new IllegalArgumentException("Expected targetFile in JSON payload");
+    }
+    EventFormat jsonFormat = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    byte[] bytes = jsonFormat.serialize(event);
+    try (FileOutputStream out = new FileOutputStream(targetFile)) {
+      out.write(bytes);
+    }
+  }
+}

From f3ddbacc760ced9d2c87ea69f9675854ef1aca47 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <timmerman+devrel@google.com>
Date: Thu, 10 Sep 2020 08:50:31 -0500
Subject: [PATCH 046/308] docs: add ci and maven central badges (#59)

* docs: add ci and maven central badges

* Update README.md
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8aa3cb4a..74010b53 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Functions Framework for Java [![Build Status](https://travis-ci.org/GoogleCloudPlatform/functions-framework-java.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/functions-framework-java)
+# Functions Framework for Java [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FGoogleCloudPlatform%2Ffunctions-framework-java%2Fbadge&style=flat)](https://actions-badge.atrox.dev/GoogleCloudPlatform/functions-framework-java/goto) [![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
 
 An open source FaaS (Function as a service) framework for writing portable
 Java functions -- brought to you by the Google Cloud Functions team.

From 3059d093cac48d9ca2b6bc44799da3a61e182e7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 10 Sep 2020 16:31:46 -0700
Subject: [PATCH 047/308] Add support for native CloudEvents functions. (#60)

* Add support for native CloudEvents functions.

This means functions that receive a CloudEvent payload and dispatch it to a user function that expects a CloudEvent object. We do not yet handle converting a CloudEvent payload to the form expected by legacy GCF functions.

* Add explanatory comments to the new code in BackgroundFunctionExecutor.

From fe091a5ce90cae4e21f519526583c4178baa803d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Fri, 11 Sep 2020 08:27:51 -0700
Subject: [PATCH 048/308] Add logic to convert from Legacy Events to
 CloudEvents. (#61)

* Add explanatory comments to the new code in BackgroundFunctionExecutor.

* Add logic to convert from Legacy Events to CloudEvents.

This allows received Legacy Events to be handled by function code that expects a
CloudEvent input. The translation logic and tests are based closely on the
corresponding code in https://github.com/GoogleCloudPlatform/functions-framework-dotnet.

The new code also passes the relevant conformance tests in
https://github.com/GoogleCloudPlatform/functions-framework-conformance, once
https://github.com/GoogleCloudPlatform/functions-framework-conformance/pull/30
is applied. For now I'm running those tests manually. I plan at least to commit
the script and test functions that allow me to do so.
---
 .../invoker/BackgroundFunctionExecutor.java   |  29 ++-
 .../invoker/CloudFunctionsContext.java        |  48 ++++
 .../google/cloud/functions/invoker/Event.java |  23 +-
 .../cloud/functions/invoker/GcfEvents.java    | 229 ++++++++++++++++++
 .../functions/invoker/GcfEventsTest.java      | 122 ++++++++++
 .../src/test/resources/firebase-auth1.json    |  22 ++
 .../src/test/resources/firebase-auth2.json    |  22 ++
 .../core/src/test/resources/firebase-db1.json |  18 ++
 .../src/test/resources/firestore_simple.json  |  51 ++++
 .../src/test/resources/legacy_pubsub.json     |  13 +
 .../test/resources/legacy_storage_change.json |  26 ++
 .../core/src/test/resources/pubsub_text.json  |  19 ++
 invoker/core/src/test/resources/storage.json  |  31 +++
 13 files changed, 626 insertions(+), 27 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
 create mode 100644 invoker/core/src/test/resources/firebase-auth1.json
 create mode 100644 invoker/core/src/test/resources/firebase-auth2.json
 create mode 100644 invoker/core/src/test/resources/firebase-db1.json
 create mode 100644 invoker/core/src/test/resources/firestore_simple.json
 create mode 100644 invoker/core/src/test/resources/legacy_pubsub.json
 create mode 100644 invoker/core/src/test/resources/legacy_storage_change.json
 create mode 100644 invoker/core/src/test/resources/pubsub_text.json
 create mode 100644 invoker/core/src/test/resources/storage.json

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 6c81ddc8..4d82a802 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -32,6 +32,7 @@
 import io.cloudevents.core.message.impl.UnknownEncodingMessageReader;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.Reader;
 import java.lang.reflect.Type;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
@@ -171,17 +172,21 @@ static Optional<Type> backgroundFunctionTypeArgument(
 
   private static Event parseLegacyEvent(HttpServletRequest req) throws IOException {
     try (BufferedReader bodyReader = req.getReader()) {
-      // A Type Adapter is required to set the type of the JsonObject because CloudFunctionsContext
-      // is abstract and Gson default behavior instantiates the type provided.
-      TypeAdapter<CloudFunctionsContext> typeAdapter =
-          CloudFunctionsContext.typeAdapter(new Gson());
-      Gson gson = new GsonBuilder()
-          .registerTypeAdapter(CloudFunctionsContext.class, typeAdapter)
-          .registerTypeAdapter(Event.class, new Event.EventDeserializer())
-          .create();
-      return gson.fromJson(bodyReader, Event.class);
+      return parseLegacyEvent(bodyReader);
     }
   }
+  
+  static Event parseLegacyEvent(Reader reader) throws IOException {
+    // A Type Adapter is required to set the type of the JsonObject because CloudFunctionsContext
+    // is abstract and Gson default behavior instantiates the type provided.
+    TypeAdapter<CloudFunctionsContext> typeAdapter =
+        CloudFunctionsContext.typeAdapter(new Gson());
+    Gson gson = new GsonBuilder()
+        .registerTypeAdapter(CloudFunctionsContext.class, typeAdapter)
+        .registerTypeAdapter(Event.class, new Event.EventDeserializer())
+        .create();
+    return gson.fromJson(reader, Event.class);
+  }
 
   private static Context contextFromCloudEvent(CloudEvent cloudEvent) {
     OffsetDateTime timestamp = Optional.ofNullable(cloudEvent.getTime()).orElse(OffsetDateTime.now());
@@ -291,7 +296,7 @@ void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
     }
   }
 
-  private static class CloudEventFunctionExecutor extends FunctionExecutor<Void>{
+  private static class CloudEventFunctionExecutor extends FunctionExecutor<Void> {
     private final ExperimentalCloudEventsFunction function;
 
     CloudEventFunctionExecutor(ExperimentalCloudEventsFunction function) {
@@ -301,8 +306,8 @@ private static class CloudEventFunctionExecutor extends FunctionExecutor<Void>{
 
     @Override
     void serviceLegacyEvent(Event legacyEvent) throws Exception {
-      throw new UnsupportedOperationException(
-          "Conversion from legacy events to CloudEvents not yet implemented");
+      CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+      function.accept(cloudEvent);
     }
 
     @Override
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index fe1983d2..c9fc06d9 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -17,6 +17,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.cloud.functions.Context;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -46,6 +47,9 @@ abstract class CloudFunctionsContext implements Context {
   @Nullable
   public abstract String resource();
 
+  // TODO: expose this in the Context interface (as a default method).
+  abstract Map<String, String> params();
+
   @Override
   public abstract Map<String, String> attributes();
 
@@ -55,6 +59,7 @@ public static TypeAdapter<CloudFunctionsContext> typeAdapter(Gson gson) {
 
   static Builder builder() {
     return new AutoValue_CloudFunctionsContext.Builder()
+        .setParams(Collections.emptyMap())
         .setAttributes(Collections.emptyMap());
   }
 
@@ -64,8 +69,51 @@ abstract static class Builder {
     abstract Builder setTimestamp(String x);
     abstract Builder setEventType(String x);
     abstract Builder setResource(String x);
+    abstract Builder setParams(Map<String, String> x);
     abstract Builder setAttributes(Map<String, String> value);
 
     abstract CloudFunctionsContext build();
   }
+
+  /**
+   * Depending on the event type, the {@link Context#resource()} field is either a JSON string (complete
+   * with encosing quotes) or a JSON object. This class allows us to redeserialize that JSON representation
+   * into its components.
+   */
+  @AutoValue
+  abstract static class Resource {
+    abstract @Nullable String service();
+    abstract String name();
+    abstract @Nullable String type();
+
+    static TypeAdapter<Resource> typeAdapter(Gson gson) {
+      return new AutoValue_CloudFunctionsContext_Resource.GsonTypeAdapter(gson);
+    }
+
+    static Resource from(String s) {
+      Gson baseGson = new Gson();
+      if (s.startsWith("\"") && s.endsWith("\"")) {
+        String name = baseGson.fromJson(s, String.class);
+        return builder().setName(name).build();
+      }
+      if (s.startsWith("{") && (s.endsWith("}") || s.endsWith("}\n"))) {
+        TypeAdapter<Resource> typeAdapter = typeAdapter(baseGson);
+        Gson gson = new GsonBuilder().registerTypeAdapter(Resource.class, typeAdapter).create();
+        return gson.fromJson(s, Resource.class);
+      }
+      throw new IllegalArgumentException("Unexpected resource syntax: " + s);
+    }
+
+    static Builder builder() {
+      return new AutoValue_CloudFunctionsContext_Resource.Builder();
+    }
+
+    @AutoValue.Builder
+    abstract static class Builder {
+      abstract Builder setService(String x);
+      abstract Builder setName(String x);
+      abstract Builder setType(String x);
+      abstract Resource build();
+    }
+  }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
index 8007bf6a..6f52f20b 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
@@ -14,6 +14,7 @@
 
 package com.google.cloud.functions.invoker;
 
+import com.google.auto.value.AutoValue;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -25,23 +26,15 @@
  * Represents an event that should be handled by a background function. This is an internal format
  * which is later converted to actual background function parameter types.
  */
-class Event {
-
-  private JsonElement data;
-  private CloudFunctionsContext context;
-
-  Event(JsonElement data, CloudFunctionsContext context) {
-    this.data = data;
-    this.context = context;
+@AutoValue
+abstract class Event {
+  static Event of(JsonElement data, CloudFunctionsContext context) {
+    return new AutoValue_Event(data, context);
   }
 
-  JsonElement getData() {
-    return data;
-  }
+  abstract JsonElement getData();
 
-  CloudFunctionsContext getContext() {
-    return context;
-  }
+  abstract CloudFunctionsContext getContext();
 
   /** Custom deserializer that supports both GCF beta and GCF GA event formats. */
   static class EventDeserializer implements JsonDeserializer<Event> {
@@ -67,7 +60,7 @@ public Event deserialize(
             jsonDeserializationContext.deserialize(
                 adjustContextResource(rootCopy), CloudFunctionsContext.class);
       }
-      return new Event(data, context);
+      return Event.of(data, context);
     }
 
     /**
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
new file mode 100644
index 00000000..b4cea041
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
@@ -0,0 +1,229 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Map.entry;
+
+import com.google.auto.value.AutoValue;
+import com.google.cloud.functions.invoker.CloudFunctionsContext.Nullable;
+import com.google.cloud.functions.invoker.CloudFunctionsContext.Resource;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import io.cloudevents.CloudEvent;
+import io.cloudevents.core.builder.CloudEventBuilder;
+import java.net.URI;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Conversions from GCF events to CloudEvents.
+ */
+class GcfEvents {
+  private static final String FIREBASE_SERVICE = "firebase.googleapis.com";
+  private static final String FIRESTORE_SERVICE = "firestore.googleapis.com";
+  private static final String PUB_SUB_SERVICE = "pubsub.googleapis.com";
+  private static final String STORAGE_SERVICE = "storage.googleapis.com";
+
+  private static final String PUB_SUB_MESSAGE_PUBLISHED = "google.cloud.pubsub.topic.v1.messagePublished";
+
+  private static final Map<String, EventAdapter> EVENT_TYPE_MAPPING = Map.ofEntries(
+      entry("google.pubsub.topic.publish", new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
+
+      entry("google.storage.object.finalize",
+          new StorageEventAdapter("google.cloud.storage.object.v1.finalized")),
+      entry("google.storage.object.delete",
+          new StorageEventAdapter("google.cloud.storage.object.v1.deleted")),
+      entry("google.storage.object.archive",
+          new StorageEventAdapter("google.cloud.storage.object.v1.archived")),
+      entry("google.storage.object.metadataUpdate",
+          new StorageEventAdapter("google.cloud.storage.object.v1.metadataUpdated")),
+
+      entry("providers/cloud.firestore/eventTypes/document.write",
+          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.written",
+              FIRESTORE_SERVICE)),
+      entry("providers/cloud.firestore/eventTypes/document.create",
+          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.created",
+              FIRESTORE_SERVICE)),
+      entry("providers/cloud.firestore/eventTypes/document.update",
+          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.updated",
+              FIRESTORE_SERVICE)),
+      entry("providers/cloud.firestore/eventTypes/document.delete",
+          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.deleted",
+              FIRESTORE_SERVICE)),
+
+      entry("providers/firebase.auth/eventTypes/user.create",
+          new FirestoreFirebaseEventAdapter("google.firebase.auth.user.v1.created", FIREBASE_SERVICE)),
+      entry("providers/firebase.auth/eventTypes/user.delete",
+          new FirestoreFirebaseEventAdapter("google.firebase.auth.user.v1.deleted", FIREBASE_SERVICE)),
+
+      entry("providers/google.firebase.analytics/eventTypes/event.log",
+          new FirestoreFirebaseEventAdapter("google.firebase.analytics.log.v1.written", FIREBASE_SERVICE)),
+
+      entry("providers/google.firebase.database/eventTypes/ref.create",
+          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.created",
+              FIREBASE_SERVICE)),
+      entry("providers/google.firebase.database/eventTypes/ref.write",
+          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.written",
+              FIREBASE_SERVICE)),
+      entry("providers/google.firebase.database/eventTypes/ref.update",
+          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.updated",
+              FIREBASE_SERVICE)),
+      entry("providers/google.firebase.database/eventTypes/ref.delete",
+          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.deleted",
+              FIREBASE_SERVICE)),
+
+      entry("providers/cloud.pubsub/eventTypes/topic.publish",
+          new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
+
+      entry("providers/cloud.storage/eventTypes/object.change",
+          new StorageEventAdapter("google.cloud.storage.object.v1.changed"))
+  );
+
+  private static final Gson GSON = new Gson();
+
+  static CloudEvent convertToCloudEvent(Event legacyEvent) {
+    String eventType = legacyEvent.getContext().eventType();
+    EventAdapter eventAdapter = EVENT_TYPE_MAPPING.get(eventType);
+    if (eventAdapter == null) {
+      throw new IllegalArgumentException("Unrecognized event type \"" + eventType + "\"");
+    }
+    return eventAdapter.convertToCloudEvent(legacyEvent);
+  }
+
+  @AutoValue
+  abstract static class SourceAndSubject {
+    /** The source URI, without the initial {@code //<service>/}. */
+    abstract String source();
+    abstract @Nullable String subject();
+
+    static SourceAndSubject of(String source, String subject) {
+      return new AutoValue_GcfEvents_SourceAndSubject(source, subject);
+    }
+  }
+
+  private abstract static class EventAdapter {
+    private final String cloudEventType;
+    private final String defaultService;
+
+    EventAdapter(String cloudEventType, String defaultService) {
+      this.cloudEventType = cloudEventType;
+      this.defaultService = defaultService;
+    }
+
+    final CloudEvent convertToCloudEvent(Event legacyEvent) {
+      String jsonData = GSON.toJson(legacyEvent.getData());
+      jsonData = maybeReshapeData(legacyEvent, jsonData);
+      Resource resource = Resource.from(legacyEvent.getContext().resource());
+      String service = Optional.ofNullable(resource.service()).orElse(defaultService);
+      String resourceName = resource.name();
+      SourceAndSubject sourceAndSubject = convertResourceToSourceAndSubject(resourceName);
+      URI source = URI.create("//" + service + "/" + sourceAndSubject.source());
+      OffsetDateTime timestamp =
+          Optional.ofNullable(legacyEvent.getContext().timestamp())
+              .map(s -> OffsetDateTime.parse(s, DateTimeFormatter.ISO_DATE_TIME))
+              .orElse(null);
+      return CloudEventBuilder.v1()
+          .withData(jsonData.getBytes(UTF_8))
+          .withDataContentType("application/json")
+          .withId(legacyEvent.getContext().eventId())
+          .withSource(source)
+          .withSubject(sourceAndSubject.subject())
+          .withTime(timestamp)
+          .withType(cloudEventType)
+          .build();
+    }
+
+    String maybeReshapeData(Event legacyEvent, String jsonData) {
+      return jsonData;
+    }
+
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName) {
+      return SourceAndSubject.of(resourceName, null);
+    }
+  }
+
+  private static class PubSubEventAdapter extends EventAdapter {
+    PubSubEventAdapter(String cloudEventType) {
+      super(cloudEventType, PUB_SUB_SERVICE);
+    }
+
+    @Override
+    String maybeReshapeData(Event legacyEvent, String jsonData) {
+      JsonObject jsonObject = GSON.fromJson(jsonData, JsonObject.class);
+      JsonObject wrapped = new JsonObject();
+      wrapped.add("message", jsonObject);
+      return GSON.toJson(wrapped);
+    }
+  }
+
+  private static class StorageEventAdapter extends EventAdapter {
+    private static final Pattern STORAGE_RESOURCE_PATTERN =
+        Pattern.compile("^(projects/_/buckets/[^/]+)/(objects/.*?)(?:#\\d+)?$");
+
+    StorageEventAdapter(String cloudEventType) {
+      super(cloudEventType, STORAGE_SERVICE);
+    }
+
+    @Override
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName) {
+      Matcher matcher = STORAGE_RESOURCE_PATTERN.matcher(resourceName);
+      if (matcher.matches()) {
+        String resource = matcher.group(1);
+        String subject = matcher.group(2);
+        return SourceAndSubject.of(resource, subject);
+      }
+      return super.convertResourceToSourceAndSubject(resourceName);
+    }
+  }
+
+  private static class FirestoreFirebaseEventAdapter extends EventAdapter {
+    FirestoreFirebaseEventAdapter(String cloudEventType, String defaultService) {
+      super(cloudEventType, defaultService);
+    }
+
+    @Override
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName) {
+      List<String> resourceSegments = Arrays.asList(resourceName.split("/"));
+      int documentsIndex = resourceSegments.indexOf("documents");
+      if (documentsIndex < 0) {
+        return super.convertResourceToSourceAndSubject(resourceName);
+      }
+      String sourcePath = String.join("/", resourceSegments.subList(0, documentsIndex));
+      String subject = String.join("/", resourceSegments.subList(documentsIndex, resourceSegments.size()));
+      return SourceAndSubject.of(sourcePath, subject);
+    }
+
+    @Override
+    String maybeReshapeData(Event legacyEvent, String jsonData) {
+      // The reshaping code is disabled for now, because the specification for how the legacy "params"
+      // field should be represented in a CloudEvent is in flux.
+      if (true || legacyEvent.getContext().params().isEmpty()) {
+        return jsonData;
+      }
+      JsonObject jsonObject = GSON.fromJson(jsonData, JsonObject.class);
+      JsonObject wildcards = new JsonObject();
+      legacyEvent.getContext().params().forEach((k, v) -> wildcards.addProperty(k, v));
+      jsonObject.add("wildcards", wildcards);
+      return GSON.toJson(jsonObject);
+    }
+  }
+}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
new file mode 100644
index 00000000..ec305326
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -0,0 +1,122 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.common.truth.Expect;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import io.cloudevents.CloudEvent;
+import io.cloudevents.SpecVersion;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+
+public class GcfEventsTest {
+  @Rule public Expect expect = Expect.create();
+
+  private static final String[][] EVENT_DATA = {
+    {"storage.json", "google.cloud.storage.object.v1.finalized",
+      "//storage.googleapis.com/projects/_/buckets/some-bucket", "objects/folder/Test.cs"},
+    {"legacy_storage_change.json", "google.cloud.storage.object.v1.changed",
+      "//storage.googleapis.com/projects/_/buckets/sample-bucket", "objects/MyFile"},
+    {"firestore_simple.json", "google.cloud.firestore.document.v1.written",
+      "//firestore.googleapis.com/projects/project-id/databases/(default)",
+      "documents/gcf-test/2Vm2mI1d0wIaK2Waj5to"},
+    {"pubsub_text.json", "google.cloud.pubsub.topic.v1.messagePublished",
+      "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
+    {"legacy_pubsub.json", "google.cloud.pubsub.topic.v1.messagePublished",
+      "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
+    {"firebase-db1.json", "google.firebase.database.document.v1.written",
+      "//firebase.googleapis.com/projects/_/instances/my-project-id/refs/gcf-test/xyz", null},
+    {"firebase-auth1.json", "google.firebase.auth.user.v1.created",
+      "//firebase.googleapis.com/projects/my-project-id", null},
+    {"firebase-auth2.json", "google.firebase.auth.user.v1.deleted",
+      "//firebase.googleapis.com/projects/my-project-id", null},
+  };
+
+  @Test
+  public void convertGcfEvent() throws IOException {
+    for (String[] eventData : EVENT_DATA) {
+      Event legacyEvent = legacyEventForResource(eventData[0]);
+      convertGcfEvent(legacyEvent, eventData[1], eventData[2], eventData[3]);
+    }
+  }
+
+  private void convertGcfEvent(Event legacyEvent, String expectedType, String expectedSource, String expectedSubject) {
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    expect.that(cloudEvent.getType()).isEqualTo(expectedType);
+    expect.that(cloudEvent.getSource().toString()).isEqualTo(expectedSource);
+    expect.that(cloudEvent.getSubject()).isEqualTo(expectedSubject);
+  }
+
+  // Checks everything we know about a single event.
+  @Test
+  public void checkAllProperties() throws IOException {
+    Event legacyEvent = legacyEventForResource("storage.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    assertThat(cloudEvent.getDataContentType()).isEqualTo("application/json");
+    assertThat(cloudEvent.getId()).isEqualTo("1147091835525187");
+    assertThat(cloudEvent.getType()).isEqualTo("google.cloud.storage.object.v1.finalized");
+    assertThat(cloudEvent.getTime())
+        .isEqualTo(OffsetDateTime.of(2020, 4, 23, 7, 38, 57, 772_000_000, ZoneOffset.UTC));
+    assertThat(cloudEvent.getSource().toString())
+        .isEqualTo("//storage.googleapis.com/projects/_/buckets/some-bucket");
+    assertThat(cloudEvent.getSubject()).isEqualTo("objects/folder/Test.cs");
+    assertThat(cloudEvent.getSpecVersion()).isEqualTo(SpecVersion.V1);
+    assertThat(cloudEvent.getDataSchema()).isNull();
+  }
+
+  // Checks that a PubSub event correctly gets its payload wrapped in a "message" dictionary.
+  @Test
+  public void pubSubWrapping() throws IOException {
+    Event legacyEvent = legacyEventForResource("legacy_pubsub.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    assertThat(new String(cloudEvent.getData(), UTF_8))
+        .isEqualTo("{\"message\":{\"@type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\","
+            + "\"attributes\":{\"attribute1\":\"value1\"},"
+            + "\"data\":\"VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl\"}}");
+  }
+
+  // Checks that a Firestore event correctly gets an extra "wildcards" property in its CloudEvent data
+  // reflecting the "params" field in the legacy event.
+  // This test is currently ignored because the final representation of the "params" field is in flux.
+  @Test
+  @Ignore
+  public void firestoreWildcards() throws IOException {
+    Event legacyEvent = legacyEventForResource("firestore_simple.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    JsonObject payload = new Gson().fromJson(new String(cloudEvent.getData(), UTF_8), JsonObject.class);
+    JsonObject wildcards = payload.getAsJsonObject("wildcards");
+    assertThat(wildcards.keySet()).containsExactly("doc");
+    assertThat(wildcards.getAsJsonPrimitive("doc").getAsString()).isEqualTo("2Vm2mI1d0wIaK2Waj5to");
+  }
+
+  private Event legacyEventForResource(String resourceName) throws IOException {
+    try (InputStream in = getClass().getResourceAsStream("/" + resourceName)) {
+      assertWithMessage("No such resource /%s", resourceName).that(in).isNotNull();
+      String legacyEventString = new String(in.readAllBytes(), UTF_8);
+      return BackgroundFunctionExecutor.parseLegacyEvent(new StringReader(legacyEventString));
+    }
+  }
+}
diff --git a/invoker/core/src/test/resources/firebase-auth1.json b/invoker/core/src/test/resources/firebase-auth1.json
new file mode 100644
index 00000000..bb623341
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-auth1.json
@@ -0,0 +1,22 @@
+{
+  "data": {
+    "email": "test@nowhere.com",
+    "metadata": {
+      "createdAt": "2020-05-26T10:42:27Z"
+    },
+    "providerData": [
+      {
+        "email": "test@nowhere.com",
+        "providerId": "password",
+        "uid": "test@nowhere.com"
+      }
+    ],
+    "uid": "UUpby3s4spZre6kHsgVSPetzQ8l2"
+  },
+  "eventId": "4423b4fa-c39b-4f79-b338-977a018e9b55",
+  "eventType": "providers/firebase.auth/eventTypes/user.create",
+  "notSupported": {
+  },
+  "resource": "projects/my-project-id",
+  "timestamp": "2020-05-26T10:42:27.088Z"
+}
diff --git a/invoker/core/src/test/resources/firebase-auth2.json b/invoker/core/src/test/resources/firebase-auth2.json
new file mode 100644
index 00000000..0a702902
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-auth2.json
@@ -0,0 +1,22 @@
+{
+  "data": {
+    "email": "test@nowhere.com",
+    "metadata": {
+      "createdAt": "2020-05-26T10:42:27Z"
+    },
+    "providerData": [
+      {
+        "email": "test@nowhere.com",
+        "providerId": "password",
+        "uid": "test@nowhere.com"
+      }
+    ],
+    "uid": "UUpby3s4spZre6kHsgVSPetzQ8l2"
+  },
+  "eventId": "5fd71bdc-4955-421f-9fc3-552ac3abead8",
+  "eventType": "providers/firebase.auth/eventTypes/user.delete",
+  "notSupported": {
+  },
+  "resource": "projects/my-project-id",
+  "timestamp": "2020-05-26T10:47:14.205Z"
+}
diff --git a/invoker/core/src/test/resources/firebase-db1.json b/invoker/core/src/test/resources/firebase-db1.json
new file mode 100644
index 00000000..b7321a06
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-db1.json
@@ -0,0 +1,18 @@
+{
+  "eventType": "providers/google.firebase.database/eventTypes/ref.write",
+  "params": {
+    "child": "xyz"
+  },
+  "auth": {
+    "admin": true
+  },
+  "data": {
+    "data": null,
+    "delta": {
+      "grandchild": "other"
+    }
+  },
+  "resource": "projects/_/instances/my-project-id/refs/gcf-test/xyz",
+  "timestamp": "2020-05-21T11:15:34.178Z",
+  "eventId": "/SnHth9OSlzK1Puj85kk4tDbF90="
+}
diff --git a/invoker/core/src/test/resources/firestore_simple.json b/invoker/core/src/test/resources/firestore_simple.json
new file mode 100644
index 00000000..14d7de48
--- /dev/null
+++ b/invoker/core/src/test/resources/firestore_simple.json
@@ -0,0 +1,51 @@
+{
+    "data":{
+	"oldValue":{
+            "createTime":"2020-04-23T09:58:53.211035Z",
+            "fields":{
+		"another test":{
+		    "stringValue":"asd"
+		},
+		"count":{
+		    "integerValue":"3"
+		},
+		"foo":{
+		    "stringValue":"bar"
+		}
+	    },
+            "name":"projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+            "updateTime":"2020-04-23T12:00:27.247187Z"
+	},
+	"updateMask":{
+            "fieldPaths":[
+		"count"
+	    ]
+	},
+	"value":{
+            "createTime":"2020-04-23T09:58:53.211035Z",
+            "fields":{
+		"another test":{
+		    "stringValue":"asd"
+		},
+		"count":{
+		    "integerValue":"4"
+		},
+		"foo":{
+		    "stringValue":"bar"
+		}
+	    },
+            "name":"projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+            "updateTime":"2020-04-23T12:00:27.247187Z"
+	}
+    },
+    "eventId":"7b8f1804-d38b-4b68-b37d-e2fb5d12d5a0-0",
+    "eventType":"providers/cloud.firestore/eventTypes/document.write",
+    "notSupported":{
+
+    },
+    "params":{
+	"doc":"2Vm2mI1d0wIaK2Waj5to"
+    },
+    "resource":"projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+    "timestamp":"2020-04-23T12:00:27.247187Z"
+}
diff --git a/invoker/core/src/test/resources/legacy_pubsub.json b/invoker/core/src/test/resources/legacy_pubsub.json
new file mode 100644
index 00000000..b03bfd59
--- /dev/null
+++ b/invoker/core/src/test/resources/legacy_pubsub.json
@@ -0,0 +1,13 @@
+{
+  "eventId": "1215011316659232",
+  "timestamp": "2020-05-18T12:13:19.209Z",
+  "eventType": "providers/cloud.pubsub/eventTypes/topic.publish",
+  "resource": "projects/sample-project/topics/gcf-test",
+  "data": {
+    "@type": "type.googleapis.com/google.pubsub.v1.PubsubMessage",
+    "attributes": {
+      "attribute1": "value1"
+    },
+    "data": "VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl"
+  }
+}
diff --git a/invoker/core/src/test/resources/legacy_storage_change.json b/invoker/core/src/test/resources/legacy_storage_change.json
new file mode 100644
index 00000000..8a1e92ed
--- /dev/null
+++ b/invoker/core/src/test/resources/legacy_storage_change.json
@@ -0,0 +1,26 @@
+{
+  "data": {
+    "bucket": "sample-bucket",
+    "crc32c": "AAAAAA==",
+    "etag": "COu8mb3Dn+kCEAE=",
+    "generation": "1588778055917163",
+    "id": "sample-bucket/MyFile/1588778055917163",
+    "kind": "storage#object",
+    "md5Hash": "ZDQxZDhjZDk4ZjAwYjIwNGU5ODAwOTk4ZWNmODQyN2U=",
+    "mediaLink": "https://www.googleapis.com/download/storage/v1/b/projectid-sample-bucket/o/MyFile?generation=1588778055917163\u0026alt=media",
+    "metageneration": "1",
+    "name": "MyFile",
+    "resourceState": "not_exists",
+    "selfLink": "https://www.googleapis.com/storage/v1/b/projectid-sample-bucket/o/MyFile",
+    "size": "0",
+    "storageClass": "MULTI_REGIONAL",
+    "timeCreated": "2020-05-06T15:14:15.917Z",
+    "timeDeleted": "2020-05-18T09:07:51.799Z",
+    "timeStorageClassUpdated": "2020-05-06T15:14:15.917Z",
+    "updated": "2020-05-06T15:14:15.917Z"
+  },
+  "eventId": "1200401551653202",
+  "eventType": "providers/cloud.storage/eventTypes/object.change",
+  "resource": "projects/_/buckets/sample-bucket/objects/MyFile#1588778055917163",
+  "timestamp": "2020-05-18T09:07:51.799Z"
+}
diff --git a/invoker/core/src/test/resources/pubsub_text.json b/invoker/core/src/test/resources/pubsub_text.json
new file mode 100644
index 00000000..9d7ed53c
--- /dev/null
+++ b/invoker/core/src/test/resources/pubsub_text.json
@@ -0,0 +1,19 @@
+{
+      "context": {
+      "eventId":"1144231683168617",
+      "timestamp":"2020-05-06T07:33:34.556Z",
+      "eventType":"google.pubsub.topic.publish",
+      "resource":{
+        "service":"pubsub.googleapis.com",
+        "name":"projects/sample-project/topics/gcf-test",
+        "type":"type.googleapis.com/google.pubsub.v1.PubsubMessage"
+      }
+   },
+   "data": {
+      "@type": "type.googleapis.com/google.pubsub.v1.PubsubMessage",
+      "attributes": {
+         "attr1":"attr1-value"
+      },
+      "data": "dGVzdCBtZXNzYWdlIDM="
+   }
+}
diff --git a/invoker/core/src/test/resources/storage.json b/invoker/core/src/test/resources/storage.json
new file mode 100644
index 00000000..baf92557
--- /dev/null
+++ b/invoker/core/src/test/resources/storage.json
@@ -0,0 +1,31 @@
+{
+   "context": {
+      "eventId": "1147091835525187",
+      "timestamp": "2020-04-23T07:38:57.772Z",
+      "eventType": "google.storage.object.finalize",
+      "resource": {
+         "service": "storage.googleapis.com",
+         "name": "projects/_/buckets/some-bucket/objects/folder/Test.cs",
+         "type": "storage#object"
+      }
+   },
+   "data": {
+      "bucket": "some-bucket",
+      "contentType": "text/plain",
+      "crc32c": "rTVTeQ==",
+      "etag": "CNHZkbuF/ugCEAE=",
+      "generation": "1587627537231057",
+      "id": "some-bucket/folder/Test.cs/1587627537231057",
+      "kind": "storage#object",
+      "md5Hash": "kF8MuJ5+CTJxvyhHS1xzRg==",
+      "mediaLink": "https://www.googleapis.com/download/storage/v1/b/some-bucket/o/folder%2FTest.cs?generation=1587627537231057\u0026alt=media",
+      "metageneration": "1",
+      "name": "folder/Test.cs",
+      "selfLink": "https://www.googleapis.com/storage/v1/b/some-bucket/o/folder/Test.cs",
+      "size": "352",
+      "storageClass": "MULTI_REGIONAL",
+      "timeCreated": "2020-04-23T07:38:57.230Z",
+      "timeStorageClassUpdated": "2020-04-23T07:38:57.230Z",
+      "updated": "2020-04-23T07:38:57.230Z"
+   }
+}

From 883f7af198a3aefa8cbf1f45deb3cdd0fba51154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 15 Sep 2020 09:30:23 -0700
Subject: [PATCH 049/308] Add more tests on the data of translated CloudEvents.
 (#62)

* Add more tests on the data of translated CloudEvents.

These tests check what is in the `data` field of the CloudEvents that we
translate from legacy events. For now they are not all that useful, because that
field is basically just a copy of the JSON payload of the legacy event. But we
do rearrange things slightly for PubSub events, and we are likely to do so for
Firebase events too in the future. Furthermore, if we eventually have a library
of classes representing the various event payloads, then we can use that library
instead of working with the JSON directly. That is what
google-cloudevents-dotnet does, for example.
---
 .../functions/invoker/GcfEventsTest.java      | 122 ++++++++++++++++++
 .../src/test/resources/firestore_complex.json |  81 ++++++++++++
 .../src/test/resources/pubsub_binary.json     |  16 +++
 3 files changed, 219 insertions(+)
 create mode 100644 invoker/core/src/test/resources/firestore_complex.json
 create mode 100644 invoker/core/src/test/resources/pubsub_binary.json

diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
index ec305326..5d4d7344 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -28,6 +28,9 @@
 import java.io.StringReader;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
+import java.util.Base64;
+import java.util.List;
+import java.util.Map;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
@@ -87,6 +90,118 @@ public void checkAllProperties() throws IOException {
     assertThat(cloudEvent.getDataSchema()).isNull();
   }
 
+  // The next set of tests checks the result of using Gson to deserialize the JSON "data" field of the
+  // CloudEvent that we get from converting a legacy event. For the most part we're not testing much here,
+  // since the "data" field is essentially copied from the input legacy event. In some cases we adjust it,
+  // though.
+  // Later, when we have support for handling these types properly in Java, we can change the tests to use
+  // that. See https://github.com/googleapis/google-cloudevents-java
+
+  @Test
+  public void storageData() throws IOException {
+    Event legacyEvent = legacyEventForResource("storage.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    Map<String, Object> data = cloudEventDataJson(cloudEvent);
+    assertThat(data).containsAtLeast(
+        "bucket", "some-bucket",
+        "timeCreated", "2020-04-23T07:38:57.230Z",
+        "generation", "1587627537231057",
+        "metageneration", "1",
+        "size", "352");
+  }
+
+  @Test
+  public void firestoreSimpleData() throws IOException {
+    Event legacyEvent = legacyEventForResource("firestore_simple.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    Map<String, Object> data = cloudEventDataJson(cloudEvent);
+    Map<String, Object> expectedValue = Map.of(
+        "name", "projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+        "createTime", "2020-04-23T09:58:53.211035Z",
+        "updateTime", "2020-04-23T12:00:27.247187Z",
+        "fields", Map.of(
+            "another test", Map.of("stringValue", "asd"),
+            "count", Map.of("integerValue", "4"),
+            "foo", Map.of("stringValue", "bar")));
+    Map<String, Object> expectedOldValue = Map.of(
+        "name", "projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+        "createTime", "2020-04-23T09:58:53.211035Z",
+        "updateTime", "2020-04-23T12:00:27.247187Z",
+        "fields", Map.of(
+            "another test", Map.of("stringValue", "asd"),
+            "count", Map.of("integerValue", "3"),
+            "foo", Map.of("stringValue", "bar")));
+    assertThat(data).containsAtLeast(
+        "value", expectedValue,
+        "oldValue", expectedOldValue,
+        "updateMask", Map.of("fieldPaths", List.of("count")));
+  }
+
+  @Test
+  public void firestoreComplexData() throws IOException {
+    Event legacyEvent = legacyEventForResource("firestore_complex.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    Map<String, Object> data = cloudEventDataJson(cloudEvent);
+    Map<?, ?> value = (Map<?, ?>) data.get("value");
+    Map<?, ?> fields = (Map<?, ?>) value.get("fields");
+    Map<String, Object> expectedFields = Map.of(
+        "arrayValue", Map.of("arrayValue",
+            Map.of("values",
+                List.of(Map.of("integerValue", "1"), Map.of("integerValue", "2")))),
+        "booleanValue", Map.of("booleanValue", true),
+        "geoPointValue", Map.of("geoPointValue", Map.of("latitude", 51.4543, "longitude", -0.9781)),
+        "intValue", Map.of("integerValue", "50"),
+        "doubleValue", Map.of("doubleValue", 5.5),
+        "nullValue", Map.of(),
+        "referenceValue", Map.of("referenceValue",
+            "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"),
+        "stringValue", Map.of("stringValue", "text"),
+        "timestampValue", Map.of("timestampValue", "2020-04-23T14:23:53.241Z"),
+        "mapValue", Map.of("mapValue",
+            Map.of("fields",
+                Map.of("field1", Map.of("stringValue", "x"),
+                    "field2", Map.of("arrayValue",
+                        Map.of("values",
+                            List.of(Map.of("stringValue", "x"), Map.of("integerValue", "1")))))))
+    );
+    assertThat(fields).containsExactlyEntriesIn(expectedFields);
+  }
+
+  @Test
+  public void pubSubTextData() throws IOException {
+    Event legacyEvent = legacyEventForResource("pubsub_text.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    Map<String, Object> data = cloudEventDataJson(cloudEvent);
+
+    Map<?, ?> message = (Map<?, ?>) data.get("message");
+    assertThat(message).isNotNull();
+    assertThat(message).containsKey("data");
+    // Later we should provide support for doing this more simply and test that:
+    String base64 = (String) message.get("data");
+    byte[] bytes = Base64.getDecoder().decode(base64);
+    String text = new String(bytes, UTF_8);
+    assertThat(text).isEqualTo("test message 3");
+
+    assertThat(message).containsEntry("attributes", Map.of("attr1", "attr1-value"));
+  }
+
+  @Test
+  public void pubSubBinaryData() throws IOException {
+    Event legacyEvent = legacyEventForResource("pubsub_binary.json");
+    CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
+    Map<String, Object> data = cloudEventDataJson(cloudEvent);
+
+    Map<?, ?> message = (Map<?, ?>) data.get("message");
+    assertThat(message).isNotNull();
+    assertThat(message).containsKey("data");
+    // Later we should provide support for doing this more simply and test that:
+    String base64 = (String) message.get("data");
+    byte[] bytes = Base64.getDecoder().decode(base64);
+    assertThat(bytes).isEqualTo(new byte[] {1, 2, 3, 4});
+
+    assertThat(message).doesNotContainKey("attributes");
+  }
+
   // Checks that a PubSub event correctly gets its payload wrapped in a "message" dictionary.
   @Test
   public void pubSubWrapping() throws IOException {
@@ -119,4 +234,11 @@ private Event legacyEventForResource(String resourceName) throws IOException {
       return BackgroundFunctionExecutor.parseLegacyEvent(new StringReader(legacyEventString));
     }
   }
+
+  private static Map<String, Object> cloudEventDataJson(CloudEvent cloudEvent) {
+    String data = new String(cloudEvent.getData(), UTF_8);
+    @SuppressWarnings("unchecked")
+    Map<String, Object> map = new Gson().fromJson(data, Map.class);
+    return map;
+  }
 }
diff --git a/invoker/core/src/test/resources/firestore_complex.json b/invoker/core/src/test/resources/firestore_complex.json
new file mode 100644
index 00000000..231e2a22
--- /dev/null
+++ b/invoker/core/src/test/resources/firestore_complex.json
@@ -0,0 +1,81 @@
+{
+  "data": {
+    "oldValue": {},
+    "updateMask": {},
+    "value": {
+      "createTime": "2020-04-23T14:25:05.349632Z",
+      "fields": {
+        "arrayValue": {
+          "arrayValue": {
+            "values": [
+              {
+                "integerValue": "1"
+              },
+              {
+                "integerValue": "2"
+              }
+            ]
+          }
+        },
+        "booleanValue": {
+          "booleanValue": true
+        },
+        "doubleValue": {
+          "doubleValue": 5.5
+        },
+        "geoPointValue": {
+          "geoPointValue": {
+            "latitude": 51.4543,
+            "longitude": -0.9781
+          }
+        },
+        "intValue": {
+          "integerValue": "50"
+        },
+        "mapValue": {
+          "mapValue": {
+            "fields": {
+              "field1": {
+                "stringValue": "x"
+              },
+              "field2": {
+                "arrayValue": {
+                  "values": [
+                    {
+                      "stringValue": "x"
+                    },
+                    {
+                      "integerValue": "1"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "nullValue": {
+          "nullValue": null
+        },
+        "referenceValue": {
+          "referenceValue": "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"
+        },
+        "stringValue": {
+          "stringValue": "text"
+        },
+        "timestampValue": {
+          "timestampValue": "2020-04-23T14:23:53.241Z"
+        }
+      },
+      "name": "projects/project-id/databases/(default)/documents/gcf-test/IH75dRdeYJKd4uuQiqch",
+      "updateTime": "2020-04-23T14:25:05.349632Z"
+    }
+  },
+  "eventId": "9babded5-e5f2-41af-a46a-06ba6bd84739-0",
+  "eventType": "providers/cloud.firestore/eventTypes/document.write",
+  "notSupported": {},
+  "params": {
+    "doc": "IH75dRdeYJKd4uuQiqch"
+  },
+  "resource": "projects/project-id/databases/(default)/documents/gcf-test/IH75dRdeYJKd4uuQiqch",
+  "timestamp": "2020-04-23T14:25:05.349632Z"
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/pubsub_binary.json b/invoker/core/src/test/resources/pubsub_binary.json
new file mode 100644
index 00000000..d7cbb125
--- /dev/null
+++ b/invoker/core/src/test/resources/pubsub_binary.json
@@ -0,0 +1,16 @@
+{
+   "context": {
+      "eventId":"1144231683168617",
+      "timestamp":"2020-05-06T07:33:34.556Z",
+      "eventType":"google.pubsub.topic.publish",
+      "resource":{
+        "service":"pubsub.googleapis.com",
+        "name":"projects/sample-project/topics/gcf-test",
+        "type":"type.googleapis.com/google.pubsub.v1.PubsubMessage"
+      }
+   },
+   "data": {
+      "@type": "type.googleapis.com/google.pubsub.v1.PubsubMessage",
+      "data": "AQIDBA=="
+   }
+}

From 974206e3edcb7936e343760003ef07d68871ee45 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <timmerman+devrel@google.com>
Date: Mon, 21 Sep 2020 10:09:56 -0500
Subject: [PATCH 050/308] docs: add license file (#65)

---
 LICENSE | 202 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

From cb4ebf697e1139696c06c5edf54c1f14104c7498 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <timmerman+devrel@google.com>
Date: Mon, 21 Sep 2020 16:36:37 -0500
Subject: [PATCH 051/308] ci: standardize FF CI (#63)

* ci: split unit and conformance ci

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* ci: disable java 12/13

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
---
 .github/workflows/ci.yaml   | 16 ----------------
 .github/workflows/unit.yaml | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 16 deletions(-)
 delete mode 100644 .github/workflows/ci.yaml
 create mode 100644 .github/workflows/unit.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
deleted file mode 100644
index d4fabff6..00000000
--- a/.github/workflows/ci.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Java CI
-on: [push, pull_request]
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.11
-      - name: Build with Maven
-        run: (cd functions-framework-api/ && mvn install)
-      - name: Test
-        run: (cd invoker/ && mvn test)
\ No newline at end of file
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
new file mode 100644
index 00000000..f93c38fb
--- /dev/null
+++ b/.github/workflows/unit.yaml
@@ -0,0 +1,22 @@
+name: Java Unit CI
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [
+          11.x
+          # 12.x,
+          # 13.x
+        ]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.java }}
+    - name: Build with Maven
+      run: (cd functions-framework-api/ && mvn install)
+    - name: Test
+      run: (cd invoker/ && mvn test)
\ No newline at end of file

From 270f4ec7936239eff9c00b8d3ff0f09a8615b9c9 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <timmerman+devrel@google.com>
Date: Thu, 24 Sep 2020 12:25:47 -0500
Subject: [PATCH 052/308] fix: remove warnings from mvn install (#66)

* fix: remove warnings from mvn install

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* docs: add javadoc description to context

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
---
 .../com/google/cloud/functions/Context.java   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java b/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
index f4e3df8a..36e857b5 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
@@ -19,16 +19,32 @@
 
 /** An interface for event function context. */
 public interface Context {
-  /** Returns event ID. */
+  /**
+   * Returns event ID.
+   * 
+   * @return event ID
+   */
   String eventId();
 
-  /** Returns event timestamp. */
+  /**
+   * Returns event timestamp.
+   * 
+   * @return event timestamp
+   */
   String timestamp();
 
-  /** Returns event type. */
+  /**
+   * Returns event type.
+   * 
+   * @return event type
+   */
   String eventType();
 
-  /** Returns event resource. */
+  /**
+   * Returns event resource.
+   * 
+   * @return event resource
+   */
   String resource();
 
   /**
@@ -42,6 +58,8 @@ public interface Context {
    * extension attributes</a>.
    *
    * <p>The map returned by this method may be empty but is never null.</p>
+   * 
+   * @return additional attributes form this event.
    */
   default Map<String, String> attributes() {
     return Collections.emptyMap();

From a8b3853e7120cba866e8ce9d459c79556ec3351a Mon Sep 17 00:00:00 2001
From: Grant Timmerman <timmerman+devrel@google.com>
Date: Thu, 24 Sep 2020 16:54:10 -0500
Subject: [PATCH 053/308] ci: add lint workflow (#67)

* ci: add lint workflow

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* ci: specify java version

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* ci: build before lint

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
---
 .github/workflows/lint.yaml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 .github/workflows/lint.yaml

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
new file mode 100644
index 00000000..cc31b736
--- /dev/null
+++ b/.github/workflows/lint.yaml
@@ -0,0 +1,23 @@
+name: Java Lint CI
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK
+      uses: actions/setup-java@v1
+      with:
+        java-version: 11.x
+    - name: Build API with Maven
+      run: (cd functions-framework-api/ && mvn install)
+    - name: Lint Functions Framework API
+      run: (cd functions-framework-api/ && mvn clean verify -DskipTests -P lint)
+    - name: Build Invoker with Maven
+      run: (cd functions-framework-api/ && mvn install)
+    - name: Lint Invoker
+      run: (cd invoker/ && mvn clean verify -DskipTests -P lint)
\ No newline at end of file

From 6dbedbef9a80b8f47b9f5955ddc276e1fe4f48d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 6 Oct 2020 16:06:38 -0700
Subject: [PATCH 054/308] Release 1.0.0 of Functions Framework (#69)

* [maven-release-plugin] prepare release java-function-invoker-parent-1.0.0

* [maven-release-plugin] prepare for next development iteration
---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 4 ++--
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index e7e6536f..43d29250 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta3-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.0-beta3-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.0-beta3-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 1a8c7769..54af43e2 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta3-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.5-SNAPSHOT</version>
+  <version>0.9.6-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.0-beta3-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index e17db0bd..aff1ab9d 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.0-beta3-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.2</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 1602fd9f..f86acb15 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.0-beta3-SNAPSHOT</version>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.0-beta3-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From f21d6e7c2a6fc61e566fae5bb361572519553e58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 08:20:08 -0700
Subject: [PATCH 055/308] Bump junit from 4.13 to 4.13.1 in
 /invoker/function-maven-plugin (#73)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 invoker/function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 54af43e2..c61e9287 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -63,7 +63,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

From 25a3f3f3a7842e1356bbc6a58fc9c5604b8e32e7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 08:25:43 -0700
Subject: [PATCH 056/308] Bump junit from 4.13 to 4.13.1 in /invoker/core (#72)

Bumps [junit](https://github.com/junit-team/junit4) from 4.13 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.13...r4.13.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 invoker/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 43d29250..a48f3cce 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -126,7 +126,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13</version>
+      <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 0921c6ca6e7d53e9f3195e87966bb6069d7a72af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 24 Nov 2020 09:16:42 -0800
Subject: [PATCH 057/308] Update to version 2.0.0-milestone4 of the CloudEvents
 SDK. (#75)

The principal changes are that the payload of an event is now `CloudEventData`
instead of `byte[]`, which can save on copying; and that there is now better
support for reading and writing HTTP events.

A workaround was needed for a bug that has since been fixed, in
https://github.com/cloudevents/sdk-java/pull/259.
---
 functions-framework-api/pom.xml               |  2 +-
 invoker/core/pom.xml                          | 10 +--
 .../invoker/BackgroundFunctionExecutor.java   | 35 +++++----
 ...CloudEventsServletBinaryMessageReader.java | 69 -----------------
 .../functions/invoker/GcfEventsTest.java      |  7 +-
 .../functions/invoker/IntegrationTest.java    | 75 +++----------------
 .../testfunctions/CloudEventSnoop.java        |  2 +-
 invoker/pom.xml                               |  2 +-
 8 files changed, 45 insertions(+), 157 deletions(-)
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 9fd85e7d..014bf895 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>2.0.0-milestone2</version>
+      <version>2.0.0-milestone4</version>
     </dependency>
   </dependencies>
 
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index a48f3cce..9028de32 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -51,18 +51,18 @@
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
-      <artifactId>cloudevents-api</artifactId>
-      <version>2.0.0-milestone2</version>
+      <artifactId>cloudevents-core</artifactId>
+      <version>2.0.0-milestone4</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
-      <artifactId>cloudevents-core</artifactId>
-      <version>2.0.0-milestone2</version>
+      <artifactId>cloudevents-http-basic</artifactId>
+      <version>2.0.0-milestone4</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>2.0.0-milestone2</version>
+      <version>2.0.0-milestone4</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 4d82a802..2725ce84 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -27,20 +27,20 @@
 import com.google.gson.TypeAdapter;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.message.MessageReader;
-import io.cloudevents.core.message.impl.GenericStructuredMessageReader;
-import io.cloudevents.core.message.impl.MessageUtils;
-import io.cloudevents.core.message.impl.UnknownEncodingMessageReader;
+import io.cloudevents.http.HttpMessageFactory;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.http.HttpServlet;
@@ -256,7 +256,9 @@ void serviceLegacyEvent(Event legacyEvent) throws Exception {
     @Override
     void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
       Context context = contextFromCloudEvent(cloudEvent);
-      String jsonData = cloudEvent.getData() == null ? "{}" : new String(cloudEvent.getData(), UTF_8);
+      String jsonData = (cloudEvent.getData() == null)
+          ? "{}"
+          : new String(cloudEvent.getData().toBytes(), UTF_8);
       function.accept(jsonData, context);
     }
   }
@@ -286,7 +288,7 @@ void serviceLegacyEvent(Event legacyEvent) throws Exception {
     @Override
     void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
       if (cloudEvent.getData() != null) {
-        String data = new String(cloudEvent.getData(), UTF_8);
+        String data = new String(cloudEvent.getData().toBytes(), UTF_8);
         T payload = new Gson().fromJson(data, type);
         Context context = contextFromCloudEvent(cloudEvent);
         function.accept(payload, context);
@@ -345,22 +347,27 @@ private enum CloudEventKind {BINARY, STRUCTURED}
   private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exception {
     @SuppressWarnings("unchecked")
     FunctionExecutor<CloudEventT> executor = (FunctionExecutor<CloudEventT>) functionExecutor;
-    Map<String, List<String>> headers = CloudEventsServletBinaryMessageReader.headerMap(req);
     byte[] body = req.getInputStream().readAllBytes();
-    List<String> listOfNull = Collections.singletonList(null);
-    MessageReader reader = MessageUtils.parseStructuredOrBinaryMessage(
-        () -> headers.getOrDefault("content-type", listOfNull).get(0),
-        format -> new GenericStructuredMessageReader(format, body),
-        () -> headers.getOrDefault("ce-specversion", listOfNull).get(0),
-        unusedSpecVersion -> CloudEventsServletBinaryMessageReader.from(req, body),
-        UnknownEncodingMessageReader::new);
+    MessageReader reader = HttpMessageFactory.createReaderFromMultimap(headerMap(req), body);
     // It's important not to set the context ClassLoader earlier, because MessageUtils will use
     // ServiceLoader.load(EventFormat.class) to find a handler to deserialize a binary CloudEvent
     // and if it finds something from the function ClassLoader then that something will implement
     // the EventFormat interface as defined by that ClassLoader rather than ours. Then ServiceLoader.load
     // will throw ServiceConfigurationError. At this point we're still running with the default
     // context ClassLoader, which is the system ClassLoader that has loaded the code here.
-    runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent()));
+    runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent(data -> data)));
+    // The data->data is a workaround for a bug fixed since Milestone 4 of the SDK, in
+    // https://github.com/cloudevents/sdk-java/pull/259.
+  }
+
+  private static Map<String, List<String>> headerMap(HttpServletRequest req) {
+    Map<String, List<String>> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    for (String header : Collections.list(req.getHeaderNames())) {
+      for (String value : Collections.list(req.getHeaders(header))) {
+        headerMap.computeIfAbsent(header, unused -> new ArrayList<>()).add(value);
+      }
+    }
+    return headerMap;
   }
 
   private void serviceLegacyEvent(HttpServletRequest req) throws Exception {
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
deleted file mode 100644
index f9eb0e4d..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEventsServletBinaryMessageReader.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.google.cloud.functions.invoker;
-
-import io.cloudevents.SpecVersion;
-import io.cloudevents.core.message.impl.BaseGenericBinaryMessageReaderImpl;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.function.BiConsumer;
-import javax.servlet.http.HttpServletRequest;
-
-class CloudEventsServletBinaryMessageReader extends BaseGenericBinaryMessageReaderImpl<String, String> {
-  private final Map<String, List<String>> headers;
-
-  private CloudEventsServletBinaryMessageReader(Map<String, List<String>> headers, byte[] body) {
-    super(SpecVersion.V1, body);
-    this.headers = headers;
-  }
-
-  static CloudEventsServletBinaryMessageReader from(HttpServletRequest request, byte[] body) {
-    Map<String, List<String>> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    for (String header : Collections.list(request.getHeaderNames())) {
-      for (String value : Collections.list(request.getHeaders(header))) {
-        headerMap.computeIfAbsent(header, unused -> new ArrayList<>()).add(value);
-      }
-    }
-    return new CloudEventsServletBinaryMessageReader(headerMap, body);
-  }
-
-  @Override
-  protected boolean isContentTypeHeader(String header) {
-    return header.equalsIgnoreCase("content-type");
-  }
-
-  @Override
-  protected boolean isCloudEventsHeader(String header) {
-    return header.toLowerCase(Locale.ENGLISH).startsWith("ce-");
-  }
-
-  @Override
-  protected String toCloudEventsKey(String header) {
-    if (!isCloudEventsHeader(header)) {
-      throw new IllegalArgumentException("Not a CloudEvents header: " + header);
-    }
-    return header.substring(3).toLowerCase(Locale.ENGLISH);
-  }
-
-  @Override
-  protected void forEachHeader(BiConsumer<String, String> consumer) {
-    headers.forEach((header, values) -> values.forEach(value -> consumer.accept(header, value)));
-  }
-
-  @Override
-  protected String toCloudEventsValue(String value) {
-    return value;
-  }
-
-  static Map<String, List<String>> headerMap(HttpServletRequest request) {
-    Map<String, List<String>> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    for (String header : Collections.list(request.getHeaderNames())) {
-      for (String value : Collections.list(request.getHeaders(header))) {
-        headerMap.computeIfAbsent(header, unused -> new ArrayList<>()).add(value);
-      }
-    }
-    return headerMap;
-  }
-}
\ No newline at end of file
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
index 5d4d7344..bf320c39 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -207,7 +207,7 @@ public void pubSubBinaryData() throws IOException {
   public void pubSubWrapping() throws IOException {
     Event legacyEvent = legacyEventForResource("legacy_pubsub.json");
     CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
-    assertThat(new String(cloudEvent.getData(), UTF_8))
+    assertThat(new String(cloudEvent.getData().toBytes(), UTF_8))
         .isEqualTo("{\"message\":{\"@type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\","
             + "\"attributes\":{\"attribute1\":\"value1\"},"
             + "\"data\":\"VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl\"}}");
@@ -221,7 +221,8 @@ public void pubSubWrapping() throws IOException {
   public void firestoreWildcards() throws IOException {
     Event legacyEvent = legacyEventForResource("firestore_simple.json");
     CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
-    JsonObject payload = new Gson().fromJson(new String(cloudEvent.getData(), UTF_8), JsonObject.class);
+    JsonObject payload =
+        new Gson().fromJson(new String(cloudEvent.getData().toBytes(), UTF_8), JsonObject.class);
     JsonObject wildcards = payload.getAsJsonObject("wildcards");
     assertThat(wildcards.keySet()).containsExactly("doc");
     assertThat(wildcards.getAsJsonPrimitive("doc").getAsString()).isEqualTo("2Vm2mI1d0wIaK2Waj5to");
@@ -236,7 +237,7 @@ private Event legacyEventForResource(String resourceName) throws IOException {
   }
 
   private static Map<String, Object> cloudEventDataJson(CloudEvent cloudEvent) {
-    String data = new String(cloudEvent.getData(), UTF_8);
+    String data = new String(cloudEvent.getData().toBytes(), UTF_8);
     @SuppressWarnings("unchecked")
     Map<String, Object> map = new Gson().fromJson(data, Map.class);
     return map;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index a668483d..9ab37f38 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -29,14 +29,11 @@
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import io.cloudevents.CloudEvent;
-import io.cloudevents.SpecVersion;
 import io.cloudevents.core.builder.CloudEventBuilder;
 import io.cloudevents.core.format.EventFormat;
-import io.cloudevents.core.message.MessageWriter;
-import io.cloudevents.core.message.impl.MessageUtils;
 import io.cloudevents.core.provider.EventFormatProvider;
+import io.cloudevents.http.HttpMessageFactory;
 import io.cloudevents.jackson.JsonFormat;
-import io.cloudevents.rw.CloudEventWriter;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -63,6 +60,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
 import org.eclipse.jetty.client.HttpClient;
 import org.eclipse.jetty.client.api.ContentProvider;
@@ -353,11 +351,13 @@ private void backgroundTest(String target) throws Exception {
 
     // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
     // payload is the body of the HTTP request.
-    BinaryWriter binaryWriter = new BinaryWriter();
-    Map<String, String> headers = binaryWriter.writeBinary(sampleCloudEvent(snoopFile));
+    Map<String, String> headers = new TreeMap<>();
+    AtomicReference<byte[]> bodyRef = new AtomicReference<>();
+    HttpMessageFactory.createWriter(headers::put, bodyRef::set)
+        .writeBinary(sampleCloudEvent(snoopFile));
     TestCase cloudEventsBinaryTestCase = TestCase.builder()
         .setSnoopFile(snoopFile)
-        .setRequestText(new String(binaryWriter.body, UTF_8))
+        .setRequestText(new String(bodyRef.get(), UTF_8))
         .setHttpContentType(headers.get("Content-Type"))
         .setHttpHeaders(ImmutableMap.copyOf(headers))
         .setExpectedJson(cloudEventExpectedJson)
@@ -388,11 +388,13 @@ public void nativeCloudEvent() throws Exception {
 
     // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
     // payload is the body of the HTTP request.
-    BinaryWriter binaryWriter = new BinaryWriter();
-    Map<String, String> headers = binaryWriter.writeBinary(cloudEvent);
+    Map<String, String> headers = new TreeMap<>();
+    AtomicReference<byte[]> bodyRef = new AtomicReference<>();
+    HttpMessageFactory.createWriter(headers::put, bodyRef::set)
+        .writeBinary(sampleCloudEvent(snoopFile));
     TestCase cloudEventsBinaryTestCase = TestCase.builder()
         .setSnoopFile(snoopFile)
-        .setRequestText(new String(binaryWriter.body, UTF_8))
+        .setRequestText(new String(bodyRef.get(), UTF_8))
         .setHttpContentType(headers.get("Content-Type"))
         .setHttpHeaders(ImmutableMap.copyOf(headers))
         .setExpectedJson(cloudEventJsonObject)
@@ -688,57 +690,4 @@ private void monitorOutput(
       throw new UncheckedIOException(e);
     }
   }
-
-  // I might be missing something, but as far as I can tell the V2 SDK forces us to go through all this
-  // rigmarole just so we can tell what HTTP headers should be set for a Binary CloudEvent. With the
-  // V1 SDK it was much simpler.
-  // https://github.com/cloudevents/sdk-java/issues/212
-  private static class BinaryWriter
-      implements MessageWriter<CloudEventWriter<Map<String, String>>, Map<String, String>> {
-
-    private static final Map<String, String> ATTRIBUTES_TO_HEADERS =
-        MessageUtils.generateAttributesToHeadersMapping(v ->
-            v.equals("datacontenttype") ? "Content-Type" : ("ce-" + v));
-
-    final Map<String, String> headers = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    byte[] body;
-
-    @Override
-    public CloudEventWriter<Map<String, String>> create(SpecVersion version) {
-      headers.put("ce-specversion", version.toString());
-      return new EventWriter();
-    }
-
-    @Override
-    public Map<String, String> setEvent(EventFormat format, byte[] bytes) {
-      throw new UnsupportedOperationException("Only binary events supported, not structured");
-    }
-
-    private class EventWriter implements CloudEventWriter<Map<String, String>> {
-      @Override
-      public Map<String, String> end(byte[] bytes) {
-        body = bytes;
-        return headers;
-      }
-
-      @Override
-      public Map<String, String> end() {
-        return end(new byte[0]);
-      }
-
-      @Override
-      public void setAttribute(String name, String value) {
-        if (ATTRIBUTES_TO_HEADERS.containsKey(name)) {
-          headers.put(ATTRIBUTES_TO_HEADERS.get(name), value);
-        } else {
-          throw new IllegalArgumentException("Unknown attribute: " + name);
-        }
-      }
-
-      @Override
-      public void setExtension(String name, String value) {
-        headers.put("ce-" + name, value);
-      }
-    }
-  }
 }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
index e1dda80c..87835bd2 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
@@ -14,7 +14,7 @@
 public class CloudEventSnoop implements ExperimentalCloudEventsFunction {
   @Override
   public void accept(CloudEvent event) throws Exception {
-    String payloadJson = new String(event.getData(), UTF_8);
+    String payloadJson = new String(event.getData().toBytes(), UTF_8);
     Gson gson = new Gson();
     JsonObject jsonObject = gson.fromJson(payloadJson, JsonObject.class);
     String targetFile = jsonObject.get("targetFile").getAsString();
diff --git a/invoker/pom.xml b/invoker/pom.xml
index aff1ab9d..ab5f9b59 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.2</version>
+        <version>1.0.3-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From 264b07281c749efdfdded23e682a7b6f81a22a72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 30 Nov 2020 16:41:13 -0800
Subject: [PATCH 058/308] [maven-release-plugin] prepare release
 functions-framework-api-1.0.3

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 014bf895..aa2207f7 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.3</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>HEAD</tag>
+    <tag>functions-framework-api-1.0.3</tag>
   </scm>
 
   <dependencies>

From eaa3a2fe38c903fb1992814c4c7e4488f18b994a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 30 Nov 2020 16:41:20 -0800
Subject: [PATCH 059/308] [maven-release-plugin] prepare for next development
 iteration

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index aa2207f7..e0d1f18f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,7 +45,7 @@
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
     <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
-    <tag>functions-framework-api-1.0.3</tag>
+    <tag>HEAD</tag>
   </scm>
 
   <dependencies>

From d6decf175aee536cce4d3d0eab0d9cc8e7f7619e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 30 Nov 2020 18:13:42 -0800
Subject: [PATCH 060/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.1

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 4 ++--
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 9028de32..0706a340 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index c61e9287..395e8646 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.6-SNAPSHOT</version>
+  <version>0.9.6</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.1-SNAPSHOT</version>
+      <version>1.0.1</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index ab5f9b59..5fa6b12e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.3-SNAPSHOT</version>
+        <version>1.0.3</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index f86acb15..7778d06b 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.0.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 0bf9faf6db86da664c563656b5e412f86c65a646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 30 Nov 2020 18:13:49 -0800
Subject: [PATCH 061/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0706a340..73f17440 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -113,7 +113,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 395e8646..05eaf1be 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.6</version>
+  <version>0.9.7-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 5fa6b12e..cd5b8805 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 7778d06b..c57cf0f5 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.1</version>
+    <version>1.0.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 14b4dc3e47ad9384d43770e63ff56aec7a79bd43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Tue, 26 Jan 2021 16:41:14 -0800
Subject: [PATCH 062/308] Update the version of the CloudEvents SDK to
 2.0.0RC2. (#79)

Since the API is hopefully stable now, rename `ExperimentalCloudEventsFunction`
to `CloudEventsFunction`.

Add support for a `FUNCTION_SIGNATURE_TYPE` of `cloudevent`. Treat it the same
as `background`. (We don't really need `FUNCTION_SIGNATURE_TYPE`, since the
interface implemented by the function class tells us what the signature is.)

Simplify the integration test slightly by removing some intermediary helper
methods.
---
 .gitignore                                    |  1 +
 functions-framework-api/pom.xml               |  2 +-
 ...Function.java => CloudEventsFunction.java} |  5 +--
 invoker/core/pom.xml                          |  6 +--
 .../invoker/BackgroundFunctionExecutor.java   | 14 +++----
 .../functions/invoker/runner/Invoker.java     | 30 ++++++++-------
 .../functions/invoker/IntegrationTest.java    | 37 ++++++++-----------
 .../testfunctions/CloudEventSnoop.java        |  4 +-
 invoker/pom.xml                               |  2 +-
 9 files changed, 48 insertions(+), 53 deletions(-)
 rename functions-framework-api/src/main/java/com/google/cloud/functions/{ExperimentalCloudEventsFunction.java => CloudEventsFunction.java} (66%)

diff --git a/.gitignore b/.gitignore
index ca0f542f..561f21f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@ properties
 
 # IDE
 .vscode/
+/invoker/target/
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index e0d1f18f..2e11eaf7 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>2.0.0-milestone4</version>
+      <version>2.0.0.RC2</version>
     </dependency>
   </dependencies>
 
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java
similarity index 66%
rename from functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java
rename to functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java
index 516a0456..05a092a7 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/ExperimentalCloudEventsFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java
@@ -4,12 +4,9 @@
 
 /**
  * Represents a Cloud Function that is activated by an event and parsed into a {@link CloudEvent} object.
- * Because the {@link CloudEvent} API is not yet stable, a function implemented using this class may not
- * build or work correctly with later versions of that API. Once the API is stable, this interface will
- * become {@code CloudEventsFunction} and will also be stable.
  */
 @FunctionalInterface
-public interface ExperimentalCloudEventsFunction {
+public interface CloudEventsFunction {
   /**
    * Called to service an incoming event. This interface is implemented by user code to
    * provide the action for a given background function. If this method throws any exception
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 73f17440..57bbddff 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -52,17 +52,17 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
-      <version>2.0.0-milestone4</version>
+      <version>2.0.0.RC2</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-http-basic</artifactId>
-      <version>2.0.0-milestone4</version>
+      <version>2.0.0.RC2</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>2.0.0-milestone4</version>
+      <version>2.0.0.RC2</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 2725ce84..b5ac1c6a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -20,7 +20,6 @@
 
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.Context;
-import com.google.cloud.functions.ExperimentalCloudEventsFunction;
 import com.google.cloud.functions.RawBackgroundFunction;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -46,6 +45,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import com.google.cloud.functions.CloudEventsFunction;
 
 /** Executes the user's background function. */
 public final class BackgroundFunctionExecutor extends HttpServlet {
@@ -60,7 +60,7 @@ private BackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
   private enum FunctionKind {
     BACKGROUND(BackgroundFunction.class),
     RAW_BACKGROUND(RawBackgroundFunction.class),
-    CLOUD_EVENTS(ExperimentalCloudEventsFunction.class);
+    CLOUD_EVENTS(CloudEventsFunction.class);
 
     static final List<FunctionKind> VALUES = Arrays.asList(values());
 
@@ -79,7 +79,7 @@ static Optional<FunctionKind> forClass(Class<?> functionClass) {
   /**
    * Optionally makes a {@link BackgroundFunctionExecutor} for the given class, if it implements one
    * of {@link BackgroundFunction}, {@link RawBackgroundFunction}, or
-   * {@link ExperimentalCloudEventsFunction}. Otherwise returns {@link Optional#empty()}.
+   * {@link CloudEventsFunction}. Otherwise returns {@link Optional#empty()}.
    *
    * @param functionClass the class of a possible background function implementation.
    * @throws RuntimeException if the given class does implement one of the required interfaces, but we are
@@ -98,7 +98,7 @@ public static Optional<BackgroundFunctionExecutor> maybeForClass(Class<?> functi
    *
    * @throws RuntimeException if either the class does not implement one of
    *    {@link BackgroundFunction}, {@link RawBackgroundFunction}, or
-   *    {@link ExperimentalCloudEventsFunction}; or we are unable to construct an instance using its no-arg
+   *    {@link CloudEventsFunction}; or we are unable to construct an instance using its no-arg
    *     constructor.
    */
   public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
@@ -143,7 +143,7 @@ private static BackgroundFunctionExecutor forClass(Class<?> functionClass, Funct
         executor = new TypedFunctionExecutor<>(maybeTargetType.get(), backgroundFunction);
         break;
       case CLOUD_EVENTS:
-        executor = new CloudEventFunctionExecutor((ExperimentalCloudEventsFunction) instance);
+        executor = new CloudEventFunctionExecutor((CloudEventsFunction) instance);
         break;
       default: // can't happen, we've listed all the FunctionKind values already.
         throw new AssertionError(functionKind);
@@ -299,9 +299,9 @@ void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
   }
 
   private static class CloudEventFunctionExecutor extends FunctionExecutor<Void> {
-    private final ExperimentalCloudEventsFunction function;
+    private final CloudEventsFunction function;
 
-    CloudEventFunctionExecutor(ExperimentalCloudEventsFunction function) {
+    CloudEventFunctionExecutor(CloudEventsFunction function) {
       super(function.getClass());
       this.function = function;
     }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 588d6aec..c87b376b 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -19,10 +19,7 @@
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
-import com.google.cloud.functions.BackgroundFunction;
-import com.google.cloud.functions.ExperimentalCloudEventsFunction;
 import com.google.cloud.functions.HttpFunction;
-import com.google.cloud.functions.RawBackgroundFunction;
 import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
 import com.google.cloud.functions.invoker.HttpFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
@@ -247,17 +244,24 @@ public void startServer() throws Exception {
     Class<?> functionClass = loadFunctionClass();
 
     HttpServlet servlet;
-    if ("http".equals(functionSignatureType)) {
-        servlet = HttpFunctionExecutor.forClass(functionClass);
-    } else if ("event".equals(functionSignatureType)) {
-        servlet = BackgroundFunctionExecutor.forClass(functionClass);
-    } else if (functionSignatureType == null) {
-        servlet = servletForDeducedSignatureType(functionClass);
+    if (functionSignatureType == null) {
+      servlet = servletForDeducedSignatureType(functionClass);
     } else {
-      String error = String.format(
-          "Function signature type %s is unknown; should be \"http\" or \"event\"",
-          functionSignatureType);
-      throw new RuntimeException(error);
+      switch (functionSignatureType) {
+        case "http":
+          servlet = HttpFunctionExecutor.forClass(functionClass);
+          break;
+        case "event":
+        case "cloudevent":
+          servlet = BackgroundFunctionExecutor.forClass(functionClass);
+          break;
+        default:
+          String error = String.format(
+              "Function signature type %s is unknown; should be \"http\", \"event\","
+                  + " or \"cloudevent\"",
+              functionSignatureType);
+          throw new RuntimeException(error);
+      }
     }
     ServletHolder servletHolder = new ServletHolder(servlet);
     servletHolder.getRegistration().setMultipartConfig(new MultipartConfigElement(""));
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 9ab37f38..8efe1abf 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -364,6 +364,7 @@ private void backgroundTest(String target) throws Exception {
         .build();
 
     backgroundTest(
+        SignatureType.BACKGROUND,
         fullTarget(target),
         ImmutableList.of(gcfTestCase, cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
   }
@@ -401,6 +402,7 @@ public void nativeCloudEvent() throws Exception {
         .build();
 
     backgroundTest(
+        SignatureType.CLOUD_EVENT,
         fullTarget("CloudEventSnoop"),
         ImmutableList.of(cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
   }
@@ -472,7 +474,9 @@ public void classpathOptionHttp() throws Exception {
         .setUrl("/?class=" + INTERNAL_CLASS.getName())
         .setExpectedResponseText("OK")
         .build();
-    testHttpFunction("com.example.functionjar.Foreground",
+    testFunction(
+        SignatureType.HTTP,
+        "com.example.functionjar.Foreground",
         ImmutableList.of("--classpath", functionJarString()),
         ImmutableList.of(testCase));
   }
@@ -487,7 +491,9 @@ public void classpathOptionBackground() throws Exception {
     JsonObject json = gson.fromJson(originalJson, JsonObject.class);
     JsonObject jsonData = json.getAsJsonObject("data");
     jsonData.addProperty("class", INTERNAL_CLASS.getName());
-    testBackgroundFunction("com.example.functionjar.Background",
+    testFunction(
+        SignatureType.BACKGROUND,
+        "com.example.functionjar.Background",
         ImmutableList.of("--classpath", functionJarString()),
         ImmutableList.of(TestCase.builder().setRequestText(json.toString()).build()));
   }
@@ -497,11 +503,13 @@ public void classpathOptionBackground() throws Exception {
   // event. We start with a fixed body and insert into its JSON an extra property that tells the
   // function where to write what it received. We have to do this since background functions, by
   // design, don't return a value.
-  private void backgroundTest(String functionTarget, List<TestCase> testCases) throws Exception {
+  private void backgroundTest(
+      SignatureType signatureType, String functionTarget, List<TestCase> testCases)
+      throws Exception {
     for (TestCase testCase : testCases) {
       File snoopFile = testCase.snoopFile().get();
       snoopFile.delete();
-      testBackgroundFunction(functionTarget, ImmutableList.of(testCase));
+      testFunction(signatureType, functionTarget, ImmutableList.of(), ImmutableList.of(testCase));
       String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
       Gson gson = new Gson();
       JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
@@ -522,23 +530,7 @@ private void checkSnoopFile(TestCase testCase) throws IOException {
   }
 
   private void testHttpFunction(String target, List<TestCase> testCases) throws Exception {
-    testHttpFunction(target, ImmutableList.of(), testCases);
-  }
-
-  private void testHttpFunction(
-      String target, ImmutableList<String> extraArgs, List<TestCase> testCases) throws Exception {
-    testFunction(SignatureType.HTTP, target, extraArgs, testCases);
-  }
-
-  private void testBackgroundFunction(String target, List<TestCase> testCases)
-      throws Exception {
-    testBackgroundFunction(target, ImmutableList.of(), testCases);
-  }
-
-  private void testBackgroundFunction(
-      String target, ImmutableList<String> extraArgs, List<TestCase> testCases)
-      throws Exception {
-    testFunction(SignatureType.BACKGROUND, target, extraArgs, testCases);
+    testFunction(SignatureType.HTTP, target, ImmutableList.of(), testCases);
   }
 
   private void testFunction(
@@ -584,7 +576,8 @@ private void testFunction(
 
   private enum SignatureType {
     HTTP("http"),
-    BACKGROUND("event");
+    BACKGROUND("event"),
+    CLOUD_EVENT("cloudevent");
 
     private final String name;
 
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
index 87835bd2..e812773b 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
@@ -2,7 +2,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.cloud.functions.ExperimentalCloudEventsFunction;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import io.cloudevents.CloudEvent;
@@ -10,8 +9,9 @@
 import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.jackson.JsonFormat;
 import java.io.FileOutputStream;
+import com.google.cloud.functions.CloudEventsFunction;
 
-public class CloudEventSnoop implements ExperimentalCloudEventsFunction {
+public class CloudEventSnoop implements CloudEventsFunction {
   @Override
   public void accept(CloudEvent event) throws Exception {
     String payloadJson = new String(event.getData().toBytes(), UTF_8);
diff --git a/invoker/pom.xml b/invoker/pom.xml
index cd5b8805..5f223f62 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.3</version>
+        <version>1.0.4-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From cff2077b30998421529353bd37c976f92605479e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Wed, 3 Feb 2021 13:39:24 -0800
Subject: [PATCH 063/308] Define a property for the CloudEvents SDK version to
 avoid mentioning it three times. (#80)

* Update the version of the CloudEvents SDK to 2.0.0RC2.

Since the API is hopefully stable now, rename `ExperimentalCloudEventsFunction`
to `CloudEventsFunction`.

Add support for a `FUNCTION_SIGNATURE_TYPE` of `cloudevent`. Treat it the same
as `background`. (We don't really need `FUNCTION_SIGNATURE_TYPE`, since the
interface implemented by the function class tells us what the signature is.)

Simplify the integration test slightly by removing some intermediary helper
methods.

* Define a property for the CloudEvents SDK version to avoid mentioning it three times.

Also fix the import order in a couple of source files.

* Define a property for the CloudEvents SDK version to avoid mentioning it three times.

Also fix the import order in a couple of source files.
---
 invoker/core/pom.xml                                       | 7 ++++---
 .../functions/invoker/BackgroundFunctionExecutor.java      | 2 +-
 .../functions/invoker/testfunctions/CloudEventSnoop.java   | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 57bbddff..86962988 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -22,6 +22,7 @@
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
+    <cloudevents.sdk.version>2.0.0.RC2</cloudevents.sdk.version>
   </properties>
 
   <licenses>
@@ -52,17 +53,17 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
-      <version>2.0.0.RC2</version>
+      <version>${cloudevents.sdk.version}</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-http-basic</artifactId>
-      <version>2.0.0.RC2</version>
+      <version>${cloudevents.sdk.version}</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>2.0.0.RC2</version>
+      <version>${cloudevents.sdk.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index b5ac1c6a..3aad340b 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -19,6 +19,7 @@
 import static java.util.stream.Collectors.toMap;
 
 import com.google.cloud.functions.BackgroundFunction;
+import com.google.cloud.functions.CloudEventsFunction;
 import com.google.cloud.functions.Context;
 import com.google.cloud.functions.RawBackgroundFunction;
 import com.google.gson.Gson;
@@ -45,7 +46,6 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.google.cloud.functions.CloudEventsFunction;
 
 /** Executes the user's background function. */
 public final class BackgroundFunctionExecutor extends HttpServlet {
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
index e812773b..cd23de0d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
@@ -2,6 +2,7 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
+import com.google.cloud.functions.CloudEventsFunction;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import io.cloudevents.CloudEvent;
@@ -9,7 +10,6 @@
 import io.cloudevents.core.provider.EventFormatProvider;
 import io.cloudevents.jackson.JsonFormat;
 import java.io.FileOutputStream;
-import com.google.cloud.functions.CloudEventsFunction;
 
 public class CloudEventSnoop implements CloudEventsFunction {
   @Override

From fb7fcbe1d2afc7e9134d92226cae3854a9b9ee86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 11 Feb 2021 10:14:58 -0800
Subject: [PATCH 064/308] Update functions-framework-api dependency to 1.0.4.
 (#81)

* [maven-release-plugin] prepare release functions-framework-api-1.0.4

* [maven-release-plugin] prepare for next development iteration

* Update functions-framework-api dependency to 1.0.4.
---
 functions-framework-api/pom.xml | 2 +-
 invoker/pom.xml                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 2e11eaf7..27246b71 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.0.5-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 5f223f62..20741057 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.4-SNAPSHOT</version>
+        <version>1.0.4</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From ee5bf32703fd9eb7fd43ef356f94cc6e6faf9490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 11 Feb 2021 10:38:16 -0800
Subject: [PATCH 065/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.2

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 86962988..10629145 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 05eaf1be..fe71ed5f 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.7-SNAPSHOT</version>
+  <version>0.9.7</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.2-SNAPSHOT</version>
+      <version>1.0.2</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 20741057..0f9d0cc2 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index c57cf0f5..7aa93e24 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.2-SNAPSHOT</version>
+    <version>1.0.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.2-SNAPSHOT</version>
+  <version>1.0.2</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 85d3adaa6334478231944ec6ddf2b02c61ec3a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 11 Feb 2021 10:41:54 -0800
Subject: [PATCH 066/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 10629145..29d2def4 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index fe71ed5f..0314da97 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.7</version>
+  <version>0.9.8-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.2</version>
+      <version>1.0.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 0f9d0cc2..c9e55660 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 7aa93e24..1b42c15c 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.2</version>
+  <version>1.0.3-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From e8293e5de983f10ba6c14faa4c6053e2a019fff0 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <matthewrobertson03@gmail.com>
Date: Wed, 17 Mar 2021 19:01:17 -0700
Subject: [PATCH 067/308] Ignore all mvn target directories (#83)

---
 .gitignore | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 561f21f6..a92f649f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,9 @@
 *.tar.gz
 *.rar
 
+# Maven
+target/
+
 # Gradle
 .gradle
 .idea/
@@ -44,4 +47,3 @@ properties
 
 # IDE
 .vscode/
-/invoker/target/

From e53e3b242dff2f9f49e79806411bee7e079ebf41 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <mattrobertson@google.com>
Date: Fri, 19 Mar 2021 13:53:33 -0700
Subject: [PATCH 068/308] Add conformance tests (#84)

* Add conformance tests

* add github action

* Address code review comments

Typos, target version, try with resources, java time

* Use GoogleCloudPlatform/functions-framework-conformance/action@v0.3.8
---
 .github/workflows/conformance.yaml            | 52 +++++++++++++
 .gitignore                                    |  5 ++
 invoker/conformance/pom.xml                   | 49 ++++++++++++
 .../CloudEventsConformanceFunction.java       | 77 +++++++++++++++++++
 .../conformance/HttpConformanceFunction.java  | 51 ++++++++++++
 invoker/pom.xml                               |  1 +
 6 files changed, 235 insertions(+)
 create mode 100644 .github/workflows/conformance.yaml
 create mode 100644 invoker/conformance/pom.xml
 create mode 100644 invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
 create mode 100644 invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
new file mode 100644
index 00000000..96edb9b7
--- /dev/null
+++ b/.github/workflows/conformance.yaml
@@ -0,0 +1,52 @@
+name: Java Conformance CI
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [
+          11.x
+          # 12.x,
+          # 13.x
+        ]
+    steps:
+    - uses: actions/checkout@v2
+    
+    - name: Set up JDK ${{ matrix.java }}
+      uses: actions/setup-java@v1
+      with:
+        java-version: ${{ matrix.java }}
+    
+    - name: Setup Go
+      uses: actions/setup-go@v2
+      with:
+        go-version: '1.15'
+    
+    - name: Build API with Maven
+      run: (cd functions-framework-api/ && mvn install)
+
+    - name: Build invoker with Maven
+      run: (cd invoker/ && mvn install)
+    
+    - name: Run HTTP conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.8
+      with:
+        functionType: 'http'
+        useBuildpacks: false
+        validateMapping: false
+        cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
+        startDelay: 10
+
+    - name: Run cloudevent conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.8
+      with:
+        functionType: 'cloudevent'
+        useBuildpacks: false
+        validateMapping: false
+        cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
+        startDelay: 10
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index a92f649f..cb8a3b7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,8 @@ properties
 
 # IDE
 .vscode/
+
+# Conformance testing
+function_output.json
+serverlog_stderr.txt
+serverlog_stdout.txt
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
new file mode 100644
index 00000000..9958bce0
--- /dev/null
+++ b/invoker/conformance/pom.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>java-function-invoker-parent</artifactId>
+    <groupId>com.google.cloud.functions.invoker</groupId>
+    <version>1.0.3-SNAPSHOT</version>
+  </parent>
+
+  <groupId>com.google.cloud.functions.invoker</groupId>
+  <artifactId>conformance</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>GCF Confromance Tests</name>
+  <description>
+    A GCF project used to validate conformance to the Functions Framework contract
+    using the Functions Framework Conformance tools.
+  </description>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-conformance</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud.functions</groupId>
+      <artifactId>functions-framework-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.6</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>com.google.cloud.functions</groupId>
+          <artifactId>function-maven-plugin</artifactId>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
new file mode 100644
index 00000000..da810047
--- /dev/null
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
@@ -0,0 +1,77 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.conformance;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import com.google.cloud.functions.CloudEventsFunction;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+import io.cloudevents.CloudEvent;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.time.format.DateTimeFormatter;
+
+/**
+ * This class is used by the Functions Framework Conformance Tools to validate
+ * the framework's Cloud Events API. It can be run with the following command:
+ *
+ * <pre>{@code
+ * $ functions-framework-conformance-client \
+ *   -cmd="mvn function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction" \
+ *   -type=cloudevent \
+ *   -buildpacks=false \
+ *   -validate-mapping=false \
+ *   -start-delay=5
+ * }</pre>
+ */
+public class CloudEventsConformanceFunction implements CloudEventsFunction {
+
+  private static final Gson gson = new GsonBuilder()
+      .serializeNulls()
+      .setPrettyPrinting()
+      .create();
+
+  @Override
+  public void accept(CloudEvent event) throws Exception {
+    try (BufferedWriter writer = new BufferedWriter(new FileWriter("function_output.json"))) {
+      writer.write(serialize(event));
+    }
+  }
+
+  /**
+   * Create a structured JSON representation of a cloud event
+   */
+  private String serialize(CloudEvent event) {
+    JsonObject jsonEvent = new JsonObject();
+
+    jsonEvent.addProperty("id", event.getId());
+    jsonEvent.addProperty("source", event.getSource().toString());
+    jsonEvent.addProperty("type", event.getType());
+    jsonEvent.addProperty("datacontenttype", event.getDataContentType());
+    jsonEvent.addProperty("subject", event.getSubject());
+    jsonEvent.addProperty("specversion", event.getSpecVersion().toString());
+
+    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
+    jsonEvent.addProperty("time", event.getTime().format(formatter));
+
+    String payloadJson = new String(event.getData().toBytes(), UTF_8);
+    JsonObject jsonObject = new Gson().fromJson(payloadJson, JsonObject.class);
+    jsonEvent.add("data", jsonObject);
+
+    return gson.toJson(jsonEvent);
+  }
+}
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java
new file mode 100644
index 00000000..0bdd843b
--- /dev/null
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java
@@ -0,0 +1,51 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.conformance;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.io.IOException;
+
+/**
+ * This class is used by the Functions Framework Conformance Tools to validate
+ * the framework's HTTP API. It can be run with the following command:
+ *
+ * <pre>{@code
+ * $ functions-framework-conformance-client \
+ *   -cmd="mvn function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction" \
+ *   -type=http \
+ *   -buildpacks=false \
+ *   -validate-mapping=false \
+ *   -start-delay=5
+ * }</pre>
+ */
+public class HttpConformanceFunction implements HttpFunction {
+
+  @Override
+  public void service(HttpRequest request, HttpResponse response)
+      throws IOException {
+    try (BufferedReader reader = request.getReader();
+        BufferedWriter writer = new BufferedWriter(new FileWriter("function_output.json"))) {
+      int c;
+      while ((c = reader.read()) != -1) {
+        writer.write(c);
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/invoker/pom.xml b/invoker/pom.xml
index c9e55660..7f179f46 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -28,6 +28,7 @@
     <module>core</module>
     <module>testfunction</module>
     <module>function-maven-plugin</module>
+    <module>conformance</module>
   </modules>
 
   <properties>

From 73ee908f837288e2458d6268426fa80b7703e745 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <mattrobertson@google.com>
Date: Wed, 24 Mar 2021 16:38:56 -0700
Subject: [PATCH 069/308] Bug fixes for cloud event conversion (#85)

This commit fixes a few bugs in the code that converts legacy events to
cloud events:
- preserve nulls when serializing JSON
- firebaseauth and firebasedatabase event types
- firebaseauth subject is derived form user ID in event data
- fix code to extract firebasedatabase subject from resourceName
---
 .github/workflows/conformance.yaml            |  1 -
 invoker/conformance/pom.xml                   |  1 +
 .../cloud/functions/invoker/GcfEvents.java    | 77 ++++++++++++++-----
 .../functions/invoker/GcfEventsTest.java      |  9 ++-
 4 files changed, 64 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 96edb9b7..cd9452cc 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -47,6 +47,5 @@ jobs:
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
-        validateMapping: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
         startDelay: 10
\ No newline at end of file
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 9958bce0..932718e5 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -42,6 +42,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
+          <version>0.9.8-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
index b4cea041..582f58e0 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
@@ -21,6 +21,7 @@
 import com.google.cloud.functions.invoker.CloudFunctionsContext.Nullable;
 import com.google.cloud.functions.invoker.CloudFunctionsContext.Resource;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.builder.CloudEventBuilder;
@@ -39,6 +40,8 @@
  */
 class GcfEvents {
   private static final String FIREBASE_SERVICE = "firebase.googleapis.com";
+  private static final String FIREBASE_AUTH_SERVICE = "firebaseauth.googleapis.com";
+  private static final String FIREBASE_DB_SERVICE = "firebasedatabase.googleapis.com";
   private static final String FIRESTORE_SERVICE = "firestore.googleapis.com";
   private static final String PUB_SUB_SERVICE = "pubsub.googleapis.com";
   private static final String STORAGE_SERVICE = "storage.googleapis.com";
@@ -71,25 +74,25 @@ class GcfEvents {
               FIRESTORE_SERVICE)),
 
       entry("providers/firebase.auth/eventTypes/user.create",
-          new FirestoreFirebaseEventAdapter("google.firebase.auth.user.v1.created", FIREBASE_SERVICE)),
+          new FirebaseAuthEventAdapter("google.firebase.auth.user.v1.created")),
       entry("providers/firebase.auth/eventTypes/user.delete",
-          new FirestoreFirebaseEventAdapter("google.firebase.auth.user.v1.deleted", FIREBASE_SERVICE)),
+          new FirebaseAuthEventAdapter("google.firebase.auth.user.v1.deleted")),
 
       entry("providers/google.firebase.analytics/eventTypes/event.log",
           new FirestoreFirebaseEventAdapter("google.firebase.analytics.log.v1.written", FIREBASE_SERVICE)),
 
       entry("providers/google.firebase.database/eventTypes/ref.create",
           new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.created",
-              FIREBASE_SERVICE)),
+              FIREBASE_DB_SERVICE)),
       entry("providers/google.firebase.database/eventTypes/ref.write",
           new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.written",
-              FIREBASE_SERVICE)),
+              FIREBASE_DB_SERVICE)),
       entry("providers/google.firebase.database/eventTypes/ref.update",
           new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.updated",
-              FIREBASE_SERVICE)),
+              FIREBASE_DB_SERVICE)),
       entry("providers/google.firebase.database/eventTypes/ref.delete",
           new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.deleted",
-              FIREBASE_SERVICE)),
+              FIREBASE_DB_SERVICE)),
 
       entry("providers/cloud.pubsub/eventTypes/topic.publish",
           new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
@@ -98,7 +101,7 @@ class GcfEvents {
           new StorageEventAdapter("google.cloud.storage.object.v1.changed"))
   );
 
-  private static final Gson GSON = new Gson();
+  private static final Gson GSON = new GsonBuilder().serializeNulls().create();
 
   static CloudEvent convertToCloudEvent(Event legacyEvent) {
     String eventType = legacyEvent.getContext().eventType();
@@ -135,7 +138,7 @@ final CloudEvent convertToCloudEvent(Event legacyEvent) {
       Resource resource = Resource.from(legacyEvent.getContext().resource());
       String service = Optional.ofNullable(resource.service()).orElse(defaultService);
       String resourceName = resource.name();
-      SourceAndSubject sourceAndSubject = convertResourceToSourceAndSubject(resourceName);
+      SourceAndSubject sourceAndSubject = convertResourceToSourceAndSubject(resourceName, legacyEvent);
       URI source = URI.create("//" + service + "/" + sourceAndSubject.source());
       OffsetDateTime timestamp =
           Optional.ofNullable(legacyEvent.getContext().timestamp())
@@ -156,7 +159,7 @@ String maybeReshapeData(Event legacyEvent, String jsonData) {
       return jsonData;
     }
 
-    SourceAndSubject convertResourceToSourceAndSubject(String resourceName) {
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName, Event legacyEvent) {
       return SourceAndSubject.of(resourceName, null);
     }
   }
@@ -184,32 +187,34 @@ private static class StorageEventAdapter extends EventAdapter {
     }
 
     @Override
-    SourceAndSubject convertResourceToSourceAndSubject(String resourceName) {
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName, Event legacyEvent) {
       Matcher matcher = STORAGE_RESOURCE_PATTERN.matcher(resourceName);
       if (matcher.matches()) {
         String resource = matcher.group(1);
         String subject = matcher.group(2);
         return SourceAndSubject.of(resource, subject);
       }
-      return super.convertResourceToSourceAndSubject(resourceName);
+      return super.convertResourceToSourceAndSubject(resourceName, legacyEvent);
     }
   }
 
   private static class FirestoreFirebaseEventAdapter extends EventAdapter {
+    private static final Pattern FIRESTORE_RESOURCE_PATTERN =
+        Pattern.compile("^(projects/.+)/((documents|refs)/.+)$");
+
     FirestoreFirebaseEventAdapter(String cloudEventType, String defaultService) {
       super(cloudEventType, defaultService);
     }
 
     @Override
-    SourceAndSubject convertResourceToSourceAndSubject(String resourceName) {
-      List<String> resourceSegments = Arrays.asList(resourceName.split("/"));
-      int documentsIndex = resourceSegments.indexOf("documents");
-      if (documentsIndex < 0) {
-        return super.convertResourceToSourceAndSubject(resourceName);
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName, Event legacyEvent) {
+      Matcher matcher = FIRESTORE_RESOURCE_PATTERN.matcher(resourceName);
+      if (matcher.matches()) {
+        String resource = matcher.group(1);
+        String subject = matcher.group(2);
+        return SourceAndSubject.of(resource, subject);
       }
-      String sourcePath = String.join("/", resourceSegments.subList(0, documentsIndex));
-      String subject = String.join("/", resourceSegments.subList(documentsIndex, resourceSegments.size()));
-      return SourceAndSubject.of(sourcePath, subject);
+      return super.convertResourceToSourceAndSubject(resourceName, legacyEvent);
     }
 
     @Override
@@ -226,4 +231,38 @@ String maybeReshapeData(Event legacyEvent, String jsonData) {
       return GSON.toJson(jsonObject);
     }
   }
+
+  private static class FirebaseAuthEventAdapter extends EventAdapter {
+    FirebaseAuthEventAdapter(String cloudEventType) {
+      super(cloudEventType, FIREBASE_AUTH_SERVICE);
+    }
+
+    @Override
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName, Event legacyEvent) {
+      String subject = null;
+      JsonObject data = legacyEvent.getData().getAsJsonObject();
+      if (data.has("uid")) {
+        subject = "users/" + data.get("uid").getAsString();
+      }
+      return SourceAndSubject.of(resourceName, subject);
+    }
+
+    @Override
+    String maybeReshapeData(Event legacyEvent, String jsonData) {
+      JsonObject jsonObject = GSON.fromJson(jsonData, JsonObject.class);
+      if (!jsonObject.has("metadata")) {
+        return jsonData;
+      }
+      JsonObject metadata = jsonObject.getAsJsonObject("metadata");
+      if (metadata.has("createdAt")) {
+        metadata.add("createTime", metadata.get("createdAt"));
+        metadata.remove("createdAt");
+      }
+      if (metadata.has("lastSignedInAt")) {
+        metadata.add("lastSignInTime", metadata.get("lastSignedInAt"));
+        metadata.remove("lastSignedInAt");
+      }
+      return GSON.toJson(jsonObject);
+    }
+  }
 }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
index bf320c39..f4861b1c 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -29,6 +29,7 @@
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.Base64;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.junit.Ignore;
@@ -51,11 +52,11 @@ public class GcfEventsTest {
     {"legacy_pubsub.json", "google.cloud.pubsub.topic.v1.messagePublished",
       "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
     {"firebase-db1.json", "google.firebase.database.document.v1.written",
-      "//firebase.googleapis.com/projects/_/instances/my-project-id/refs/gcf-test/xyz", null},
+      "//firebasedatabase.googleapis.com/projects/_/instances/my-project-id", "refs/gcf-test/xyz"},
     {"firebase-auth1.json", "google.firebase.auth.user.v1.created",
-      "//firebase.googleapis.com/projects/my-project-id", null},
+      "//firebaseauth.googleapis.com/projects/my-project-id", "users/UUpby3s4spZre6kHsgVSPetzQ8l2"},
     {"firebase-auth2.json", "google.firebase.auth.user.v1.deleted",
-      "//firebase.googleapis.com/projects/my-project-id", null},
+      "//firebaseauth.googleapis.com/projects/my-project-id", "users/UUpby3s4spZre6kHsgVSPetzQ8l2"},
   };
 
   @Test
@@ -152,7 +153,7 @@ public void firestoreComplexData() throws IOException {
         "geoPointValue", Map.of("geoPointValue", Map.of("latitude", 51.4543, "longitude", -0.9781)),
         "intValue", Map.of("integerValue", "50"),
         "doubleValue", Map.of("doubleValue", 5.5),
-        "nullValue", Map.of(),
+        "nullValue", Collections.singletonMap("nullValue", null),
         "referenceValue", Map.of("referenceValue",
             "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"),
         "stringValue", Map.of("stringValue", "text"),

From e7dea60fd829e5ce08ee8066fcc4f96b03f7dcf0 Mon Sep 17 00:00:00 2001
From: Michael Traver <mtraver@users.noreply.github.com>
Date: Tue, 6 Apr 2021 13:37:36 -0700
Subject: [PATCH 070/308] Upgrade conformance test version to v0.3.9 (#87)

---
 .github/workflows/conformance.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index cd9452cc..63621adb 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -16,25 +16,25 @@ jobs:
         ]
     steps:
     - uses: actions/checkout@v2
-    
+
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@v1
       with:
         java-version: ${{ matrix.java }}
-    
+
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
         go-version: '1.15'
-    
+
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
 
     - name: Build invoker with Maven
       run: (cd invoker/ && mvn install)
-    
+
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.8
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.9
       with:
         functionType: 'http'
         useBuildpacks: false
@@ -43,9 +43,9 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.8
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.9
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
-        startDelay: 10
\ No newline at end of file
+        startDelay: 10

From f70a30794a9541e608cfbfe9b97a5a716a22369a Mon Sep 17 00:00:00 2001
From: Tobi <tobias.klasse@sesamecare.com>
Date: Thu, 10 Jun 2021 09:38:26 +0200
Subject: [PATCH 071/308] Fix-Gradle-Example-Parameters (#93)

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 74010b53..1f6264f2 100644
--- a/README.md
+++ b/README.md
@@ -215,8 +215,8 @@ tasks.register("runFunction", JavaExec) {
     classpath(configurations.invoker)
     inputs.files(configurations.runtimeClasspath, sourceSets.main.output)
     args(
-            '--target', project.findProperty('runFunction.target'),
-            '--port', project.findProperty('runFunction.port') ?: 8080
+            '--target', project.findProperty('run.functionTarget'),
+            '--port', project.findProperty('run.port') ?: 8080
     )
     doFirst {
         args('--classpath', files(configurations.runtimeClasspath, sourceSets.main.output).asPath)
@@ -227,15 +227,15 @@ tasks.register("runFunction", JavaExec) {
 Then in your terminal or IDE, you will be able to run the function locally with:
 
 ```sh
-gradle runFunction -PrunFunction.target=com.example.HelloWorld \
-                   -PrunFunction.port=8080
+gradle runFunction -Prun.functionTarget=com.example.HelloWorld \
+                   -Prun.port=8080
 ```
 
 Or if you use the Gradle wrapper provided by your Gradle project build:
 
 ```sh
-./gradlew runFunction -PrunFunction.target=com.example.HelloWorld \
-                      -PrunFunction.port=8080
+./gradlew runFunction -Prun.functionTarget=com.example.HelloWorld \
+                      -Prun.port=8080
 ```
 
 ## Functions Framework configuration

From e96a3d9fa8ffeb3db63588a733c93300db8741a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <eamonn@mcmanus.net>
Date: Thu, 10 Jun 2021 00:43:07 -0700
Subject: [PATCH 072/308] Update version numbers in README.md. (#92)

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 1f6264f2..43dbac5b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ that supports Maven to create the Maven project. Add this dependency in the
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.0.1</version>
+      <version>1.0.4</version>
       <scope>provided</scope>
     </dependency>
 ```
@@ -42,7 +42,7 @@ Framework dependency in your `build.gradle` project file as follows:
 
 ```groovy
     dependencies {
-        implementation 'com.google.cloud.functions:functions-framework-api:1.0.1'
+        implementation 'com.google.cloud.functions:functions-framework-api:1.0.4'
     }
 
 ```
@@ -150,7 +150,7 @@ You can configure the plugin in `pom.xml`:
 <plugin>
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
-  <version>0.9.2</version>
+  <version>0.9.7</version>
   <configuration>
     <functionTarget>com.example.function.Echo</functionTarget>
   </configuration>
@@ -168,7 +168,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function-maven-plugin:0.9.2:run \
+  mvn com.google.cloud.functions:function-maven-plugin:0.9.7:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 
@@ -179,7 +179,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc5' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.2' \
     -DoutputDirectory=.
 ```
 
@@ -187,7 +187,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.0.0-alpha-2-rc5.jar \
+java -jar java-function-invoker-1.0.2 \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -206,8 +206,8 @@ configurations {
 }
 
 dependencies {
-    implementation 'com.google.cloud.functions:functions-framework-api:1.0.1'
-    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc5'
+    implementation 'com.google.cloud.functions:functions-framework-api:1.0.4'
+    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.2'
 }
 
 tasks.register("runFunction", JavaExec) {
@@ -280,7 +280,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.0.0-alpha-2-rc5.jar \
+java -jar java-function-invoker-1.0.2 \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From 382bd1078bdcac1ed4f2ee8397d32910584a54d7 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <mattrobertson@google.com>
Date: Tue, 29 Jun 2021 00:07:32 -0700
Subject: [PATCH 073/308] Add conformance tests for background events (#97)

Previously we had been running conformance tests for background
function signature types. This enables these tests in the conformance
github action.

Running the tests uncovered one bug in which JSON fiels with null values
were being dropped from the data param passed to RawBackgroundFunctions.
Fixing this is a non-breaking change so I bumped the minor verison of
the maven package.
---
 .github/workflows/conformance.yaml            | 15 ++++-
 .../BackgroundEventConformanceFunction.java   | 59 +++++++++++++++++++
 .../invoker/BackgroundFunctionExecutor.java   |  3 +-
 3 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 63621adb..01a1f997 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -34,18 +34,27 @@ jobs:
       run: (cd invoker/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.9
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
       with:
         functionType: 'http'
         useBuildpacks: false
-        validateMapping: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
         startDelay: 10
 
+    - name: Run background event conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
+      with:
+        functionType: 'legacyevent'
+        useBuildpacks: false
+        validateMapping: false
+        cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.BackgroundEventConformanceFunction'"
+        startDelay: 10
+
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.9
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
+        validateMapping: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
         startDelay: 10
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
new file mode 100644
index 00000000..8672e6d8
--- /dev/null
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
@@ -0,0 +1,59 @@
+package com.google.cloud.functions.conformance;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.cloud.functions.Context;
+import com.google.cloud.functions.RawBackgroundFunction;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+
+/**
+ * This class is used by the Functions Framework Conformance Tools to validate
+ * the framework's Background Event API. It can be run with the following
+ * command:
+ *
+ * <pre>
+ * {@code
+ * $ functions-framework-conformance-client \
+ *   -cmd="mvn function:run -Drun.functionTarget=com.google.cloud.functions.conformance.BackgroundEventConformanceFunction" \
+ *   -type=legacyevent \
+ *   -buildpacks=false \
+ *   -validate-mapping=false \
+ *   -start-delay=10
+ * }
+ * </pre>
+ */
+public class BackgroundEventConformanceFunction implements RawBackgroundFunction {
+
+  private static final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
+
+  @Override
+  public void accept(String data, Context context) throws Exception {
+    try (BufferedWriter writer = new BufferedWriter(new FileWriter("function_output.json"))) {
+      writer.write(serialize(data, context));
+    }
+  }
+
+  /**
+   * Create a structured JSON representation of the request context and data
+   */
+  private String serialize(String data, Context context) {
+    JsonObject contextJson = new JsonObject();
+    contextJson.addProperty("eventId", context.eventId());
+    contextJson.addProperty("timestamp", context.timestamp());
+    contextJson.addProperty("eventType", context.eventType());
+    
+    JsonElement resource = gson.fromJson(context.resource(), JsonElement.class);
+    contextJson.add("resource", resource);
+
+    JsonObject dataJson = gson.fromJson(data, JsonObject.class);
+
+    JsonObject json = new JsonObject();
+    json.add("data", dataJson);
+    json.add("context", contextJson);
+    return gson.toJson(json);
+  }
+
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 3aad340b..2238e5d3 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -241,6 +241,7 @@ final ClassLoader functionClassLoader() {
   }
 
   private static class RawFunctionExecutor extends FunctionExecutor<Map<?, ?>> {
+    private static Gson gson = new GsonBuilder().serializeNulls().create();
     private final RawBackgroundFunction function;
 
     RawFunctionExecutor(RawBackgroundFunction function) {
@@ -250,7 +251,7 @@ private static class RawFunctionExecutor extends FunctionExecutor<Map<?, ?>> {
 
     @Override
     void serviceLegacyEvent(Event legacyEvent) throws Exception {
-      function.accept(new Gson().toJson(legacyEvent.getData()), legacyEvent.getContext());
+      function.accept(gson.toJson(legacyEvent.getData()), legacyEvent.getContext());
     }
 
     @Override

From 7b6246b8a9137ffeeda4f0450d7edec257c7f035 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <mattrobertson@google.com>
Date: Fri, 2 Jul 2021 15:05:28 -0700
Subject: [PATCH 074/308] Update CloudEvent upcasting logic (#99)

---
 .github/workflows/conformance.yaml            |  2 +-
 .../invoker/CloudFunctionsContext.java        |  4 ++
 .../cloud/functions/invoker/GcfEvents.java    | 52 ++++++++++++++++---
 .../functions/invoker/GcfEventsTest.java      | 10 +++-
 .../core/src/test/resources/firebase-db1.json |  1 +
 .../core/src/test/resources/firebase-db2.json | 21 ++++++++
 6 files changed, 79 insertions(+), 11 deletions(-)
 create mode 100644 invoker/core/src/test/resources/firebase-db2.json

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 01a1f997..7d41292b 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -55,6 +55,6 @@ jobs:
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
-        validateMapping: false
+        validateMapping: true
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
         startDelay: 10
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index c9fc06d9..081928ad 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -50,6 +50,9 @@ abstract class CloudFunctionsContext implements Context {
   // TODO: expose this in the Context interface (as a default method).
   abstract Map<String, String> params();
 
+  @Nullable
+  abstract String domain();
+
   @Override
   public abstract Map<String, String> attributes();
 
@@ -71,6 +74,7 @@ abstract static class Builder {
     abstract Builder setResource(String x);
     abstract Builder setParams(Map<String, String> x);
     abstract Builder setAttributes(Map<String, String> value);
+    abstract Builder setDomain(String x);
 
     abstract CloudFunctionsContext build();
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
index 582f58e0..fc7713bc 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
@@ -82,17 +82,13 @@ class GcfEvents {
           new FirestoreFirebaseEventAdapter("google.firebase.analytics.log.v1.written", FIREBASE_SERVICE)),
 
       entry("providers/google.firebase.database/eventTypes/ref.create",
-          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.created",
-              FIREBASE_DB_SERVICE)),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.created")),
       entry("providers/google.firebase.database/eventTypes/ref.write",
-          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.written",
-              FIREBASE_DB_SERVICE)),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.written")),
       entry("providers/google.firebase.database/eventTypes/ref.update",
-          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.updated",
-              FIREBASE_DB_SERVICE)),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.updated")),
       entry("providers/google.firebase.database/eventTypes/ref.delete",
-          new FirestoreFirebaseEventAdapter("google.firebase.database.document.v1.deleted",
-              FIREBASE_DB_SERVICE)),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.deleted")),
 
       entry("providers/cloud.pubsub/eventTypes/topic.publish",
           new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
@@ -172,6 +168,8 @@ private static class PubSubEventAdapter extends EventAdapter {
     @Override
     String maybeReshapeData(Event legacyEvent, String jsonData) {
       JsonObject jsonObject = GSON.fromJson(jsonData, JsonObject.class);
+      jsonObject.addProperty("messageId", legacyEvent.getContext().eventId());
+      jsonObject.addProperty("publishTime", legacyEvent.getContext().timestamp());
       JsonObject wrapped = new JsonObject();
       wrapped.add("message", jsonObject);
       return GSON.toJson(wrapped);
@@ -232,6 +230,44 @@ String maybeReshapeData(Event legacyEvent, String jsonData) {
     }
   }
 
+  private static class FirebaseDatabaseEventAdapter extends EventAdapter {
+    private static final Pattern FIREBASE_DB_RESOURCE_PATTERN =
+        Pattern.compile("^projects/_/(instances/[^/]+)/((documents|refs)/.+)$");
+
+    FirebaseDatabaseEventAdapter(String cloudEventType) {
+      super(cloudEventType, FIREBASE_DB_SERVICE);
+    }
+
+    @Override
+    SourceAndSubject convertResourceToSourceAndSubject(String resourceName, Event legacyEvent) {
+      Matcher matcher = FIREBASE_DB_RESOURCE_PATTERN.matcher(resourceName);
+      String location = parseLocation(legacyEvent);
+      if (matcher.matches() && location != null) {
+        String resource = String.format("projects/_/locations/%s/%s", location, matcher.group(1));
+        String subject = matcher.group(2);
+        return SourceAndSubject.of(resource, subject);
+      }
+      return super.convertResourceToSourceAndSubject(resourceName, legacyEvent);
+    }
+
+    private String parseLocation(Event legacyEvent) {
+      String domain = legacyEvent.getContext().domain();
+      if (domain == null) {
+        return null;
+      }
+      // The default location for firebaseio.com is us-central1
+      if ("firebaseio.com".equals(domain)) {
+        return "us-central1";
+      }
+      // Otherwise the location can be inferred from the first subdomain
+      String[] subdomains = domain.split("\\.");
+      if (subdomains.length > 1) {
+        return subdomains[0];
+      }
+      return null;
+    }
+  }
+
   private static class FirebaseAuthEventAdapter extends EventAdapter {
     FirebaseAuthEventAdapter(String cloudEventType) {
       super(cloudEventType, FIREBASE_AUTH_SERVICE);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
index f4861b1c..f4e43e06 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -52,7 +52,11 @@ public class GcfEventsTest {
     {"legacy_pubsub.json", "google.cloud.pubsub.topic.v1.messagePublished",
       "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
     {"firebase-db1.json", "google.firebase.database.document.v1.written",
-      "//firebasedatabase.googleapis.com/projects/_/instances/my-project-id", "refs/gcf-test/xyz"},
+      "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
+      "refs/gcf-test/xyz"},
+    {"firebase-db2.json", "google.firebase.database.document.v1.written",
+      "//firebasedatabase.googleapis.com/projects/_/locations/europe-west1/instances/my-project-id",
+      "refs/gcf-test/xyz"},
     {"firebase-auth1.json", "google.firebase.auth.user.v1.created",
       "//firebaseauth.googleapis.com/projects/my-project-id", "users/UUpby3s4spZre6kHsgVSPetzQ8l2"},
     {"firebase-auth2.json", "google.firebase.auth.user.v1.deleted",
@@ -211,7 +215,9 @@ public void pubSubWrapping() throws IOException {
     assertThat(new String(cloudEvent.getData().toBytes(), UTF_8))
         .isEqualTo("{\"message\":{\"@type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\","
             + "\"attributes\":{\"attribute1\":\"value1\"},"
-            + "\"data\":\"VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl\"}}");
+            + "\"data\":\"VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl\","
+            + "\"messageId\":\"1215011316659232\","
+            + "\"publishTime\":\"2020-05-18T12:13:19.209Z\"}}");
   }
 
   // Checks that a Firestore event correctly gets an extra "wildcards" property in its CloudEvent data
diff --git a/invoker/core/src/test/resources/firebase-db1.json b/invoker/core/src/test/resources/firebase-db1.json
index b7321a06..d6d6a015 100644
--- a/invoker/core/src/test/resources/firebase-db1.json
+++ b/invoker/core/src/test/resources/firebase-db1.json
@@ -6,6 +6,7 @@
   "auth": {
     "admin": true
   },
+  "domain": "firebaseio.com",
   "data": {
     "data": null,
     "delta": {
diff --git a/invoker/core/src/test/resources/firebase-db2.json b/invoker/core/src/test/resources/firebase-db2.json
new file mode 100644
index 00000000..371ea00e
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-db2.json
@@ -0,0 +1,21 @@
+{
+  "eventType": "providers/google.firebase.database/eventTypes/ref.write",
+  "params": {
+    "child": "xyz"
+  },
+  "auth": {
+    "admin": true
+  },
+  "domain":"europe-west1.firebasedatabase.app",
+  "data": {
+    "data": {
+      "grandchild": "other"
+    },
+    "delta": {
+      "grandchild": "other changed"
+    }
+  },
+  "resource": "projects/_/instances/my-project-id/refs/gcf-test/xyz",
+  "timestamp": "2020-09-29T11:32:00.000Z",
+  "eventId": "aaaaaa-1111-bbbb-2222-cccccccccccc"
+}
\ No newline at end of file

From 85612eed6b7b5f24dd1699fcbd8c499711d2b0e8 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <mattrobertson@google.com>
Date: Tue, 6 Jul 2021 19:05:46 -0700
Subject: [PATCH 075/308] fix local development with the Pub/Sub emulator (#98)

* unblock local development with the pubsub emulator

Currently, the functions frameworks are dependent on some private
dataplane event marshalling logic in order to correctly pass PubSub
events to background functions. This commit implements the same
marshalling logic in the FF in order to enable local development using
the PubSub emulator.

We have already made this change in other languages:
https://github.com/GoogleCloudPlatform/functions-framework-nodejs/pull/272
https://github.com/GoogleCloudPlatform/functions-framework-ruby/pull/100
https://github.com/GoogleCloudPlatform/functions-framework-python/pull/121
https://github.com/GoogleCloudPlatform/functions-framework-go/pull/70

* fix code style issues
---
 .../google/cloud/functions/invoker/Event.java | 38 +++++++++++++
 .../BackgroundFunctionExecutorTest.java       | 54 +++++++++++++++++--
 .../src/test/resources/pubsub_background.json | 19 +++++++
 .../src/test/resources/pubsub_emulator.json   | 10 ++++
 4 files changed, 117 insertions(+), 4 deletions(-)
 create mode 100644 invoker/core/src/test/resources/pubsub_background.json
 create mode 100644 invoker/core/src/test/resources/pubsub_emulator.json

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
index 6f52f20b..ed12efe2 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
@@ -21,6 +21,8 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
 
 /**
  * Represents an event that should be handled by a background function. This is an internal format
@@ -53,6 +55,34 @@ public Event deserialize(
         context =
             jsonDeserializationContext.deserialize(
                 adjustContextResource(contextCopy), CloudFunctionsContext.class);
+      } else if (isPubSubEmulatorPayload(root)) {
+        JsonObject message = root.getAsJsonObject("message");
+
+        String timestampString =
+            message.has("publishTime")
+                ? message.get("publishTime").getAsString()
+                : DateTimeFormatter.ISO_INSTANT.format(OffsetDateTime.now());
+
+        context =
+            CloudFunctionsContext.builder()
+                .setEventType("google.pubsub.topic.publish")
+                .setTimestamp(timestampString)
+                .setEventId(message.get("messageId").getAsString())
+                .setResource(
+                    "{"
+                        + "\"name\":null,"
+                        + "\"service\":\"pubsub.googleapis.com\","
+                        + "\"type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\""
+                        + "}")
+                .build();
+
+        JsonObject marshalledData = new JsonObject();
+        marshalledData.addProperty("@type", "type.googleapis.com/google.pubsub.v1.PubsubMessage");
+        marshalledData.add("data", message.get("data"));
+        if (message.has("attributes")) {
+          marshalledData.add("attributes", message.get("attributes"));
+        }
+        data = marshalledData;
       } else {
         JsonObject rootCopy = root.deepCopy();
         rootCopy.remove("data");
@@ -63,6 +93,14 @@ public Event deserialize(
       return Event.of(data, context);
     }
 
+    private boolean isPubSubEmulatorPayload(JsonObject root) {
+      if (root.has("subscription") && root.has("message") && root.get("message").isJsonObject()) {
+        JsonObject message = root.getAsJsonObject("message");
+        return message.has("data") && message.has("messageId");
+      }
+      return false;
+    }
+
     /**
      * Replaces 'resource' member from context JSON with its string equivalent. The original
      * 'resource' member can be a JSON object itself while {@link CloudFunctionsContext} requires it
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
index 02c5d630..d00b0b4f 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
@@ -1,10 +1,15 @@
 package com.google.cloud.functions.invoker;
 
 import static com.google.cloud.functions.invoker.BackgroundFunctionExecutor.backgroundFunctionTypeArgument;
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
 
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.Context;
+import com.google.gson.JsonObject;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
 import java.util.Map;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,7 +25,8 @@ private static class PubSubMessage {
   }
 
   private static class PubSubFunction implements BackgroundFunction<PubSubMessage> {
-    @Override public void accept(PubSubMessage payload, Context context) {}
+    @Override
+    public void accept(PubSubMessage payload, Context context) {}
   }
 
   @Test
@@ -31,7 +37,8 @@ public void backgroundFunctionTypeArgument_simple() {
   private abstract static class Parent implements BackgroundFunction<PubSubMessage> {}
 
   private static class Child extends Parent {
-    @Override public void accept(PubSubMessage payload, Context context) {}
+    @Override
+    public void accept(PubSubMessage payload, Context context) {}
   }
 
   @Test
@@ -42,7 +49,8 @@ public void backgroundFunctionTypeArgument_superclass() {
   private interface GenericParent<T> extends BackgroundFunction<T> {}
 
   private static class GenericChild implements GenericParent<PubSubMessage> {
-    @Override public void accept(PubSubMessage payload, Context context) {}
+    @Override
+    public void accept(PubSubMessage payload, Context context) {}
   }
 
   @Test
@@ -52,7 +60,8 @@ public void backgroundFunctionTypeArgument_genericInterface() {
 
   @SuppressWarnings("rawtypes")
   private static class ForgotTypeParameter implements BackgroundFunction {
-    @Override public void accept(Object payload, Context context) {}
+    @Override
+    public void accept(Object payload, Context context) {}
   }
 
   @Test
@@ -62,4 +71,41 @@ public void backgroundFunctionTypeArgument_raw() {
         (Class<? extends BackgroundFunction<?>>) (Class<?>) ForgotTypeParameter.class;
     assertThat(backgroundFunctionTypeArgument(c)).isEmpty();
   }
+
+  @Test
+  public void parseLegacyEventPubSub() throws IOException {
+    try (Reader reader =
+        new InputStreamReader(getClass().getResourceAsStream("/pubsub_background.json"))) {
+      Event event = BackgroundFunctionExecutor.parseLegacyEvent(reader);
+
+      Context context = event.getContext();
+      assertThat(context.eventType()).isEqualTo("google.pubsub.topic.publish");
+      assertThat(context.eventId()).isEqualTo("1");
+      assertThat(context.timestamp()).isEqualTo("2021-06-28T05:46:32.390Z");
+
+      JsonObject data = event.getData().getAsJsonObject();
+      assertThat(data.get("data").getAsString()).isEqualTo("eyJmb28iOiJiYXIifQ==");
+      String attr = data.get("attributes").getAsJsonObject().get("test").getAsString();
+      assertThat(attr).isEqualTo("123");
+    }
+  }
+
+  @Test
+  public void parseLegacyEventPubSubEmulator() throws IOException {
+    try (Reader reader =
+        new InputStreamReader(getClass().getResourceAsStream("/pubsub_emulator.json"))) {
+      Event event = BackgroundFunctionExecutor.parseLegacyEvent(reader);
+
+      Context context = event.getContext();
+      assertThat(context.eventType()).isEqualTo("google.pubsub.topic.publish");
+      assertThat(context.eventId()).isEqualTo("1");
+      assertThat(context.timestamp()).isNotNull();
+      ;
+
+      JsonObject data = event.getData().getAsJsonObject();
+      assertThat(data.get("data").getAsString()).isEqualTo("eyJmb28iOiJiYXIifQ==");
+      String attr = data.get("attributes").getAsJsonObject().get("test").getAsString();
+      assertThat(attr).isEqualTo("123");
+    }
+  }
 }
diff --git a/invoker/core/src/test/resources/pubsub_background.json b/invoker/core/src/test/resources/pubsub_background.json
new file mode 100644
index 00000000..5f9927cb
--- /dev/null
+++ b/invoker/core/src/test/resources/pubsub_background.json
@@ -0,0 +1,19 @@
+{
+  "data": {
+    "@type": "type.googleapis.com/google.pubsub.v1.PubsubMessage",
+    "data": "eyJmb28iOiJiYXIifQ==",
+    "attributes": {
+      "test": "123"
+    }
+  },
+  "context": {
+    "eventId": "1",
+    "eventType": "google.pubsub.topic.publish",
+    "resource": {
+      "name": "projects/FOO/topics/BAR_TOPIC",
+      "service": "pubsub.googleapis.com",
+      "type": "type.googleapis.com/google.pubsub.v1.PubsubMessage"
+    },
+    "timestamp": "2021-06-28T05:46:32.390Z"
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/pubsub_emulator.json b/invoker/core/src/test/resources/pubsub_emulator.json
new file mode 100644
index 00000000..cdfe340a
--- /dev/null
+++ b/invoker/core/src/test/resources/pubsub_emulator.json
@@ -0,0 +1,10 @@
+{
+  "subscription": "projects/FOO/subscriptions/BAR_SUB",
+  "message": {
+    "data": "eyJmb28iOiJiYXIifQ==",
+    "messageId": "1",
+    "attributes": {
+      "test": "123"
+    }
+  }
+}
\ No newline at end of file

From 9a576debc60777356c4287debd72cbcba7cbaea8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Aug 2021 15:53:25 -0700
Subject: [PATCH 076/308] Bump guava from 28.1-jre to 29.0-jre in
 /invoker/testfunction (#86)

Bumps [guava](https://github.com/google/guava) from 28.1-jre to 29.0-jre.
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 invoker/testfunction/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 1b42c15c..3fada351 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -30,7 +30,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>28.1-jre</version>
+      <version>29.0-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>

From 72852d0f23cdaed48569245440dcd1533c8c7563 Mon Sep 17 00:00:00 2001
From: Matthew Robertson <mattrobertson@google.com>
Date: Tue, 14 Sep 2021 10:29:46 -0700
Subject: [PATCH 077/308] fix: update conformance tests (#108)

Update the conformance tests action to 1.0.0 and fix
firebasedb event conversion bug.
---
 .github/workflows/conformance.yaml                        | 6 +++---
 .../com/google/cloud/functions/invoker/GcfEvents.java     | 8 ++++----
 .../com/google/cloud/functions/invoker/GcfEventsTest.java | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 7d41292b..02686a9d 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -34,7 +34,7 @@ jobs:
       run: (cd invoker/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
       with:
         functionType: 'http'
         useBuildpacks: false
@@ -42,7 +42,7 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
       with:
         functionType: 'legacyevent'
         useBuildpacks: false
@@ -51,7 +51,7 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v0.3.12
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
index fc7713bc..83eca6ce 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
@@ -82,13 +82,13 @@ class GcfEvents {
           new FirestoreFirebaseEventAdapter("google.firebase.analytics.log.v1.written", FIREBASE_SERVICE)),
 
       entry("providers/google.firebase.database/eventTypes/ref.create",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.created")),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.created")),
       entry("providers/google.firebase.database/eventTypes/ref.write",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.written")),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.written")),
       entry("providers/google.firebase.database/eventTypes/ref.update",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.updated")),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.updated")),
       entry("providers/google.firebase.database/eventTypes/ref.delete",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.document.v1.deleted")),
+          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.deleted")),
 
       entry("providers/cloud.pubsub/eventTypes/topic.publish",
           new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
index f4e43e06..21e7016c 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -51,10 +51,10 @@ public class GcfEventsTest {
       "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
     {"legacy_pubsub.json", "google.cloud.pubsub.topic.v1.messagePublished",
       "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
-    {"firebase-db1.json", "google.firebase.database.document.v1.written",
+    {"firebase-db1.json", "google.firebase.database.ref.v1.written",
       "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
       "refs/gcf-test/xyz"},
-    {"firebase-db2.json", "google.firebase.database.document.v1.written",
+    {"firebase-db2.json", "google.firebase.database.ref.v1.written",
       "//firebasedatabase.googleapis.com/projects/_/locations/europe-west1/instances/my-project-id",
       "refs/gcf-test/xyz"},
     {"firebase-auth1.json", "google.firebase.auth.user.v1.created",

From 05755f98b49ae2c4a428db4782484e092ae3987d Mon Sep 17 00:00:00 2001
From: Steren <steren@google.com>
Date: Tue, 14 Sep 2021 10:57:54 -0700
Subject: [PATCH 078/308] docs: Cloud Run on GKE -> Cloud Run for Anthos (#106)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 43dbac5b..ad2ae922 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ different environments, including:
 
 *   [Google Cloud Functions](https://cloud.google.com/functions/)
 *   Your local development machine
-*   [Cloud Run and Cloud Run on GKE](https://cloud.google.com/run/)
+*   [Cloud Run](https://cloud.google.com/run/) and [Cloud Run for Anthos](https://cloud.google.com/anthos/run/)
 *   [Knative](https://github.com/knative/)-based environments
 
 ## Installation

From b3399424972e1d3534b0bd1e43cce04fbcc4afa8 Mon Sep 17 00:00:00 2001
From: Tianzi Cai <anguillanneuf@gmail.com>
Date: Tue, 14 Sep 2021 14:29:57 -0400
Subject: [PATCH 079/308] docs: update pubsub example (#107)

---
 README.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ad2ae922..628655c6 100644
--- a/README.md
+++ b/README.md
@@ -112,26 +112,26 @@ contents:
 ```java
 package com.example;
 
-import com.example.PubSubBackground.PubSubMessage;
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.Context;
 import java.util.Map;
 import java.util.logging.Logger;
 
+// This is the Pub/Sub message format from the Pub/Sub emulator. 
+class PubSubMessage {
+  String data;
+  Map<String, String> attributes;
+  String messageId;
+  String publishTime;
+}
+
 public class PubSubBackground implements BackgroundFunction<PubSubMessage> {
   private static final Logger logger =
       Logger.getLogger(PubSubBackground.class.getName());
 
   @Override
   public void accept(PubSubMessage pubSubMessage, Context context) {
-    logger.info("Received message with id " + pubSubMessage.messageId);
-  }
-
-  public static class PubSubMessage {
-    public String data;
-    public Map<String, String> attributes;
-    public String messageId;
-    public String publishTime;
+    logger.info("Received message with id " + context.eventId());
   }
 }
 ```

From 4a87830b2e46e5305fea884e4d2a11509f465972 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <744973+grant@users.noreply.github.com>
Date: Tue, 21 Sep 2021 16:18:08 -0700
Subject: [PATCH 080/308] docs: add badges for Maven Central and CI (#112)

Adds detailed badges/links to main packages and CI.

[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg?label=functions-framework-api)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions.invoker/java-function-invoker.svg?label=java-function-invoker)](https://search.maven.org/artifact/com.google.cloud.functions.invoker/java-function-invoker)

[![Java Unit CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml)
[![Java Lint CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml)
[![Java Conformance CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/conformance.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/conformance.yaml)
---
 README.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 628655c6..a53cfeac 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
-# Functions Framework for Java [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2FGoogleCloudPlatform%2Ffunctions-framework-java%2Fbadge&style=flat)](https://actions-badge.atrox.dev/GoogleCloudPlatform/functions-framework-java/goto) [![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
+# Functions Framework for Java
+
+[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg?label=functions-framework-api)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
+[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions.invoker/java-function-invoker.svg?label=java-function-invoker)](https://search.maven.org/artifact/com.google.cloud.functions.invoker/java-function-invoker)
+
+[![Java Unit CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml)
+[![Java Lint CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml)
+[![Java Conformance CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/conformance.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/conformance.yaml)
 
 An open source FaaS (Function as a service) framework for writing portable
 Java functions -- brought to you by the Google Cloud Functions team.

From 1684c0ef55dc33f2c4c7f7514d99b0e7af75c44f Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Wed, 22 Sep 2021 20:49:45 -0700
Subject: [PATCH 081/308] fix: make user function exceptions log level SEVERE
 (#113)

The FF is inconsistent in how it logs errors in the user function
between HTTP functions and Event-driven functions. This change makes it
so that all functions log the same error with the same severity if
the user function throws an exception.

Log level SEVERE is required to be consistent with the Cloud Functions &
Error Reporting
[docs](https://cloud.google.com/error-reporting/docs/setup/nodejs#cloud_functions).
---
 .../invoker/BackgroundFunctionExecutor.java   |  2 +-
 .../invoker/HttpFunctionExecutor.java         |  6 +--
 .../functions/invoker/IntegrationTest.java    | 42 +++++++++++++++++++
 .../testfunctions/ExceptionBackground.java    | 11 +++++
 .../invoker/testfunctions/ExceptionHttp.java  | 12 ++++++
 5 files changed, 67 insertions(+), 6 deletions(-)
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionBackground.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionHttp.java

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 2238e5d3..754db8cf 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -333,7 +333,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
       res.setStatus(HttpServletResponse.SC_OK);
     } catch (Throwable t) {
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
-      logger.log(Level.WARNING, "Failed to execute " + functionExecutor.functionName(), t);
+      logger.log(Level.SEVERE, "Failed to execute " + functionExecutor.functionName(), t);
     }
   }
 
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index d2a46afd..47bd5a55 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -66,11 +66,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
       Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
       function.service(reqImpl, respImpl);
     } catch (Throwable t) {
-      // TODO(b/146510646): this should be logged properly as an exception, but that currently
-      //   causes integration tests to fail.
-      // logger.log(Level.WARNING, "Failed to execute " + function.getClass().getName(), t);
-      logger.log(Level.WARNING, "Failed to execute {0}", function.getClass().getName());
-      t.printStackTrace();
+      logger.log(Level.SEVERE, "Failed to execute " + function.getClass().getName(), t);
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     } finally {
       Thread.currentThread().setContextClassLoader(oldContextLoader);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 8efe1abf..c6052339 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -248,6 +248,48 @@ public void helloWorld() throws Exception {
             ROBOTS_TXT_TEST_CASE));
   }
 
+  @Test
+  public void exceptionHttp() throws Exception {
+    String exceptionExpectedOutput =
+        "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
+            + " \"com/google/cloud/functions/invoker/HttpFunctionExecutor.java\", \"method\":"
+            + " \"service\"}, \"message\": \"Failed to execute"
+            + " com.google.cloud.functions.invoker.testfunctions.ExceptionHttp\\n"
+            + "java.lang.RuntimeException: exception thrown for test";
+    testHttpFunction(
+        fullTarget("ExceptionHttp"),
+        ImmutableList.of(
+            TestCase.builder()
+                .setExpectedResponseCode(500)
+                .setExpectedOutput(exceptionExpectedOutput)
+                .build()));
+  }
+
+
+  @Test
+  public void exceptionBackground() throws Exception {
+    String exceptionExpectedOutput =
+        "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
+            + " \"com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java\", \"method\":"
+            + " \"service\"}, \"message\": \"Failed to execute"
+            + " com.google.cloud.functions.invoker.testfunctions.ExceptionBackground\\n"
+            + "java.lang.RuntimeException: exception thrown for test";
+
+    File snoopFile = snoopFile();
+    String gcfRequestText = sampleLegacyEvent(snoopFile);
+
+    testFunction(
+        SignatureType.BACKGROUND,
+        fullTarget("ExceptionBackground"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setRequestText(gcfRequestText)
+                .setExpectedResponseCode(500)
+                .setExpectedOutput(exceptionExpectedOutput)
+                .build()));
+  }
+
   @Test
   public void echo() throws Exception {
     String testText = "hello\nworld\n";
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionBackground.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionBackground.java
new file mode 100644
index 00000000..d087b395
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionBackground.java
@@ -0,0 +1,11 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.Context;
+import com.google.cloud.functions.RawBackgroundFunction;
+
+public class ExceptionBackground implements RawBackgroundFunction {
+  @Override
+  public void accept(String json, Context context) {
+    throw new RuntimeException("exception thrown for test");
+  }
+}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionHttp.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionHttp.java
new file mode 100644
index 00000000..b6dee04d
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/ExceptionHttp.java
@@ -0,0 +1,12 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+
+public class ExceptionHttp implements HttpFunction {
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws Exception {
+    throw new RuntimeException("exception thrown for test");
+  }
+}

From 0f34cc808d7f487eb6c7288ff7f5756f3d78623d Mon Sep 17 00:00:00 2001
From: Grant Timmerman <744973+grant@users.noreply.github.com>
Date: Tue, 28 Sep 2021 13:00:12 -0700
Subject: [PATCH 082/308] docs: add all mvn badges (#115)

Add badges to all published packages from this repo.

[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg?label=functions-framework-api)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions.invoker/java-function-invoker.svg?label=java-function-invoker)](https://search.maven.org/artifact/com.google.cloud.functions.invoker/java-function-invoker)
[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/function-maven-plugin.svg?label=function-maven-plugin)](https://search.maven.org/artifact/com.google.cloud.functions/function-maven-plugin)
---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a53cfeac..1941d269 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,8 @@
 # Functions Framework for Java
 
-[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg?label=functions-framework-api)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
-[![Maven Central](https://img.shields.io/maven-central/v/com.google.cloud.functions.invoker/java-function-invoker.svg?label=java-function-invoker)](https://search.maven.org/artifact/com.google.cloud.functions.invoker/java-function-invoker)
+[![Maven Central (functions-framework-api)](https://img.shields.io/maven-central/v/com.google.cloud.functions/functions-framework-api.svg?label=functions-framework-api)](https://search.maven.org/artifact/com.google.cloud.functions/functions-framework-api)
+[![Maven Central (java-function-invoker)](https://img.shields.io/maven-central/v/com.google.cloud.functions.invoker/java-function-invoker.svg?label=java-function-invoker)](https://search.maven.org/artifact/com.google.cloud.functions.invoker/java-function-invoker)
+[![Maven Central (function-maven-plugin)](https://img.shields.io/maven-central/v/com.google.cloud.functions/function-maven-plugin.svg?label=function-maven-plugin)](https://search.maven.org/artifact/com.google.cloud.functions/function-maven-plugin)
 
 [![Java Unit CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml)
 [![Java Lint CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml)

From c24366849dad24a661139fe5f7adc845fd638ab2 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <744973+grant@users.noreply.github.com>
Date: Thu, 30 Sep 2021 10:58:10 -0700
Subject: [PATCH 083/308] ci: Use setup Java v2 (needed for jdk17) (#114)

Use `actions/setup-java@v2` (needed for jdk17).

See https://github.com/actions/setup-java

`jdk17` enabled for now, but there are some test failures we've temporarily disabled for that runtime:
- `background(com.google.cloud.functions.invoker.IntegrationTest): 2 expectations failed:(..)`
- `typedBackground(com.google.cloud.functions.invoker.IntegrationTest): 2 expectations failed:(..)`
---
 .github/workflows/unit.yaml                   |  8 +++----
 .../functions/invoker/IntegrationTest.java    | 22 +++++++++++++++++--
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index f93c38fb..b7446355 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -6,16 +6,16 @@ jobs:
     strategy:
       matrix:
         java: [
-          11.x
-          # 12.x,
-          # 13.x
+          11.x,
+          17.x
         ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v2
       with:
         java-version: ${{ matrix.java }}
+        distribution: temurin
     - name: Build with Maven
       run: (cd functions-framework-api/ && mvn install)
     - name: Test
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index c6052339..051358f8 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -353,14 +353,32 @@ public void stackDriverLogging() throws Exception {
         fullTarget("Log"), ImmutableList.of(simpleTestCase, quotingTestCase, exceptionTestCase));
   }
 
+  private static int getJavaVersion() {
+    String version = System.getProperty("java.version");
+    if (version.startsWith("1.")) {
+      version = version.substring(2, 3);
+    } else {
+      int dot = version.indexOf(".");
+      if (dot != -1) {
+        version = version.substring(0, dot);
+      }
+    } return Integer.parseInt(version);
+  }
+
   @Test
   public void background() throws Exception {
-    backgroundTest("BackgroundSnoop");
+    // TODO: Only enable background tests for < 17
+    if (getJavaVersion() < 17) {
+      backgroundTest("BackgroundSnoop");
+    }
   }
 
   @Test
   public void typedBackground() throws Exception {
-    backgroundTest("TypedBackgroundSnoop");
+    // TODO: Only enable background tests for < 17
+    if (getJavaVersion() < 17) {
+      backgroundTest("TypedBackgroundSnoop");
+    }
   }
 
   private void backgroundTest(String target) throws Exception {

From f0d19d8012c28fb97dbf4603268acefddac48ead Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 30 Sep 2021 11:29:13 -0700
Subject: [PATCH 084/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.0.3

---
 invoker/conformance/pom.xml           | 6 +++---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 932718e5..753929c1 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -42,7 +42,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.9.8-SNAPSHOT</version>
+          <version>0.9.8</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 29d2def4..816a63a7 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.3</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 0314da97..870b690d 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.8-SNAPSHOT</version>
+  <version>0.9.8</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.3-SNAPSHOT</version>
+      <version>1.0.3</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 7f179f46..c15591fb 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.3</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 3fada351..157b62ad 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <version>1.0.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.3-SNAPSHOT</version>
+  <version>1.0.3</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 5fd42a74d16ea087987fc2cb517ef861778fd1b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Thu, 30 Sep 2021 11:29:15 -0700
Subject: [PATCH 085/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/conformance/pom.xml           | 6 +++---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 753929c1..67ff436e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.0</version>
+  <version>1.0.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -42,7 +42,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.9.8</version>
+          <version>0.9.9-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 816a63a7..af524717 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 870b690d..bf5d8107 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.8</version>
+  <version>0.9.9-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.3</version>
+      <version>1.0.4-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index c15591fb..989794e6 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 157b62ad..b381e41e 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.3</version>
+    <version>1.0.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.3</version>
+  <version>1.0.4-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 82401c7bdaa76da798b8ae35f931db0d4236c1e7 Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Fri, 1 Oct 2021 18:25:52 -0400
Subject: [PATCH 086/308] docs: update readme with new release version (#116)

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 1941d269..04a34659 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ You can configure the plugin in `pom.xml`:
 <plugin>
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
-  <version>0.9.7</version>
+  <version>0.9.8</version>
   <configuration>
     <functionTarget>com.example.function.Echo</functionTarget>
   </configuration>
@@ -187,7 +187,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.2' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.3' \
     -DoutputDirectory=.
 ```
 
@@ -195,7 +195,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.0.2 \
+java -jar java-function-invoker-1.0.3 \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -288,7 +288,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.0.2 \
+java -jar java-function-invoker-1.0.3 \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From 5df7444ab1f0ce37028b48477650861a8d745442 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <744973+grant@users.noreply.github.com>
Date: Tue, 12 Oct 2021 11:57:17 -0700
Subject: [PATCH 087/308] docs: add instructions for running tests (#118)

* docs: add instructions for running tests

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>

* docs: update contributing

Signed-off-by: Grant Timmerman <timmerman+devrel@google.com>
---
 CONTRIBUTING.md | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 939e5341..2e34dae2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -26,3 +26,44 @@ information on using pull requests.
 
 This project follows [Google's Open Source Community
 Guidelines](https://opensource.google.com/conduct/).
+
+## Developing
+
+This project is divided into multiple packages, primarily:
+
+- [`functions-framework-api`](./functions-framework-api)
+  - `core`
+  - `testfunction`
+  - `function-maven-plugin`
+  - `conformance`
+- [`java-function-invoker`](./invoker)
+
+### Setup JDK 11 / 17
+
+Install JDK 11 and 17. One way to install these is through [SDK man](https://sdkman.io/).
+
+```sh
+sdk install java 11.0.2-open
+sdk install java 17
+sdk use java 17
+sdk use java 11.0.2-open
+```
+
+Verify Java version with:
+
+```sh
+java --version
+```
+
+### Setup Apache Maven
+
+Install `mvn`:
+
+https://maven.apache.org/install.html
+
+## Install and Run Invoker Tests Locally
+
+```
+cd invoker;
+mvn test;
+```

From 565f07e3f947162870867d4c3b4e61302c32e62b Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Wed, 20 Oct 2021 18:08:04 -0700
Subject: [PATCH 088/308] ci: add formatting CI (#122)

* ci: add formatting CI

Use Google formatting guidelines to format existing code.

* Merge with lint workflow and add formatting instructions to CONTRIBUTING.md
---
 .github/workflows/lint.yaml                   |  19 +-
 .github/workflows/unit.yaml                   |   6 +-
 CONTRIBUTING.md                               |   5 +
 .../cloud/functions/BackgroundFunction.java   |  16 +-
 .../cloud/functions/CloudEventsFunction.java  |   9 +-
 .../com/google/cloud/functions/Context.java   |  24 +-
 .../google/cloud/functions/HttpFunction.java  |   4 +-
 .../google/cloud/functions/HttpMessage.java   |  31 +-
 .../google/cloud/functions/HttpRequest.java   |  40 +-
 .../google/cloud/functions/HttpResponse.java  |  46 ++-
 .../functions/RawBackgroundFunction.java      |  16 +-
 .../BackgroundEventConformanceFunction.java   |  22 +-
 .../CloudEventsConformanceFunction.java       |  13 +-
 .../conformance/HttpConformanceFunction.java  |   9 +-
 .../invoker/BackgroundFunctionExecutor.java   |  78 ++--
 .../invoker/CloudFunctionsContext.java        |  17 +-
 .../cloud/functions/invoker/GcfEvents.java    | 125 +++---
 .../invoker/HttpFunctionExecutor.java         |   8 +-
 .../functions/invoker/gcf/JsonLogHandler.java |   8 +-
 .../functions/invoker/runner/Invoker.java     | 128 +++---
 .../functions/invoker/GcfEventsTest.java      | 217 +++++++----
 .../functions/invoker/IntegrationTest.java    | 194 ++++++----
 .../functions/invoker/http/HttpTest.java      | 365 +++++++++---------
 .../functions/invoker/runner/InvokerTest.java |  11 +-
 .../testfunctions/CloudEventSnoop.java        |   3 +-
 .../invoker/testfunctions/Multipart.java      |   7 +-
 .../testfunctions/TypedBackgroundSnoop.java   |   3 +-
 .../cloud/functions/plugin/RunFunction.java   |  35 +-
 .../com/example/functionjar/Background.java   |   4 +-
 .../java/com/example/functionjar/Checker.java |   3 +-
 30 files changed, 798 insertions(+), 668 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index cc31b736..82a20cfe 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -4,6 +4,7 @@ on:
     branches:
     - master
   pull_request:
+  workflow_dispatch:
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -20,4 +21,20 @@ jobs:
     - name: Build Invoker with Maven
       run: (cd functions-framework-api/ && mvn install)
     - name: Lint Invoker
-      run: (cd invoker/ && mvn clean verify -DskipTests -P lint)
\ No newline at end of file
+      run: (cd invoker/ && mvn clean verify -DskipTests -P lint)
+  formatting:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2 # v2 minimum required
+      - name: Run formatter
+        id: formatter
+        uses: axel-op/googlejavaformat-action@v3
+        with:
+          args: "--dry-run --set-exit-if-changed"
+        continue-on-error: true
+      - name: Check for failure
+        if: steps.formatter.outcome != 'success'
+        run: |
+          echo "Java format check failed, see 'Run formatter' step for more information."
+          echo "See https://github.com/google/google-java-format for options on running the formatter locally."
+          exit 1
\ No newline at end of file
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index b7446355..1938fc01 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -1,5 +1,9 @@
 name: Java Unit CI
-on: [push, pull_request]
+on:
+  push:
+    branches:
+    - master
+  pull_request:
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2e34dae2..7e7cc4ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -61,6 +61,11 @@ Install `mvn`:
 
 https://maven.apache.org/install.html
 
+### Formatting
+This repo follows the Google Java Style guide for formatting. You can setup the
+formatting tool locally using one of the options provided at
+[google/google-java-format](https://github.com/google/google-java-format#google-java-format).
+
 ## Install and Run Invoker Tests Locally
 
 ```
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
index 890a5ade..5052b7b6 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
@@ -17,14 +17,14 @@
 /**
  * Represents a Cloud Function that is activated by an event and parsed into a user-supplied class.
  * The payload of the event is a JSON object, which is deserialized into a user-defined class as
- * described for
- * <a href="https://github.com/google/gson/blob/master/UserGuide.md#TOC-Object-Examples">Gson</a>.
- *
- * <p>Here is an example of an implementation that accesses the {@code messageId} property from
- * a payload that matches a user-defined {@code PubSubMessage} class:
+ * described for <a
+ * href="https://github.com/google/gson/blob/master/UserGuide.md#TOC-Object-Examples">Gson</a>.
  *
+ * <p>Here is an example of an implementation that accesses the {@code messageId} property from a
+ * payload that matches a user-defined {@code PubSubMessage} class:
  * <!-- The {@code} placement is a bit strange here, to prevent spurious spaces introduced by the
  *      javadoc tool. -->
+ *
  * <pre>
  * public class Example implements{@code BackgroundFunction<PubSubMessage>} {
  *   private static final Logger logger = Logger.getLogger(Example.class.getName());
@@ -49,9 +49,9 @@
 @FunctionalInterface
 public interface BackgroundFunction<T> {
   /**
-   * Called to service an incoming event. This interface is implemented by user code to
-   * provide the action for a given background function. If this method throws any exception
-   * (including any {@link Error}) then the HTTP response will have a 500 status code.
+   * Called to service an incoming event. This interface is implemented by user code to provide the
+   * action for a given background function. If this method throws any exception (including any
+   * {@link Error}) then the HTTP response will have a 500 status code.
    *
    * @param payload the payload of the event, deserialized from the original JSON string.
    * @param context the context of the event. This is a set of values that every event has,
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java
index 05a092a7..7e34ae68 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/CloudEventsFunction.java
@@ -3,14 +3,15 @@
 import io.cloudevents.CloudEvent;
 
 /**
- * Represents a Cloud Function that is activated by an event and parsed into a {@link CloudEvent} object.
+ * Represents a Cloud Function that is activated by an event and parsed into a {@link CloudEvent}
+ * object.
  */
 @FunctionalInterface
 public interface CloudEventsFunction {
   /**
-   * Called to service an incoming event. This interface is implemented by user code to
-   * provide the action for a given background function. If this method throws any exception
-   * (including any {@link Error}) then the HTTP response will have a 500 status code.
+   * Called to service an incoming event. This interface is implemented by user code to provide the
+   * action for a given background function. If this method throws any exception (including any
+   * {@link Error}) then the HTTP response will have a 500 status code.
    *
    * @param event the event.
    * @throws Exception to produce a 500 status code in the HTTP response.
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java b/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
index 36e857b5..5100451e 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/Context.java
@@ -21,44 +21,44 @@
 public interface Context {
   /**
    * Returns event ID.
-   * 
+   *
    * @return event ID
    */
   String eventId();
 
   /**
    * Returns event timestamp.
-   * 
+   *
    * @return event timestamp
    */
   String timestamp();
 
   /**
    * Returns event type.
-   * 
+   *
    * @return event type
    */
   String eventType();
 
   /**
    * Returns event resource.
-   * 
+   *
    * @return event resource
    */
   String resource();
 
   /**
    * Returns additional attributes from this event. For CloudEvents, the entries in this map will
-   * include the
-   * <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#required-attributes">required
-   * attributes</a> and may include
-   * <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#required-attributes">optional
-   * attributes</a> and
-   * <a href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#extension-context-attributes">
+   * include the <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#required-attributes">required
+   * attributes</a> and may include <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#required-attributes">optional
+   * attributes</a> and <a
+   * href="https://github.com/cloudevents/spec/blob/v1.0/spec.md#extension-context-attributes">
    * extension attributes</a>.
    *
-   * <p>The map returned by this method may be empty but is never null.</p>
-   * 
+   * <p>The map returned by this method may be empty but is never null.
+   *
    * @return additional attributes form this event.
    */
   default Map<String, String> attributes() {
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java
index 59065ef6..6357724d 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpFunction.java
@@ -14,9 +14,7 @@
 
 package com.google.cloud.functions;
 
-/**
- * Represents a Cloud Function that is activated by an HTTP request.
- */
+/** Represents a Cloud Function that is activated by an HTTP request. */
 @FunctionalInterface
 public interface HttpFunction {
   /**
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java
index 43b56da3..24a70c9b 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpMessage.java
@@ -21,9 +21,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-/**
- * Represents an HTTP message, either an HTTP request or a part of a multipart HTTP request.
- */
+/** Represents an HTTP message, either an HTTP request or a part of a multipart HTTP request. */
 public interface HttpMessage {
   /**
    * Returns the value of the {@code Content-Type} header, if any.
@@ -40,19 +38,19 @@ public interface HttpMessage {
   long getContentLength();
 
   /**
-   * Returns the character encoding specified in the {@code Content-Type} header,
-   * or {@code Optional.empty()} if there is no {@code Content-Type} header or it does not have the
-   * {@code charset} parameter.
+   * Returns the character encoding specified in the {@code Content-Type} header, or {@code
+   * Optional.empty()} if there is no {@code Content-Type} header or it does not have the {@code
+   * charset} parameter.
    *
    * @return the character encoding for the content type, if one is specified.
    */
   Optional<String> getCharacterEncoding();
 
   /**
-   * Returns an {@link InputStream} that can be used to read the body of this HTTP request.
-   * Every call to this method on the same {@link HttpMessage} will return the same object.
-   * This method is typically used to read binary data. If the body is text, the
-   * {@link #getReader()} method is more appropriate.
+   * Returns an {@link InputStream} that can be used to read the body of this HTTP request. Every
+   * call to this method on the same {@link HttpMessage} will return the same object. This method is
+   * typically used to read binary data. If the body is text, the {@link #getReader()} method is
+   * more appropriate.
    *
    * @return an {@link InputStream} that can be used to read the body of this HTTP request.
    * @throws IOException if a valid {@link InputStream} cannot be returned for some reason.
@@ -72,8 +70,8 @@ public interface HttpMessage {
   BufferedReader getReader() throws IOException;
 
   /**
-   * Returns a map describing the headers of this HTTP request, or this part of a multipart
-   * request. If the headers look like this...
+   * Returns a map describing the headers of this HTTP request, or this part of a multipart request.
+   * If the headers look like this...
    *
    * <pre>
    *   Content-Type: text/plain
@@ -82,11 +80,11 @@ public interface HttpMessage {
    * </pre>
    *
    * ...then the returned value will map {@code "Content-Type"} to a one-element list containing
-   * {@code "text/plain"}, and {@code "Some-Header"} to a two-element list containing
-   * {@code "some value"} and {@code "another value"}.
+   * {@code "text/plain"}, and {@code "Some-Header"} to a two-element list containing {@code "some
+   * value"} and {@code "another value"}.
    *
-   * @return a map where each key is an HTTP header and the corresponding {@code List} value has
-   *     one element for each occurrence of that header.
+   * @return a map where each key is an HTTP header and the corresponding {@code List} value has one
+   *     element for each occurrence of that header.
    */
   Map<String, List<String>> getHeaders();
 
@@ -104,7 +102,6 @@ public interface HttpMessage {
    * and {@code getFirstHeader("Another-Header")} will return {@code Optional.empty()}.
    *
    * @param name an HTTP header name.
-   *
    * @return the first value of the given header, if present.
    */
   default Optional<String> getFirstHeader(String name) {
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java
index fb1999cf..d50f1cf7 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpRequest.java
@@ -18,9 +18,7 @@
 import java.util.Map;
 import java.util.Optional;
 
-/**
- * Represents the contents of an HTTP request that is being serviced by a Cloud Function.
- */
+/** Represents the contents of an HTTP request that is being serviced by a Cloud Function. */
 public interface HttpRequest extends HttpMessage {
   /**
    * The HTTP method of this request, such as {@code "POST"} or {@code "GET"}.
@@ -37,39 +35,39 @@ public interface HttpRequest extends HttpMessage {
   String getUri();
 
   /**
-   * The path part of the URI for this request, without any query. If the full URI is
-   * {@code http://foo.com/bar/baz?this=that}, then this method will return {@code /bar/baz}.
+   * The path part of the URI for this request, without any query. If the full URI is {@code
+   * http://foo.com/bar/baz?this=that}, then this method will return {@code /bar/baz}.
    *
    * @return the path part of the URI for this request.
    */
   String getPath();
 
   /**
-   * The query part of the URI for this request. If the full URI is
-   * {@code http://foo.com/bar/baz?this=that}, then this method will return {@code this=that}.
-   * If there is no query part, the returned {@code Optional} is empty.
+   * The query part of the URI for this request. If the full URI is {@code
+   * http://foo.com/bar/baz?this=that}, then this method will return {@code this=that}. If there is
+   * no query part, the returned {@code Optional} is empty.
    *
    * @return the query part of the URI, if any.
    */
   Optional<String> getQuery();
 
   /**
-   * The query parameters of this request. If the full URI is
-   * {@code http://foo.com/bar?thing=thing1&thing=thing2&cat=hat}, then the returned map will map
-   * {@code thing} to the list {@code ["thing1", "thing2"]} and {@code cat} to the list with the
-   * single element {@code "hat"}.
+   * The query parameters of this request. If the full URI is {@code
+   * http://foo.com/bar?thing=thing1&thing=thing2&cat=hat}, then the returned map will map {@code
+   * thing} to the list {@code ["thing1", "thing2"]} and {@code cat} to the list with the single
+   * element {@code "hat"}.
    *
-   * @return a map where each key is the name of a query parameter and the corresponding
-   *     {@code List} value indicates every value that was associated with that name.
+   * @return a map where each key is the name of a query parameter and the corresponding {@code
+   *     List} value indicates every value that was associated with that name.
    */
   Map<String, List<String>> getQueryParameters();
 
   /**
-   * The first query parameter with the given name, if any. If the full URI is
-   * {@code http://foo.com/bar?thing=thing1&thing=thing2&cat=hat}, then
-   * {@code getFirstQueryParameter("thing")} will return {@code Optional.of("thing1")} and
-   * {@code getFirstQueryParameter("something")} will return {@code Optional.empty()}. This is a
-   * more convenient alternative to {@link #getQueryParameters}.
+   * The first query parameter with the given name, if any. If the full URI is {@code
+   * http://foo.com/bar?thing=thing1&thing=thing2&cat=hat}, then {@code
+   * getFirstQueryParameter("thing")} will return {@code Optional.of("thing1")} and {@code
+   * getFirstQueryParameter("something")} will return {@code Optional.empty()}. This is a more
+   * convenient alternative to {@link #getQueryParameters}.
    *
    * @param name a query parameter name.
    * @return the first query parameter value with the given name, if any.
@@ -102,8 +100,8 @@ interface HttpPart extends HttpMessage {
    * value.
    *
    * @return a map from part names to part contents.
-   * @throws IllegalStateException if the {@link #getContentType() content type} is not
-   *     {@code multipart/form-data}.
+   * @throws IllegalStateException if the {@link #getContentType() content type} is not {@code
+   *     multipart/form-data}.
    */
   Map<String, HttpPart> getParts();
 }
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java
index 9098315d..c3f87ea2 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/HttpResponse.java
@@ -22,30 +22,29 @@
 import java.util.Optional;
 
 /**
- * Represents the contents of an HTTP response that is being sent by a Cloud Function in response
- * to an HTTP request.
+ * Represents the contents of an HTTP response that is being sent by a Cloud Function in response to
+ * an HTTP request.
  */
 public interface HttpResponse {
   /**
-   * Sets the numeric HTTP
-   * <a href="https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml">status
-   * code</a> to use in the response. Most often this will be 200, which is the OK status. The
-   * named constants in {@link java.net.HttpURLConnection}, such as
-   * {@link java.net.HttpURLConnection#HTTP_OK HTTP_OK}, can be used as an alternative to writing
-   * numbers in your source code.
+   * Sets the numeric HTTP <a
+   * href="https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml">status
+   * code</a> to use in the response. Most often this will be 200, which is the OK status. The named
+   * constants in {@link java.net.HttpURLConnection}, such as {@link
+   * java.net.HttpURLConnection#HTTP_OK HTTP_OK}, can be used as an alternative to writing numbers
+   * in your source code.
    *
    * @param code the status code.
    */
   void setStatusCode(int code);
 
   /**
-   * Sets the numeric HTTP
-   * <a href="https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml">status
+   * Sets the numeric HTTP <a
+   * href="https://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml">status
    * code</a> and reason message to use in the response. For example<br>
-   * {@code setStatusCode(400, "Something went wrong")}. The
-   * named constants in {@link java.net.HttpURLConnection}, such as
-   * {@link java.net.HttpURLConnection#HTTP_BAD_REQUEST HTTP_BAD_REQUEST}, can be used as an
-   * alternative to writing numbers in your source code.
+   * {@code setStatusCode(400, "Something went wrong")}. The named constants in {@link
+   * java.net.HttpURLConnection}, such as {@link java.net.HttpURLConnection#HTTP_BAD_REQUEST
+   * HTTP_BAD_REQUEST}, can be used as an alternative to writing numbers in your source code.
    *
    * @param code the status code.
    * @param message the status message.
@@ -53,8 +52,8 @@ public interface HttpResponse {
   void setStatusCode(int code, String message);
 
   /**
-   * Sets the value to use for the {@code Content-Type} header in the response. This may include
-   * a character encoding, for example {@code setContentType("text/plain; charset=utf-8")}.
+   * Sets the value to use for the {@code Content-Type} header in the response. This may include a
+   * character encoding, for example {@code setContentType("text/plain; charset=utf-8")}.
    *
    * @param contentType the content type.
    */
@@ -90,9 +89,9 @@ public interface HttpResponse {
   Map<String, List<String>> getHeaders();
 
   /**
-   * Returns an {@link OutputStream} that can be used to write the body of the response.
-   * This method is typically used to write binary data. If the body is text, the
-   * {@link #getWriter()} method is more appropriate.
+   * Returns an {@link OutputStream} that can be used to write the body of the response. This method
+   * is typically used to write binary data. If the body is text, the {@link #getWriter()} method is
+   * more appropriate.
    *
    * @return the output stream.
    * @throws IOException if a valid {@link OutputStream} cannot be returned for some reason.
@@ -101,11 +100,10 @@ public interface HttpResponse {
   OutputStream getOutputStream() throws IOException;
 
   /**
-   * Returns a {@link BufferedWriter} that can be used to write the text body of the response.
-   * If the written text will not be US-ASCII, you should specify a character encoding by calling
-   * {@link #setContentType setContentType("text/foo; charset=bar")} or
-   * {@link #appendHeader appendHeader("Content-Type", "text/foo; charset=bar")}
-   * before calling this method.
+   * Returns a {@link BufferedWriter} that can be used to write the text body of the response. If
+   * the written text will not be US-ASCII, you should specify a character encoding by calling
+   * {@link #setContentType setContentType("text/foo; charset=bar")} or {@link #appendHeader
+   * appendHeader("Content-Type", "text/foo; charset=bar")} before calling this method.
    *
    * @return the writer.
    * @throws IOException if a valid {@link BufferedWriter} cannot be returned for some reason.
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
index 6eff26d2..e27624ed 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
@@ -16,14 +16,14 @@
 
 /**
  * Represents a Cloud Function that is activated by an event. The payload of the event is a JSON
- * object, which can be parsed using a JSON package such as
- * <a href="https://github.com/google/gson/blob/master/UserGuide.md">GSON</a>.
+ * object, which can be parsed using a JSON package such as <a
+ * href="https://github.com/google/gson/blob/master/UserGuide.md">GSON</a>.
  *
  * <p>Here is an example of an implementation that parses the JSON payload using Gson, to access its
  * {@code messageId} property:
- *
  * <!-- The {@code} placement is a bit strange here, to prevent spurious spaces introduced by the
  *      javadoc tool. -->
+ *
  * <pre>
  * public class Example implements RawBackgroundFunction {
  *   private static final Logger logger = Logger.getLogger(Example.class.getName());
@@ -38,8 +38,8 @@
  * }
  * </pre>
  *
- * <p>Here is an example of an implementation that deserializes the JSON payload into a Java
- * object for simpler access, again using Gson:
+ * <p>Here is an example of an implementation that deserializes the JSON payload into a Java object
+ * for simpler access, again using Gson:
  *
  * <pre>
  * public class Example implements RawBackgroundFunction {
@@ -64,9 +64,9 @@
 @FunctionalInterface
 public interface RawBackgroundFunction {
   /**
-   * Called to service an incoming event. This interface is implemented by user code to
-   * provide the action for a given background function. If this method throws any exception
-   * (including any {@link Error}) then the HTTP response will have a 500 status code.
+   * Called to service an incoming event. This interface is implemented by user code to provide the
+   * action for a given background function. If this method throws any exception (including any
+   * {@link Error}) then the HTTP response will have a 500 status code.
    *
    * @param json the payload of the event, as a JSON string.
    * @param context the context of the event. This is a set of values that every event has,
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
index 8672e6d8..8193abbd 100644
--- a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
@@ -1,29 +1,26 @@
 package com.google.cloud.functions.conformance;
 
+import com.google.cloud.functions.Context;
+import com.google.cloud.functions.RawBackgroundFunction;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.google.cloud.functions.Context;
-import com.google.cloud.functions.RawBackgroundFunction;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
 
 /**
- * This class is used by the Functions Framework Conformance Tools to validate
- * the framework's Background Event API. It can be run with the following
- * command:
+ * This class is used by the Functions Framework Conformance Tools to validate the framework's
+ * Background Event API. It can be run with the following command:
  *
- * <pre>
- * {@code
+ * <pre>{@code
  * $ functions-framework-conformance-client \
  *   -cmd="mvn function:run -Drun.functionTarget=com.google.cloud.functions.conformance.BackgroundEventConformanceFunction" \
  *   -type=legacyevent \
  *   -buildpacks=false \
  *   -validate-mapping=false \
  *   -start-delay=10
- * }
- * </pre>
+ * }</pre>
  */
 public class BackgroundEventConformanceFunction implements RawBackgroundFunction {
 
@@ -36,15 +33,13 @@ public void accept(String data, Context context) throws Exception {
     }
   }
 
-  /**
-   * Create a structured JSON representation of the request context and data
-   */
+  /** Create a structured JSON representation of the request context and data */
   private String serialize(String data, Context context) {
     JsonObject contextJson = new JsonObject();
     contextJson.addProperty("eventId", context.eventId());
     contextJson.addProperty("timestamp", context.timestamp());
     contextJson.addProperty("eventType", context.eventType());
-    
+
     JsonElement resource = gson.fromJson(context.resource(), JsonElement.class);
     contextJson.add("resource", resource);
 
@@ -55,5 +50,4 @@ private String serialize(String data, Context context) {
     json.add("context", contextJson);
     return gson.toJson(json);
   }
-
 }
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
index da810047..04371952 100644
--- a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
@@ -26,8 +26,8 @@
 import java.time.format.DateTimeFormatter;
 
 /**
- * This class is used by the Functions Framework Conformance Tools to validate
- * the framework's Cloud Events API. It can be run with the following command:
+ * This class is used by the Functions Framework Conformance Tools to validate the framework's Cloud
+ * Events API. It can be run with the following command:
  *
  * <pre>{@code
  * $ functions-framework-conformance-client \
@@ -40,10 +40,7 @@
  */
 public class CloudEventsConformanceFunction implements CloudEventsFunction {
 
-  private static final Gson gson = new GsonBuilder()
-      .serializeNulls()
-      .setPrettyPrinting()
-      .create();
+  private static final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
 
   @Override
   public void accept(CloudEvent event) throws Exception {
@@ -52,9 +49,7 @@ public void accept(CloudEvent event) throws Exception {
     }
   }
 
-  /**
-   * Create a structured JSON representation of a cloud event
-   */
+  /** Create a structured JSON representation of a cloud event */
   private String serialize(CloudEvent event) {
     JsonObject jsonEvent = new JsonObject();
 
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java
index 0bdd843b..46eafd09 100644
--- a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/HttpConformanceFunction.java
@@ -23,8 +23,8 @@
 import java.io.IOException;
 
 /**
- * This class is used by the Functions Framework Conformance Tools to validate
- * the framework's HTTP API. It can be run with the following command:
+ * This class is used by the Functions Framework Conformance Tools to validate the framework's HTTP
+ * API. It can be run with the following command:
  *
  * <pre>{@code
  * $ functions-framework-conformance-client \
@@ -38,8 +38,7 @@
 public class HttpConformanceFunction implements HttpFunction {
 
   @Override
-  public void service(HttpRequest request, HttpResponse response)
-      throws IOException {
+  public void service(HttpRequest request, HttpResponse response) throws IOException {
     try (BufferedReader reader = request.getReader();
         BufferedWriter writer = new BufferedWriter(new FileWriter("function_output.json"))) {
       int c;
@@ -48,4 +47,4 @@ public void service(HttpRequest request, HttpResponse response)
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 754db8cf..6f320438 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -72,18 +72,20 @@ private enum FunctionKind {
 
     /** Returns the {@link FunctionKind} that the given class implements, if any. */
     static Optional<FunctionKind> forClass(Class<?> functionClass) {
-      return VALUES.stream().filter(v -> v.functionClass.isAssignableFrom(functionClass)).findFirst();
+      return VALUES.stream()
+          .filter(v -> v.functionClass.isAssignableFrom(functionClass))
+          .findFirst();
     }
   }
 
   /**
    * Optionally makes a {@link BackgroundFunctionExecutor} for the given class, if it implements one
-   * of {@link BackgroundFunction}, {@link RawBackgroundFunction}, or
-   * {@link CloudEventsFunction}. Otherwise returns {@link Optional#empty()}.
+   * of {@link BackgroundFunction}, {@link RawBackgroundFunction}, or {@link CloudEventsFunction}.
+   * Otherwise returns {@link Optional#empty()}.
    *
    * @param functionClass the class of a possible background function implementation.
-   * @throws RuntimeException if the given class does implement one of the required interfaces, but we are
-   *     unable to construct an instance using its no-arg constructor.
+   * @throws RuntimeException if the given class does implement one of the required interfaces, but
+   *     we are unable to construct an instance using its no-arg constructor.
    */
   public static Optional<BackgroundFunctionExecutor> maybeForClass(Class<?> functionClass) {
     Optional<FunctionKind> maybeFunctionKind = FunctionKind.forClass(functionClass);
@@ -96,10 +98,9 @@ public static Optional<BackgroundFunctionExecutor> maybeForClass(Class<?> functi
   /**
    * Makes a {@link BackgroundFunctionExecutor} for the given class.
    *
-   * @throws RuntimeException if either the class does not implement one of
-   *    {@link BackgroundFunction}, {@link RawBackgroundFunction}, or
-   *    {@link CloudEventsFunction}; or we are unable to construct an instance using its no-arg
-   *     constructor.
+   * @throws RuntimeException if either the class does not implement one of {@link
+   *     BackgroundFunction}, {@link RawBackgroundFunction}, or {@link CloudEventsFunction}; or we
+   *     are unable to construct an instance using its no-arg constructor.
    */
   public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
     Optional<FunctionKind> maybeFunctionKind = FunctionKind.forClass(functionClass);
@@ -107,13 +108,16 @@ public static BackgroundFunctionExecutor forClass(Class<?> functionClass) {
       List<String> classNames =
           FunctionKind.VALUES.stream().map(v -> v.functionClass.getName()).collect(toList());
       throw new RuntimeException(
-          "Class " + functionClass.getName() + " must implement one of these interfaces: "
+          "Class "
+              + functionClass.getName()
+              + " must implement one of these interfaces: "
               + String.join(", ", classNames));
     }
     return forClass(functionClass, maybeFunctionKind.get());
   }
 
-  private static BackgroundFunctionExecutor forClass(Class<?> functionClass, FunctionKind functionKind) {
+  private static BackgroundFunctionExecutor forClass(
+      Class<?> functionClass, FunctionKind functionKind) {
     Object instance;
     try {
       instance = functionClass.getConstructor().newInstance();
@@ -152,9 +156,8 @@ private static BackgroundFunctionExecutor forClass(Class<?> functionClass, Funct
   }
 
   /**
-   * Returns the {@code T} of a concrete class that implements
-   * {@link BackgroundFunction BackgroundFunction<T>}. Returns an empty {@link Optional} if
-   * {@code T} can't be determined.
+   * Returns the {@code T} of a concrete class that implements {@link BackgroundFunction
+   * BackgroundFunction<T>}. Returns an empty {@link Optional} if {@code T} can't be determined.
    */
   static Optional<Type> backgroundFunctionTypeArgument(
       Class<? extends BackgroundFunction<?>> functionClass) {
@@ -163,9 +166,12 @@ static Optional<Type> backgroundFunctionTypeArgument(
     // We must be careful because the compiler will also have added a synthetic method
     // accept(Object, Context).
     return Arrays.stream(functionClass.getMethods())
-        .filter(m -> m.getName().equals("accept") && m.getParameterCount() == 2
-            && m.getParameterTypes()[1] == Context.class
-            && m.getParameterTypes()[0] != Object.class)
+        .filter(
+            m ->
+                m.getName().equals("accept")
+                    && m.getParameterCount() == 2
+                    && m.getParameterTypes()[1] == Context.class
+                    && m.getParameterTypes()[0] != Object.class)
         .map(m -> m.getGenericParameterTypes()[0])
         .findFirst();
   }
@@ -175,21 +181,22 @@ private static Event parseLegacyEvent(HttpServletRequest req) throws IOException
       return parseLegacyEvent(bodyReader);
     }
   }
-  
+
   static Event parseLegacyEvent(Reader reader) throws IOException {
     // A Type Adapter is required to set the type of the JsonObject because CloudFunctionsContext
     // is abstract and Gson default behavior instantiates the type provided.
-    TypeAdapter<CloudFunctionsContext> typeAdapter =
-        CloudFunctionsContext.typeAdapter(new Gson());
-    Gson gson = new GsonBuilder()
-        .registerTypeAdapter(CloudFunctionsContext.class, typeAdapter)
-        .registerTypeAdapter(Event.class, new Event.EventDeserializer())
-        .create();
+    TypeAdapter<CloudFunctionsContext> typeAdapter = CloudFunctionsContext.typeAdapter(new Gson());
+    Gson gson =
+        new GsonBuilder()
+            .registerTypeAdapter(CloudFunctionsContext.class, typeAdapter)
+            .registerTypeAdapter(Event.class, new Event.EventDeserializer())
+            .create();
     return gson.fromJson(reader, Event.class);
   }
 
   private static Context contextFromCloudEvent(CloudEvent cloudEvent) {
-    OffsetDateTime timestamp = Optional.ofNullable(cloudEvent.getTime()).orElse(OffsetDateTime.now());
+    OffsetDateTime timestamp =
+        Optional.ofNullable(cloudEvent.getTime()).orElse(OffsetDateTime.now());
     String timestampString = DateTimeFormatter.ISO_INSTANT.format(timestamp);
     // We don't have an obvious replacement for the Context.resource field, which with legacy events
     // corresponded to a value present for some proprietary Google event types.
@@ -214,8 +221,8 @@ private static Context contextFromCloudEvent(CloudEvent cloudEvent) {
    *
    * <p>In addition to these two flavours, events can be either "legacy events" or "CloudEvents".
    * Legacy events are the only kind that GCF originally supported, and use proprietary encodings
-   * for the various triggers. CloudEvents are ones that follow the standards defined by
-   * <a href="https://cloudevents.io">cloudevents.io</a>.
+   * for the various triggers. CloudEvents are ones that follow the standards defined by <a
+   * href="https://cloudevents.io">cloudevents.io</a>.
    *
    * @param <CloudEventDataT> the type to be used in the {@link Unmarshallers} call when
    *     unmarshalling this event, if it is a CloudEvent.
@@ -257,9 +264,8 @@ void serviceLegacyEvent(Event legacyEvent) throws Exception {
     @Override
     void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
       Context context = contextFromCloudEvent(cloudEvent);
-      String jsonData = (cloudEvent.getData() == null)
-          ? "{}"
-          : new String(cloudEvent.getData().toBytes(), UTF_8);
+      String jsonData =
+          (cloudEvent.getData() == null) ? "{}" : new String(cloudEvent.getData().toBytes(), UTF_8);
       function.accept(jsonData, context);
     }
   }
@@ -337,13 +343,16 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
     }
   }
 
-  private enum CloudEventKind {BINARY, STRUCTURED}
+  private enum CloudEventKind {
+    BINARY,
+    STRUCTURED
+  }
 
   /**
    * Service a CloudEvent.
    *
-   * @param <CloudEventT> a fake type parameter, which corresponds to the type parameter of
-   *     {@link FunctionExecutor}.
+   * @param <CloudEventT> a fake type parameter, which corresponds to the type parameter of {@link
+   *     FunctionExecutor}.
    */
   private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exception {
     @SuppressWarnings("unchecked")
@@ -353,7 +362,8 @@ private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exce
     // It's important not to set the context ClassLoader earlier, because MessageUtils will use
     // ServiceLoader.load(EventFormat.class) to find a handler to deserialize a binary CloudEvent
     // and if it finds something from the function ClassLoader then that something will implement
-    // the EventFormat interface as defined by that ClassLoader rather than ours. Then ServiceLoader.load
+    // the EventFormat interface as defined by that ClassLoader rather than ours. Then
+    // ServiceLoader.load
     // will throw ServiceConfigurationError. At this point we're still running with the default
     // context ClassLoader, which is the system ClassLoader that has loaded the code here.
     runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent(data -> data)));
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index 081928ad..4efc045d 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -69,25 +69,33 @@ static Builder builder() {
   @AutoValue.Builder
   abstract static class Builder {
     abstract Builder setEventId(String x);
+
     abstract Builder setTimestamp(String x);
+
     abstract Builder setEventType(String x);
+
     abstract Builder setResource(String x);
+
     abstract Builder setParams(Map<String, String> x);
+
     abstract Builder setAttributes(Map<String, String> value);
+
     abstract Builder setDomain(String x);
 
     abstract CloudFunctionsContext build();
   }
 
   /**
-   * Depending on the event type, the {@link Context#resource()} field is either a JSON string (complete
-   * with encosing quotes) or a JSON object. This class allows us to redeserialize that JSON representation
-   * into its components.
+   * Depending on the event type, the {@link Context#resource()} field is either a JSON string
+   * (complete with encosing quotes) or a JSON object. This class allows us to redeserialize that
+   * JSON representation into its components.
    */
   @AutoValue
   abstract static class Resource {
     abstract @Nullable String service();
+
     abstract String name();
+
     abstract @Nullable String type();
 
     static TypeAdapter<Resource> typeAdapter(Gson gson) {
@@ -115,8 +123,11 @@ static Builder builder() {
     @AutoValue.Builder
     abstract static class Builder {
       abstract Builder setService(String x);
+
       abstract Builder setName(String x);
+
       abstract Builder setType(String x);
+
       abstract Resource build();
     }
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
index 83eca6ce..d78365dc 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/GcfEvents.java
@@ -28,16 +28,12 @@
 import java.net.URI;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-/**
- * Conversions from GCF events to CloudEvents.
- */
+/** Conversions from GCF events to CloudEvents. */
 class GcfEvents {
   private static final String FIREBASE_SERVICE = "firebase.googleapis.com";
   private static final String FIREBASE_AUTH_SERVICE = "firebaseauth.googleapis.com";
@@ -46,56 +42,68 @@ class GcfEvents {
   private static final String PUB_SUB_SERVICE = "pubsub.googleapis.com";
   private static final String STORAGE_SERVICE = "storage.googleapis.com";
 
-  private static final String PUB_SUB_MESSAGE_PUBLISHED = "google.cloud.pubsub.topic.v1.messagePublished";
-
-  private static final Map<String, EventAdapter> EVENT_TYPE_MAPPING = Map.ofEntries(
-      entry("google.pubsub.topic.publish", new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
-
-      entry("google.storage.object.finalize",
-          new StorageEventAdapter("google.cloud.storage.object.v1.finalized")),
-      entry("google.storage.object.delete",
-          new StorageEventAdapter("google.cloud.storage.object.v1.deleted")),
-      entry("google.storage.object.archive",
-          new StorageEventAdapter("google.cloud.storage.object.v1.archived")),
-      entry("google.storage.object.metadataUpdate",
-          new StorageEventAdapter("google.cloud.storage.object.v1.metadataUpdated")),
-
-      entry("providers/cloud.firestore/eventTypes/document.write",
-          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.written",
-              FIRESTORE_SERVICE)),
-      entry("providers/cloud.firestore/eventTypes/document.create",
-          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.created",
-              FIRESTORE_SERVICE)),
-      entry("providers/cloud.firestore/eventTypes/document.update",
-          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.updated",
-              FIRESTORE_SERVICE)),
-      entry("providers/cloud.firestore/eventTypes/document.delete",
-          new FirestoreFirebaseEventAdapter("google.cloud.firestore.document.v1.deleted",
-              FIRESTORE_SERVICE)),
-
-      entry("providers/firebase.auth/eventTypes/user.create",
-          new FirebaseAuthEventAdapter("google.firebase.auth.user.v1.created")),
-      entry("providers/firebase.auth/eventTypes/user.delete",
-          new FirebaseAuthEventAdapter("google.firebase.auth.user.v1.deleted")),
-
-      entry("providers/google.firebase.analytics/eventTypes/event.log",
-          new FirestoreFirebaseEventAdapter("google.firebase.analytics.log.v1.written", FIREBASE_SERVICE)),
-
-      entry("providers/google.firebase.database/eventTypes/ref.create",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.created")),
-      entry("providers/google.firebase.database/eventTypes/ref.write",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.written")),
-      entry("providers/google.firebase.database/eventTypes/ref.update",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.updated")),
-      entry("providers/google.firebase.database/eventTypes/ref.delete",
-          new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.deleted")),
-
-      entry("providers/cloud.pubsub/eventTypes/topic.publish",
-          new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
-
-      entry("providers/cloud.storage/eventTypes/object.change",
-          new StorageEventAdapter("google.cloud.storage.object.v1.changed"))
-  );
+  private static final String PUB_SUB_MESSAGE_PUBLISHED =
+      "google.cloud.pubsub.topic.v1.messagePublished";
+
+  private static final Map<String, EventAdapter> EVENT_TYPE_MAPPING =
+      Map.ofEntries(
+          entry("google.pubsub.topic.publish", new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
+          entry(
+              "google.storage.object.finalize",
+              new StorageEventAdapter("google.cloud.storage.object.v1.finalized")),
+          entry(
+              "google.storage.object.delete",
+              new StorageEventAdapter("google.cloud.storage.object.v1.deleted")),
+          entry(
+              "google.storage.object.archive",
+              new StorageEventAdapter("google.cloud.storage.object.v1.archived")),
+          entry(
+              "google.storage.object.metadataUpdate",
+              new StorageEventAdapter("google.cloud.storage.object.v1.metadataUpdated")),
+          entry(
+              "providers/cloud.firestore/eventTypes/document.write",
+              new FirestoreFirebaseEventAdapter(
+                  "google.cloud.firestore.document.v1.written", FIRESTORE_SERVICE)),
+          entry(
+              "providers/cloud.firestore/eventTypes/document.create",
+              new FirestoreFirebaseEventAdapter(
+                  "google.cloud.firestore.document.v1.created", FIRESTORE_SERVICE)),
+          entry(
+              "providers/cloud.firestore/eventTypes/document.update",
+              new FirestoreFirebaseEventAdapter(
+                  "google.cloud.firestore.document.v1.updated", FIRESTORE_SERVICE)),
+          entry(
+              "providers/cloud.firestore/eventTypes/document.delete",
+              new FirestoreFirebaseEventAdapter(
+                  "google.cloud.firestore.document.v1.deleted", FIRESTORE_SERVICE)),
+          entry(
+              "providers/firebase.auth/eventTypes/user.create",
+              new FirebaseAuthEventAdapter("google.firebase.auth.user.v1.created")),
+          entry(
+              "providers/firebase.auth/eventTypes/user.delete",
+              new FirebaseAuthEventAdapter("google.firebase.auth.user.v1.deleted")),
+          entry(
+              "providers/google.firebase.analytics/eventTypes/event.log",
+              new FirestoreFirebaseEventAdapter(
+                  "google.firebase.analytics.log.v1.written", FIREBASE_SERVICE)),
+          entry(
+              "providers/google.firebase.database/eventTypes/ref.create",
+              new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.created")),
+          entry(
+              "providers/google.firebase.database/eventTypes/ref.write",
+              new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.written")),
+          entry(
+              "providers/google.firebase.database/eventTypes/ref.update",
+              new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.updated")),
+          entry(
+              "providers/google.firebase.database/eventTypes/ref.delete",
+              new FirebaseDatabaseEventAdapter("google.firebase.database.ref.v1.deleted")),
+          entry(
+              "providers/cloud.pubsub/eventTypes/topic.publish",
+              new PubSubEventAdapter(PUB_SUB_MESSAGE_PUBLISHED)),
+          entry(
+              "providers/cloud.storage/eventTypes/object.change",
+              new StorageEventAdapter("google.cloud.storage.object.v1.changed")));
 
   private static final Gson GSON = new GsonBuilder().serializeNulls().create();
 
@@ -112,6 +120,7 @@ static CloudEvent convertToCloudEvent(Event legacyEvent) {
   abstract static class SourceAndSubject {
     /** The source URI, without the initial {@code //<service>/}. */
     abstract String source();
+
     abstract @Nullable String subject();
 
     static SourceAndSubject of(String source, String subject) {
@@ -134,7 +143,8 @@ final CloudEvent convertToCloudEvent(Event legacyEvent) {
       Resource resource = Resource.from(legacyEvent.getContext().resource());
       String service = Optional.ofNullable(resource.service()).orElse(defaultService);
       String resourceName = resource.name();
-      SourceAndSubject sourceAndSubject = convertResourceToSourceAndSubject(resourceName, legacyEvent);
+      SourceAndSubject sourceAndSubject =
+          convertResourceToSourceAndSubject(resourceName, legacyEvent);
       URI source = URI.create("//" + service + "/" + sourceAndSubject.source());
       OffsetDateTime timestamp =
           Optional.ofNullable(legacyEvent.getContext().timestamp())
@@ -217,7 +227,8 @@ SourceAndSubject convertResourceToSourceAndSubject(String resourceName, Event le
 
     @Override
     String maybeReshapeData(Event legacyEvent, String jsonData) {
-      // The reshaping code is disabled for now, because the specification for how the legacy "params"
+      // The reshaping code is disabled for now, because the specification for how the legacy
+      // "params"
       // field should be represented in a CloudEvent is in flux.
       if (true || legacyEvent.getContext().params().isEmpty()) {
         return jsonData;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 47bd5a55..7a66fefd 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -37,13 +37,15 @@ private HttpFunctionExecutor(HttpFunction function) {
   /**
    * Makes a {@link HttpFunctionExecutor} for the given class.
    *
-   * @throws RuntimeException if either the given class does not implement {@link HttpFunction}
-   *    or we are unable to construct an instance using its no-arg constructor.
+   * @throws RuntimeException if either the given class does not implement {@link HttpFunction} or
+   *     we are unable to construct an instance using its no-arg constructor.
    */
   public static HttpFunctionExecutor forClass(Class<?> functionClass) {
     if (!HttpFunction.class.isAssignableFrom(functionClass)) {
       throw new RuntimeException(
-          "Class " + functionClass.getName() + " does not implement "
+          "Class "
+              + functionClass.getName()
+              + " does not implement "
               + HttpFunction.class.getName());
     }
     Class<? extends HttpFunction> httpFunctionClass = functionClass.asSubclass(HttpFunction.class);
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
index 181354c1..9c94b92a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
@@ -10,9 +10,8 @@
 import java.util.logging.LogRecord;
 
 /**
- * A log handler that publishes log messages in a json format. This is StackDriver's
- * <a href="https://cloud.google.com/logging/docs/structured-logging">"structured
- * logging" format</a>.
+ * A log handler that publishes log messages in a json format. This is StackDriver's <a
+ * href="https://cloud.google.com/logging/docs/structured-logging">"structured logging" format</a>.
  */
 public final class JsonLogHandler extends Handler {
   private static final String SOURCE_LOCATION_KEY = "\"logging.googleapis.com/sourceLocation\": ";
@@ -50,8 +49,7 @@ private static void appendMessage(StringBuilder json, LogRecord record) {
     // unforgiving about commas and you can't have one just before }.
     json.append("\"message\": \"").append(escapeString(record.getMessage()));
     if (record.getThrown() != null) {
-      json.append("\\n")
-          .append(escapeString(getStackTraceAsString(record.getThrown())));
+      json.append("\\n").append(escapeString(getStackTraceAsString(record.getThrown())));
     }
     json.append("\"");
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index c87b376b..3256e989 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -89,35 +89,29 @@ public class Invoker {
   }
 
   private static class Options {
-    @Parameter(
-        description = "Port on which to listen for HTTP requests.",
-        names = "--port"
-    )
+    @Parameter(description = "Port on which to listen for HTTP requests.", names = "--port")
     private String port = System.getenv().getOrDefault("PORT", "8080");
 
     @Parameter(
         description = "Name of function class to execute when servicing incoming requests.",
-        names = "--target"
-    )
+        names = "--target")
     private String target = System.getenv().getOrDefault("FUNCTION_TARGET", "Function");
 
     @Parameter(
-        description = "List of files or directories where the compiled Java classes making up"
-            + " the function will be found. This functions like the -classpath option to the"
-            + " java command. It is a list of filenames separated by '${path.separator}'."
-            + " If an entry in the list names a directory then the class foo.bar.Baz will be looked"
-            + " for in foo${file.separator}bar${file.separator}Baz.class under that"
-            + " directory. If an entry in the list names a file and that file is a jar file then"
-            + " class foo.bar.Baz will be looked for in an entry foo/bar/Baz.class in that jar"
-            + " file. If an entry is a directory followed by '${file.separator}*' then every file"
-            + " in the directory whose name ends with '.jar' will be searched for classes.",
-        names = "--classpath"
-    )
+        description =
+            "List of files or directories where the compiled Java classes making up the function"
+                + " will be found. This functions like the -classpath option to the java command."
+                + " It is a list of filenames separated by '${path.separator}'. If an entry in the"
+                + " list names a directory then the class foo.bar.Baz will be looked for in"
+                + " foo${file.separator}bar${file.separator}Baz.class under that directory. If an"
+                + " entry in the list names a file and that file is a jar file then class"
+                + " foo.bar.Baz will be looked for in an entry foo/bar/Baz.class in that jar file."
+                + " If an entry is a directory followed by '${file.separator}*' then every file in"
+                + " the directory whose name ends with '.jar' will be searched for classes.",
+        names = "--classpath")
     private String classPath = null;
 
-    @Parameter(
-        names = "--help", help = true
-    )
+    @Parameter(names = "--help", help = true)
     private boolean help = false;
   }
 
@@ -134,9 +128,7 @@ static Optional<Invoker> makeInvoker(String... args) {
 
   static Optional<Invoker> makeInvoker(Map<String, String> environment, String... args) {
     Options options = new Options();
-    JCommander jCommander = JCommander.newBuilder()
-        .addObject(options)
-        .build();
+    JCommander jCommander = JCommander.newBuilder().addObject(options).build();
     try {
       jCommander.parse(args);
     } catch (ParameterException e) {
@@ -161,28 +153,27 @@ static Optional<Invoker> makeInvoker(Map<String, String> environment, String...
     Path standardFunctionJarPath = Paths.get("function/function.jar");
     Optional<String> functionClasspath =
         Arrays.asList(
-            options.classPath,
-            environment.get("FUNCTION_CLASSPATH"),
-            Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
+                options.classPath,
+                environment.get("FUNCTION_CLASSPATH"),
+                Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
             .stream()
             .filter(Objects::nonNull)
             .findFirst();
     ClassLoader functionClassLoader = makeClassLoader(functionClasspath);
     Invoker invoker =
         new Invoker(
-            port,
-            functionTarget,
-            environment.get("FUNCTION_SIGNATURE_TYPE"),
-            functionClassLoader);
+            port, functionTarget, environment.get("FUNCTION_SIGNATURE_TYPE"), functionClassLoader);
     return Optional.of(invoker);
   }
 
   private static void usage(JCommander jCommander) {
     StringBuilder usageBuilder = new StringBuilder();
     jCommander.getUsageFormatter().usage(usageBuilder);
-    String usage = usageBuilder.toString()
-        .replace("${file.separator}", File.separator)
-        .replace("${path.separator}", File.pathSeparator);
+    String usage =
+        usageBuilder
+            .toString()
+            .replace("${file.separator}", File.separator)
+            .replace("${path.separator}", File.pathSeparator);
     jCommander.getConsole().println(usage);
   }
 
@@ -256,10 +247,11 @@ public void startServer() throws Exception {
           servlet = BackgroundFunctionExecutor.forClass(functionClass);
           break;
         default:
-          String error = String.format(
-              "Function signature type %s is unknown; should be \"http\", \"event\","
-                  + " or \"cloudevent\"",
-              functionSignatureType);
+          String error =
+              String.format(
+                  "Function signature type %s is unknown; should be \"http\", \"event\","
+                      + " or \"cloudevent\"",
+                  functionSignatureType);
           throw new RuntimeException(error);
       }
     }
@@ -303,12 +295,13 @@ private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     if (maybeExecutor.isPresent()) {
       return maybeExecutor.get();
     }
-    String error = String.format(
-        "Could not determine function signature type from target %s. Either this should be"
-            + " a class implementing one of the interfaces in com.google.cloud.functions, or the"
-            + " environment variable FUNCTION_SIGNATURE_TYPE should be set to \"http\" or"
-            + " \"event\".",
-        functionTarget);
+    String error =
+        String.format(
+            "Could not determine function signature type from target %s. Either this should be a"
+                + " class implementing one of the interfaces in com.google.cloud.functions, or the"
+                + " environment variable FUNCTION_SIGNATURE_TYPE should be set to \"http\" or"
+                + " \"event\".",
+            functionTarget);
     throw new RuntimeException(error);
   }
 
@@ -343,13 +336,14 @@ private static List<URL> jarsIn(String dir) {
     }
     return stream
         .filter(p -> p.getFileName().toString().endsWith(".jar"))
-        .map(p -> {
-          try {
-            return p.toUri().toURL();
-          } catch (MalformedURLException e) {
-            throw new UncheckedIOException(e);
-          }
-        })
+        .map(
+            p -> {
+              try {
+                return p.toUri().toURL();
+              } catch (MalformedURLException e) {
+                throw new UncheckedIOException(e);
+              }
+            })
         .collect(toList());
   }
 
@@ -369,9 +363,9 @@ private static boolean isGcf() {
 
   /**
    * Wrapper that intercepts requests for {@code /favicon.ico} and {@code /robots.txt} and causes
-   * them to produce a 404 status. Otherwise they would be sent to the function code, like any
-   * other URL, meaning that someone testing their function by using a browser as an HTTP client
-   * can see two requests, one for {@code /favicon.ico} and one for {@code /} (or whatever).
+   * them to produce a 404 status. Otherwise they would be sent to the function code, like any other
+   * URL, meaning that someone testing their function by using a browser as an HTTP client can see
+   * two requests, one for {@code /favicon.ico} and one for {@code /} (or whatever).
    */
   private static class NotFoundHandler extends HandlerWrapper {
     static NotFoundHandler forServlet(ServletContextHandler servletHandler) {
@@ -384,8 +378,12 @@ static NotFoundHandler forServlet(ServletContextHandler servletHandler) {
         new HashSet<>(Arrays.asList("/favicon.ico", "/robots.txt"));
 
     @Override
-    public void handle(String target, Request baseRequest, HttpServletRequest request,
-        HttpServletResponse response) throws IOException, ServletException {
+    public void handle(
+        String target,
+        Request baseRequest,
+        HttpServletRequest request,
+        HttpServletResponse response)
+        throws IOException, ServletException {
       if (NOT_FOUND_PATHS.contains(request.getRequestURI())) {
         response.sendError(HttpStatus.NOT_FOUND_404, "Not Found");
       }
@@ -394,17 +392,17 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques
   }
 
   /**
-   * A loader that only loads GCF API classes. Those are classes whose package is exactly
-   * {@code com.google.cloud.functions}. The package can't be a subpackage, such as
-   * {@code com.google.cloud.functions.invoker}.
+   * A loader that only loads GCF API classes. Those are classes whose package is exactly {@code
+   * com.google.cloud.functions}. The package can't be a subpackage, such as {@code
+   * com.google.cloud.functions.invoker}.
    *
-   * <p>This loader allows us to load the classes from a user function, without making the
-   * runtime classes visible to them.  We will make this loader the parent of the
-   * {@link URLClassLoader} that loads the user code in order to filter out those runtime classes.
+   * <p>This loader allows us to load the classes from a user function, without making the runtime
+   * classes visible to them. We will make this loader the parent of the {@link URLClassLoader} that
+   * loads the user code in order to filter out those runtime classes.
    *
    * <p>The reason we do need to share the API classes between the runtime and the user function is
-   * so that the runtime can instantiate the function class and cast it to
-   * {@link com.google.cloud.functions.HttpFunction} or whatever.
+   * so that the runtime can instantiate the function class and cast it to {@link
+   * com.google.cloud.functions.HttpFunction} or whatever.
    */
   private static class OnlyApiClassLoader extends ClassLoader {
     private final ClassLoader runtimeClassLoader;
@@ -418,8 +416,8 @@ private static class OnlyApiClassLoader extends ClassLoader {
     protected Class<?> findClass(String name) throws ClassNotFoundException {
       String prefix = "com.google.cloud.functions.";
       if ((name.startsWith(prefix) && Character.isUpperCase(name.charAt(prefix.length())))
-              || name.startsWith("javax.servlet.")
-              || isCloudEventsApiClass(name)) {
+          || name.startsWith("javax.servlet.")
+          || isCloudEventsApiClass(name)) {
         return runtimeClassLoader.loadClass(name);
       }
       return super.findClass(name); // should throw ClassNotFoundException
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
index 21e7016c..24939fff 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/GcfEventsTest.java
@@ -40,27 +40,60 @@ public class GcfEventsTest {
   @Rule public Expect expect = Expect.create();
 
   private static final String[][] EVENT_DATA = {
-    {"storage.json", "google.cloud.storage.object.v1.finalized",
-      "//storage.googleapis.com/projects/_/buckets/some-bucket", "objects/folder/Test.cs"},
-    {"legacy_storage_change.json", "google.cloud.storage.object.v1.changed",
-      "//storage.googleapis.com/projects/_/buckets/sample-bucket", "objects/MyFile"},
-    {"firestore_simple.json", "google.cloud.firestore.document.v1.written",
+    {
+      "storage.json",
+      "google.cloud.storage.object.v1.finalized",
+      "//storage.googleapis.com/projects/_/buckets/some-bucket",
+      "objects/folder/Test.cs"
+    },
+    {
+      "legacy_storage_change.json",
+      "google.cloud.storage.object.v1.changed",
+      "//storage.googleapis.com/projects/_/buckets/sample-bucket",
+      "objects/MyFile"
+    },
+    {
+      "firestore_simple.json",
+      "google.cloud.firestore.document.v1.written",
       "//firestore.googleapis.com/projects/project-id/databases/(default)",
-      "documents/gcf-test/2Vm2mI1d0wIaK2Waj5to"},
-    {"pubsub_text.json", "google.cloud.pubsub.topic.v1.messagePublished",
-      "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
-    {"legacy_pubsub.json", "google.cloud.pubsub.topic.v1.messagePublished",
-      "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test", null},
-    {"firebase-db1.json", "google.firebase.database.ref.v1.written",
+      "documents/gcf-test/2Vm2mI1d0wIaK2Waj5to"
+    },
+    {
+      "pubsub_text.json",
+      "google.cloud.pubsub.topic.v1.messagePublished",
+      "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test",
+      null
+    },
+    {
+      "legacy_pubsub.json",
+      "google.cloud.pubsub.topic.v1.messagePublished",
+      "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test",
+      null
+    },
+    {
+      "firebase-db1.json",
+      "google.firebase.database.ref.v1.written",
       "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
-      "refs/gcf-test/xyz"},
-    {"firebase-db2.json", "google.firebase.database.ref.v1.written",
+      "refs/gcf-test/xyz"
+    },
+    {
+      "firebase-db2.json",
+      "google.firebase.database.ref.v1.written",
       "//firebasedatabase.googleapis.com/projects/_/locations/europe-west1/instances/my-project-id",
-      "refs/gcf-test/xyz"},
-    {"firebase-auth1.json", "google.firebase.auth.user.v1.created",
-      "//firebaseauth.googleapis.com/projects/my-project-id", "users/UUpby3s4spZre6kHsgVSPetzQ8l2"},
-    {"firebase-auth2.json", "google.firebase.auth.user.v1.deleted",
-      "//firebaseauth.googleapis.com/projects/my-project-id", "users/UUpby3s4spZre6kHsgVSPetzQ8l2"},
+      "refs/gcf-test/xyz"
+    },
+    {
+      "firebase-auth1.json",
+      "google.firebase.auth.user.v1.created",
+      "//firebaseauth.googleapis.com/projects/my-project-id",
+      "users/UUpby3s4spZre6kHsgVSPetzQ8l2"
+    },
+    {
+      "firebase-auth2.json",
+      "google.firebase.auth.user.v1.deleted",
+      "//firebaseauth.googleapis.com/projects/my-project-id",
+      "users/UUpby3s4spZre6kHsgVSPetzQ8l2"
+    },
   };
 
   @Test
@@ -71,7 +104,8 @@ public void convertGcfEvent() throws IOException {
     }
   }
 
-  private void convertGcfEvent(Event legacyEvent, String expectedType, String expectedSource, String expectedSubject) {
+  private void convertGcfEvent(
+      Event legacyEvent, String expectedType, String expectedSource, String expectedSubject) {
     CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
     expect.that(cloudEvent.getType()).isEqualTo(expectedType);
     expect.that(cloudEvent.getSource().toString()).isEqualTo(expectedSource);
@@ -95,11 +129,15 @@ public void checkAllProperties() throws IOException {
     assertThat(cloudEvent.getDataSchema()).isNull();
   }
 
-  // The next set of tests checks the result of using Gson to deserialize the JSON "data" field of the
-  // CloudEvent that we get from converting a legacy event. For the most part we're not testing much here,
-  // since the "data" field is essentially copied from the input legacy event. In some cases we adjust it,
+  // The next set of tests checks the result of using Gson to deserialize the JSON "data" field of
+  // the
+  // CloudEvent that we get from converting a legacy event. For the most part we're not testing much
+  // here,
+  // since the "data" field is essentially copied from the input legacy event. In some cases we
+  // adjust it,
   // though.
-  // Later, when we have support for handling these types properly in Java, we can change the tests to use
+  // Later, when we have support for handling these types properly in Java, we can change the tests
+  // to use
   // that. See https://github.com/googleapis/google-cloudevents-java
 
   @Test
@@ -107,12 +145,13 @@ public void storageData() throws IOException {
     Event legacyEvent = legacyEventForResource("storage.json");
     CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
     Map<String, Object> data = cloudEventDataJson(cloudEvent);
-    assertThat(data).containsAtLeast(
-        "bucket", "some-bucket",
-        "timeCreated", "2020-04-23T07:38:57.230Z",
-        "generation", "1587627537231057",
-        "metageneration", "1",
-        "size", "352");
+    assertThat(data)
+        .containsAtLeast(
+            "bucket", "some-bucket",
+            "timeCreated", "2020-04-23T07:38:57.230Z",
+            "generation", "1587627537231057",
+            "metageneration", "1",
+            "size", "352");
   }
 
   @Test
@@ -120,26 +159,33 @@ public void firestoreSimpleData() throws IOException {
     Event legacyEvent = legacyEventForResource("firestore_simple.json");
     CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
     Map<String, Object> data = cloudEventDataJson(cloudEvent);
-    Map<String, Object> expectedValue = Map.of(
-        "name", "projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
-        "createTime", "2020-04-23T09:58:53.211035Z",
-        "updateTime", "2020-04-23T12:00:27.247187Z",
-        "fields", Map.of(
-            "another test", Map.of("stringValue", "asd"),
-            "count", Map.of("integerValue", "4"),
-            "foo", Map.of("stringValue", "bar")));
-    Map<String, Object> expectedOldValue = Map.of(
-        "name", "projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
-        "createTime", "2020-04-23T09:58:53.211035Z",
-        "updateTime", "2020-04-23T12:00:27.247187Z",
-        "fields", Map.of(
-            "another test", Map.of("stringValue", "asd"),
-            "count", Map.of("integerValue", "3"),
-            "foo", Map.of("stringValue", "bar")));
-    assertThat(data).containsAtLeast(
-        "value", expectedValue,
-        "oldValue", expectedOldValue,
-        "updateMask", Map.of("fieldPaths", List.of("count")));
+    Map<String, Object> expectedValue =
+        Map.of(
+            "name",
+                "projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+            "createTime", "2020-04-23T09:58:53.211035Z",
+            "updateTime", "2020-04-23T12:00:27.247187Z",
+            "fields",
+                Map.of(
+                    "another test", Map.of("stringValue", "asd"),
+                    "count", Map.of("integerValue", "4"),
+                    "foo", Map.of("stringValue", "bar")));
+    Map<String, Object> expectedOldValue =
+        Map.of(
+            "name",
+                "projects/project-id/databases/(default)/documents/gcf-test/2Vm2mI1d0wIaK2Waj5to",
+            "createTime", "2020-04-23T09:58:53.211035Z",
+            "updateTime", "2020-04-23T12:00:27.247187Z",
+            "fields",
+                Map.of(
+                    "another test", Map.of("stringValue", "asd"),
+                    "count", Map.of("integerValue", "3"),
+                    "foo", Map.of("stringValue", "bar")));
+    assertThat(data)
+        .containsAtLeast(
+            "value", expectedValue,
+            "oldValue", expectedOldValue,
+            "updateMask", Map.of("fieldPaths", List.of("count")));
   }
 
   @Test
@@ -149,26 +195,42 @@ public void firestoreComplexData() throws IOException {
     Map<String, Object> data = cloudEventDataJson(cloudEvent);
     Map<?, ?> value = (Map<?, ?>) data.get("value");
     Map<?, ?> fields = (Map<?, ?>) value.get("fields");
-    Map<String, Object> expectedFields = Map.of(
-        "arrayValue", Map.of("arrayValue",
-            Map.of("values",
-                List.of(Map.of("integerValue", "1"), Map.of("integerValue", "2")))),
-        "booleanValue", Map.of("booleanValue", true),
-        "geoPointValue", Map.of("geoPointValue", Map.of("latitude", 51.4543, "longitude", -0.9781)),
-        "intValue", Map.of("integerValue", "50"),
-        "doubleValue", Map.of("doubleValue", 5.5),
-        "nullValue", Collections.singletonMap("nullValue", null),
-        "referenceValue", Map.of("referenceValue",
-            "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"),
-        "stringValue", Map.of("stringValue", "text"),
-        "timestampValue", Map.of("timestampValue", "2020-04-23T14:23:53.241Z"),
-        "mapValue", Map.of("mapValue",
-            Map.of("fields",
-                Map.of("field1", Map.of("stringValue", "x"),
-                    "field2", Map.of("arrayValue",
-                        Map.of("values",
-                            List.of(Map.of("stringValue", "x"), Map.of("integerValue", "1")))))))
-    );
+    Map<String, Object> expectedFields =
+        Map.of(
+            "arrayValue",
+                Map.of(
+                    "arrayValue",
+                    Map.of(
+                        "values",
+                        List.of(Map.of("integerValue", "1"), Map.of("integerValue", "2")))),
+            "booleanValue", Map.of("booleanValue", true),
+            "geoPointValue",
+                Map.of("geoPointValue", Map.of("latitude", 51.4543, "longitude", -0.9781)),
+            "intValue", Map.of("integerValue", "50"),
+            "doubleValue", Map.of("doubleValue", 5.5),
+            "nullValue", Collections.singletonMap("nullValue", null),
+            "referenceValue",
+                Map.of(
+                    "referenceValue",
+                    "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"),
+            "stringValue", Map.of("stringValue", "text"),
+            "timestampValue", Map.of("timestampValue", "2020-04-23T14:23:53.241Z"),
+            "mapValue",
+                Map.of(
+                    "mapValue",
+                    Map.of(
+                        "fields",
+                        Map.of(
+                            "field1",
+                            Map.of("stringValue", "x"),
+                            "field2",
+                            Map.of(
+                                "arrayValue",
+                                Map.of(
+                                    "values",
+                                    List.of(
+                                        Map.of("stringValue", "x"),
+                                        Map.of("integerValue", "1"))))))));
     assertThat(fields).containsExactlyEntriesIn(expectedFields);
   }
 
@@ -213,16 +275,19 @@ public void pubSubWrapping() throws IOException {
     Event legacyEvent = legacyEventForResource("legacy_pubsub.json");
     CloudEvent cloudEvent = GcfEvents.convertToCloudEvent(legacyEvent);
     assertThat(new String(cloudEvent.getData().toBytes(), UTF_8))
-        .isEqualTo("{\"message\":{\"@type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\","
-            + "\"attributes\":{\"attribute1\":\"value1\"},"
-            + "\"data\":\"VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl\","
-            + "\"messageId\":\"1215011316659232\","
-            + "\"publishTime\":\"2020-05-18T12:13:19.209Z\"}}");
+        .isEqualTo(
+            "{\"message\":{\"@type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\","
+                + "\"attributes\":{\"attribute1\":\"value1\"},"
+                + "\"data\":\"VGhpcyBpcyBhIHNhbXBsZSBtZXNzYWdl\","
+                + "\"messageId\":\"1215011316659232\","
+                + "\"publishTime\":\"2020-05-18T12:13:19.209Z\"}}");
   }
 
-  // Checks that a Firestore event correctly gets an extra "wildcards" property in its CloudEvent data
+  // Checks that a Firestore event correctly gets an extra "wildcards" property in its CloudEvent
+  // data
   // reflecting the "params" field in the legacy event.
-  // This test is currently ignored because the final representation of the "params" field is in flux.
+  // This test is currently ignored because the final representation of the "params" field is in
+  // flux.
   @Test
   @Ignore
   public void firestoreWildcards() throws IOException {
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 051358f8..7a2bee14 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -96,7 +96,9 @@ private static String sampleLegacyEvent(File snoopFile) {
         + "  \"data\": {\n"
         + "    \"a\": 2,\n"
         + "    \"b\": 3,\n"
-        + "    \"targetFile\": \"" + snoopFile + "\""
+        + "    \"targetFile\": \""
+        + snoopFile
+        + "\""
         + "  },\n"
         + "  \"context\": {\n"
         + "    \"eventId\": \"B234-1234-1234\",\n"
@@ -241,7 +243,8 @@ private static String fullTarget(String nameWithoutPackage) {
 
   @Test
   public void helloWorld() throws Exception {
-    testHttpFunction(fullTarget("HelloWorld"),
+    testHttpFunction(
+        fullTarget("HelloWorld"),
         ImmutableList.of(
             TestCase.builder().setExpectedResponseText("hello\n").build(),
             FAVICON_TEST_CASE,
@@ -265,7 +268,6 @@ public void exceptionHttp() throws Exception {
                 .build()));
   }
 
-
   @Test
   public void exceptionBackground() throws Exception {
     String exceptionExpectedOutput =
@@ -312,9 +314,10 @@ public void echo() throws Exception {
   @Test
   public void echoUrl() throws Exception {
     String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
-    List<TestCase> testCases = Arrays.stream(testUrls)
-        .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
-        .collect(toList());
+    List<TestCase> testCases =
+        Arrays.stream(testUrls)
+            .map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
+            .collect(toList());
     testHttpFunction(fullTarget("EchoUrl"), testCases);
   }
 
@@ -327,10 +330,7 @@ public void stackDriverLogging() throws Exception {
             + " \"method\": \"service\"},"
             + " \"message\": \"blim\"}";
     TestCase simpleTestCase =
-        TestCase.builder()
-            .setUrl("/?message=blim")
-            .setExpectedOutput(simpleExpectedOutput)
-            .build();
+        TestCase.builder().setUrl("/?message=blim").setExpectedOutput(simpleExpectedOutput).build();
     String quotingExpectedOutput = "\"message\": \"foo\\nbar\\\"";
     TestCase quotingTestCase =
         TestCase.builder()
@@ -362,7 +362,8 @@ private static int getJavaVersion() {
       if (dot != -1) {
         version = version.substring(0, dot);
       }
-    } return Integer.parseInt(version);
+    }
+    return Integer.parseInt(version);
   }
 
   @Test
@@ -387,27 +388,31 @@ private void backgroundTest(String target) throws Exception {
     JsonObject expectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
     // We don't currently put anything in the attributes() map for legacy events.
     expectedJson.add("attributes", new JsonObject());
-    TestCase gcfTestCase = TestCase.builder()
-        .setRequestText(gcfRequestText)
-        .setSnoopFile(snoopFile)
-        .setExpectedJson(expectedJson)
-        .build();
+    TestCase gcfTestCase =
+        TestCase.builder()
+            .setRequestText(gcfRequestText)
+            .setSnoopFile(snoopFile)
+            .setExpectedJson(expectedJson)
+            .build();
 
     // A CloudEvent using the "structured content mode", where both the metadata and the payload
     // are in the body of the HTTP request.
-    EventFormat jsonFormat = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
-    String cloudEventRequestText = new String(jsonFormat.serialize(sampleCloudEvent(snoopFile)), UTF_8);
+    EventFormat jsonFormat =
+        EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    String cloudEventRequestText =
+        new String(jsonFormat.serialize(sampleCloudEvent(snoopFile)), UTF_8);
     // For CloudEvents, we don't currently populate Context#getResource with anything interesting,
     // so we excise that from the expected text we would have with legacy events.
     JsonObject cloudEventExpectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
     cloudEventExpectedJson.getAsJsonObject("context").add("resource", new JsonObject());
     cloudEventExpectedJson.add("attributes", expectedCloudEventAttributes());
-    TestCase cloudEventsStructuredTestCase = TestCase.builder()
-        .setSnoopFile(snoopFile)
-        .setRequestText(cloudEventRequestText)
-        .setHttpContentType("application/cloudevents+json; charset=utf-8")
-        .setExpectedJson(cloudEventExpectedJson)
-        .build();
+    TestCase cloudEventsStructuredTestCase =
+        TestCase.builder()
+            .setSnoopFile(snoopFile)
+            .setRequestText(cloudEventRequestText)
+            .setHttpContentType("application/cloudevents+json; charset=utf-8")
+            .setExpectedJson(cloudEventExpectedJson)
+            .build();
 
     // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
     // payload is the body of the HTTP request.
@@ -415,13 +420,14 @@ private void backgroundTest(String target) throws Exception {
     AtomicReference<byte[]> bodyRef = new AtomicReference<>();
     HttpMessageFactory.createWriter(headers::put, bodyRef::set)
         .writeBinary(sampleCloudEvent(snoopFile));
-    TestCase cloudEventsBinaryTestCase = TestCase.builder()
-        .setSnoopFile(snoopFile)
-        .setRequestText(new String(bodyRef.get(), UTF_8))
-        .setHttpContentType(headers.get("Content-Type"))
-        .setHttpHeaders(ImmutableMap.copyOf(headers))
-        .setExpectedJson(cloudEventExpectedJson)
-        .build();
+    TestCase cloudEventsBinaryTestCase =
+        TestCase.builder()
+            .setSnoopFile(snoopFile)
+            .setRequestText(new String(bodyRef.get(), UTF_8))
+            .setHttpContentType(headers.get("Content-Type"))
+            .setHttpHeaders(ImmutableMap.copyOf(headers))
+            .setExpectedJson(cloudEventExpectedJson)
+            .build();
 
     backgroundTest(
         SignatureType.BACKGROUND,
@@ -429,23 +435,27 @@ private void backgroundTest(String target) throws Exception {
         ImmutableList.of(gcfTestCase, cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
   }
 
-  /** Tests a CloudEvent being handled by a CloudEvent handler (no translation to or from legacy). */
+  /**
+   * Tests a CloudEvent being handled by a CloudEvent handler (no translation to or from legacy).
+   */
   @Test
   public void nativeCloudEvent() throws Exception {
     File snoopFile = snoopFile();
     CloudEvent cloudEvent = sampleCloudEvent(snoopFile);
-    EventFormat jsonFormat = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    EventFormat jsonFormat =
+        EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
     String cloudEventJson = new String(jsonFormat.serialize(cloudEvent), UTF_8);
 
     // A CloudEvent using the "structured content mode", where both the metadata and the payload
     // are in the body of the HTTP request.
     JsonObject cloudEventJsonObject = new Gson().fromJson(cloudEventJson, JsonObject.class);
-    TestCase cloudEventsStructuredTestCase = TestCase.builder()
-        .setSnoopFile(snoopFile)
-        .setRequestText(cloudEventJson)
-        .setHttpContentType("application/cloudevents+json; charset=utf-8")
-        .setExpectedJson(cloudEventJsonObject)
-        .build();
+    TestCase cloudEventsStructuredTestCase =
+        TestCase.builder()
+            .setSnoopFile(snoopFile)
+            .setRequestText(cloudEventJson)
+            .setHttpContentType("application/cloudevents+json; charset=utf-8")
+            .setExpectedJson(cloudEventJsonObject)
+            .build();
 
     // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
     // payload is the body of the HTTP request.
@@ -453,13 +463,14 @@ public void nativeCloudEvent() throws Exception {
     AtomicReference<byte[]> bodyRef = new AtomicReference<>();
     HttpMessageFactory.createWriter(headers::put, bodyRef::set)
         .writeBinary(sampleCloudEvent(snoopFile));
-    TestCase cloudEventsBinaryTestCase = TestCase.builder()
-        .setSnoopFile(snoopFile)
-        .setRequestText(new String(bodyRef.get(), UTF_8))
-        .setHttpContentType(headers.get("Content-Type"))
-        .setHttpHeaders(ImmutableMap.copyOf(headers))
-        .setExpectedJson(cloudEventJsonObject)
-        .build();
+    TestCase cloudEventsBinaryTestCase =
+        TestCase.builder()
+            .setSnoopFile(snoopFile)
+            .setRequestText(new String(bodyRef.get(), UTF_8))
+            .setHttpContentType(headers.get("Content-Type"))
+            .setHttpHeaders(ImmutableMap.copyOf(headers))
+            .setExpectedJson(cloudEventJsonObject)
+            .build();
 
     backgroundTest(
         SignatureType.CLOUD_EVENT,
@@ -478,7 +489,8 @@ public void nested() throws Exception {
 
   @Test
   public void packageless() throws Exception {
-    testHttpFunction("PackagelessHelloWorld",
+    testHttpFunction(
+        "PackagelessHelloWorld",
         ImmutableList.of(TestCase.builder().setExpectedResponseText("hello, world\n").build()));
   }
 
@@ -489,8 +501,9 @@ public void multipart() throws Exception {
     multiPartProvider.addFieldPart("bytes", new BytesContentProvider(bytes), new HttpFields());
     String string = "1234567890";
     multiPartProvider.addFieldPart("string", new StringContentProvider(string), new HttpFields());
-    String expectedResponse = "part bytes type application/octet-stream length 17\n"
-        + "part string type text/plain;charset=UTF-8 length 10\n";
+    String expectedResponse =
+        "part bytes type application/octet-stream length 17\n"
+            + "part string type text/plain;charset=UTF-8 length 10\n";
     testHttpFunction(
         fullTarget("Multipart"),
         ImmutableList.of(
@@ -512,13 +525,15 @@ private String functionJarString() throws IOException {
     Path functionJarTargetDir = Paths.get("../testfunction/target");
     Pattern functionJarPattern =
         Pattern.compile("java-function-invoker-testfunction-.*-tests\\.jar");
-    List<Path> functionJars = Files.list(functionJarTargetDir)
-        .map(path -> path.getFileName().toString())
-        .filter(s -> functionJarPattern.matcher(s).matches())
-        .map(s -> functionJarTargetDir.resolve(s))
-        .collect(toList());
+    List<Path> functionJars =
+        Files.list(functionJarTargetDir)
+            .map(path -> path.getFileName().toString())
+            .filter(s -> functionJarPattern.matcher(s).matches())
+            .map(s -> functionJarTargetDir.resolve(s))
+            .collect(toList());
     assertWithMessage("Number of jars in %s matching %s", functionJarTargetDir, functionJarPattern)
-        .that(functionJars).hasSize(1);
+        .that(functionJars)
+        .hasSize(1);
     return Iterables.getOnlyElement(functionJars).toString();
   }
 
@@ -530,10 +545,11 @@ private String functionJarString() throws IOException {
    */
   @Test
   public void classpathOptionHttp() throws Exception {
-    TestCase testCase = TestCase.builder()
-        .setUrl("/?class=" + INTERNAL_CLASS.getName())
-        .setExpectedResponseText("OK")
-        .build();
+    TestCase testCase =
+        TestCase.builder()
+            .setUrl("/?class=" + INTERNAL_CLASS.getName())
+            .setExpectedResponseText("OK")
+            .build();
     testFunction(
         SignatureType.HTTP,
         "com.example.functionjar.Foreground",
@@ -574,9 +590,12 @@ private void backgroundTest(
       Gson gson = new Gson();
       JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
       JsonObject expectedJson = testCase.expectedJson().get();
-      expect.withMessage(
-              "Testing %s with %s\nGOT %s\nNOT %s", functionTarget, testCase, snoopedJson, expectedJson)
-          .that(snoopedJson).isEqualTo(expectedJson);
+      expect
+          .withMessage(
+              "Testing %s with %s\nGOT %s\nNOT %s",
+              functionTarget, testCase, snoopedJson, expectedJson)
+          .that(snoopedJson)
+          .isEqualTo(expectedJson);
     }
   }
 
@@ -597,7 +616,8 @@ private void testFunction(
       SignatureType signatureType,
       String target,
       ImmutableList<String> extraArgs,
-      List<TestCase> testCases) throws Exception {
+      List<TestCase> testCases)
+      throws Exception {
     ServerProcess serverProcess = startServer(signatureType, target, extraArgs);
     try {
       HttpClient httpClient = new HttpClient();
@@ -606,17 +626,21 @@ private void testFunction(
         testCase.snoopFile().ifPresent(File::delete);
         String uri = "http://localhost:" + serverPort + testCase.url();
         Request request = httpClient.POST(uri);
-        testCase.httpContentType().ifPresent(
-            contentType -> request.header(HttpHeader.CONTENT_TYPE, contentType));
+        testCase
+            .httpContentType()
+            .ifPresent(contentType -> request.header(HttpHeader.CONTENT_TYPE, contentType));
         testCase.httpHeaders().forEach((header, value) -> request.header(header, value));
         request.content(testCase.requestContent());
         ContentResponse response = request.send();
         expect
             .withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
-            .that(response.getStatus()).isEqualTo(testCase.expectedResponseCode());
-        testCase.expectedResponseText()
+            .that(response.getStatus())
+            .isEqualTo(testCase.expectedResponseCode());
+        testCase
+            .expectedResponseText()
             .ifPresent(text -> expect.that(response.getContentAsString()).isEqualTo(text));
-        testCase.expectedContentType()
+        testCase
+            .expectedContentType()
             .ifPresent(type -> expect.that(response.getMediaType()).isEqualTo(type));
         if (testCase.snoopFile().isPresent()) {
           checkSnoopFile(testCase);
@@ -626,7 +650,8 @@ private void testFunction(
       serverProcess.close();
     }
     for (TestCase testCase : testCases) {
-      testCase.expectedOutput()
+      testCase
+          .expectedOutput()
           .ifPresent(output -> expect.that(serverProcess.output()).contains(output));
     }
     // Wait for the output monitor task to terminate. If it threw an exception, we will get an
@@ -697,23 +722,28 @@ private ServerProcess startServer(
     assertThat(javaCommand.exists()).isTrue();
     String myClassPath = System.getProperty("java.class.path");
     assertThat(myClassPath).isNotNull();
-    ImmutableList<String> command = ImmutableList.<String>builder()
-        .add(javaCommand.toString(), "-classpath", myClassPath, Invoker.class.getName())
-        .addAll(extraArgs)
-        .build();
-    ProcessBuilder processBuilder = new ProcessBuilder()
-        .command(command)
-        .redirectErrorStream(true);
-    Map<String, String> environment = ImmutableMap.of("PORT", String.valueOf(serverPort),
-        "K_SERVICE", "test-function",
-        "FUNCTION_SIGNATURE_TYPE", signatureType.toString(),
-        "FUNCTION_TARGET", target);
+    ImmutableList<String> command =
+        ImmutableList.<String>builder()
+            .add(javaCommand.toString(), "-classpath", myClassPath, Invoker.class.getName())
+            .addAll(extraArgs)
+            .build();
+    ProcessBuilder processBuilder = new ProcessBuilder().command(command).redirectErrorStream(true);
+    Map<String, String> environment =
+        ImmutableMap.of(
+            "PORT",
+            String.valueOf(serverPort),
+            "K_SERVICE",
+            "test-function",
+            "FUNCTION_SIGNATURE_TYPE",
+            signatureType.toString(),
+            "FUNCTION_TARGET",
+            target);
     processBuilder.environment().putAll(environment);
     Process serverProcess = processBuilder.start();
     CountDownLatch ready = new CountDownLatch(1);
     StringBuilder output = new StringBuilder();
-    Future<?> outputMonitorResult = EXECUTOR.submit(
-        () -> monitorOutput(serverProcess.getInputStream(), ready, output));
+    Future<?> outputMonitorResult =
+        EXECUTOR.submit(() -> monitorOutput(serverProcess.getInputStream(), ready, output));
     boolean serverReady = ready.await(5, TimeUnit.SECONDS);
     if (!serverReady) {
       serverProcess.destroy();
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
index 12d98090..9ef51b2a 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
@@ -63,6 +63,7 @@ public class HttpTest {
           + "To marry two wives at a time.\n";
 
   private static final byte[] RANDOM_BYTES = new byte[1024];
+
   static {
     new Random().nextBytes(RANDOM_BYTES);
   }
@@ -111,10 +112,10 @@ private interface HttpRequestTest {
   }
 
   /**
-   * Tests methods on the {@link HttpRequest} object while the request is being serviced. We are
-   * not guaranteed that the underlying {@link HttpServletRequest} object will still be valid when
-   * the request completes, and in fact in Jetty it isn't. So we perform the checks in the context
-   * of the servlet, and report any exception back to the test method.
+   * Tests methods on the {@link HttpRequest} object while the request is being serviced. We are not
+   * guaranteed that the underlying {@link HttpServletRequest} object will still be valid when the
+   * request completes, and in fact in Jetty it isn't. So we perform the checks in the context of
+   * the servlet, and report any exception back to the test method.
    */
   @Test
   public void httpRequestMethods() throws Exception {
@@ -133,66 +134,70 @@ private void httpRequestMethods(
     httpClient.start();
     String uri = "http://localhost:" + serverPort + "/foo/bar?baz=buh&baz=xxx&blim=blam&baz=what";
     HttpRequestTest[] tests = {
-        request -> assertThat(request.getMethod()).isEqualTo("POST"),
-        request -> assertThat(request.getMethod()).isEqualTo("POST"),
-        request -> assertThat(request.getUri()).isEqualTo(uri),
-        request -> assertThat(request.getPath()).isEqualTo("/foo/bar"),
-        request -> assertThat(request.getQuery()).hasValue("baz=buh&baz=xxx&blim=blam&baz=what"),
-        request -> {
-          Map<String, List<String>> expectedQueryParameters = new TreeMap<>();
-          expectedQueryParameters.put("baz", Arrays.asList("buh", "xxx", "what"));
-          expectedQueryParameters.put("blim", Arrays.asList("blam"));
-          assertThat(request.getQueryParameters()).isEqualTo(expectedQueryParameters);
-        },
-        request -> assertThat(request.getFirstQueryParameter("baz")).hasValue("buh"),
-        request -> assertThat(request.getFirstQueryParameter("something")).isEmpty(),
-        request -> assertThat(request.getContentType().get()).ignoringCase()
-            .isEqualTo("text/plain; charset=utf-8"),
-        request -> assertThat(request.getContentLength()).isEqualTo(TEST_BODY.length()),
-        request -> assertThat(request.getCharacterEncoding()).isPresent(),
-        request -> assertThat(request.getCharacterEncoding().get()).ignoringCase()
-            .isEqualTo("utf-8"),
-        request -> {
-          try (BufferedReader reader = request.getReader()) {
-            validateReader(reader);
-            assertThat(request.getReader()).isSameInstanceAs(reader);
-          }
-          try {
-            request.getInputStream();
-            fail("Did not get expected exception");
-          } catch (IllegalStateException expected) {
-          }
-        },
-        request -> {
-          try (InputStream inputStream = request.getInputStream();
-              BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
-            validateReader(reader);
-            assertThat(request.getInputStream()).isSameInstanceAs(inputStream);
-          }
-        },
-        request -> {
-          Map<String, List<String>> expectedHeaders = new TreeMap<>();
-          expectedHeaders.put(HttpHeader.CONTENT_LENGTH.asString(),
-              Arrays.asList(String.valueOf(TEST_BODY.length())));
-          expectedHeaders.put("foo", Arrays.asList("bar", "baz"));
-          assertThat(request.getHeaders()).containsAtLeastEntriesIn(expectedHeaders);
-        },
-        request -> assertThat(request.getFirstHeader("foo")).hasValue("bar"),
-        request -> {
-          try {
-            request.getParts();
-            fail("Did not get expected exception");
-          } catch (IllegalStateException expected) {
-          }
+      request -> assertThat(request.getMethod()).isEqualTo("POST"),
+      request -> assertThat(request.getMethod()).isEqualTo("POST"),
+      request -> assertThat(request.getUri()).isEqualTo(uri),
+      request -> assertThat(request.getPath()).isEqualTo("/foo/bar"),
+      request -> assertThat(request.getQuery()).hasValue("baz=buh&baz=xxx&blim=blam&baz=what"),
+      request -> {
+        Map<String, List<String>> expectedQueryParameters = new TreeMap<>();
+        expectedQueryParameters.put("baz", Arrays.asList("buh", "xxx", "what"));
+        expectedQueryParameters.put("blim", Arrays.asList("blam"));
+        assertThat(request.getQueryParameters()).isEqualTo(expectedQueryParameters);
+      },
+      request -> assertThat(request.getFirstQueryParameter("baz")).hasValue("buh"),
+      request -> assertThat(request.getFirstQueryParameter("something")).isEmpty(),
+      request ->
+          assertThat(request.getContentType().get())
+              .ignoringCase()
+              .isEqualTo("text/plain; charset=utf-8"),
+      request -> assertThat(request.getContentLength()).isEqualTo(TEST_BODY.length()),
+      request -> assertThat(request.getCharacterEncoding()).isPresent(),
+      request -> assertThat(request.getCharacterEncoding().get()).ignoringCase().isEqualTo("utf-8"),
+      request -> {
+        try (BufferedReader reader = request.getReader()) {
+          validateReader(reader);
+          assertThat(request.getReader()).isSameInstanceAs(reader);
+        }
+        try {
+          request.getInputStream();
+          fail("Did not get expected exception");
+        } catch (IllegalStateException expected) {
         }
+      },
+      request -> {
+        try (InputStream inputStream = request.getInputStream();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+          validateReader(reader);
+          assertThat(request.getInputStream()).isSameInstanceAs(inputStream);
+        }
+      },
+      request -> {
+        Map<String, List<String>> expectedHeaders = new TreeMap<>();
+        expectedHeaders.put(
+            HttpHeader.CONTENT_LENGTH.asString(),
+            Arrays.asList(String.valueOf(TEST_BODY.length())));
+        expectedHeaders.put("foo", Arrays.asList("bar", "baz"));
+        assertThat(request.getHeaders()).containsAtLeastEntriesIn(expectedHeaders);
+      },
+      request -> assertThat(request.getFirstHeader("foo")).hasValue("bar"),
+      request -> {
+        try {
+          request.getParts();
+          fail("Did not get expected exception");
+        } catch (IllegalStateException expected) {
+        }
+      }
     };
     for (HttpRequestTest test : tests) {
       testReference.set(test);
-      Request request = httpClient.POST(uri)
-          .header(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8")
-          .header("foo", "bar")
-          .header("foo", "baz")
-          .content(new StringContentProvider(TEST_BODY));
+      Request request =
+          httpClient
+              .POST(uri)
+              .header(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8")
+              .header("foo", "bar")
+              .header("foo", "baz")
+              .content(new StringContentProvider(TEST_BODY));
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());
@@ -204,14 +209,15 @@ public void emptyRequest() throws Exception {
     HttpClient httpClient = new HttpClient();
     httpClient.start();
     String uri = "http://localhost:" + serverPort;
-    HttpRequestTest test = request -> {
-      assertThat(request.getUri()).isEqualTo(uri + "/");
-      assertThat(request.getPath()).isEqualTo("/");
-      assertThat(request.getQuery()).isEmpty();
-      assertThat(request.getQueryParameters()).isEmpty();
-      assertThat(request.getContentType()).isEmpty();
-      assertThat(request.getContentLength()).isEqualTo(0L);
-    };
+    HttpRequestTest test =
+        request -> {
+          assertThat(request.getUri()).isEqualTo(uri + "/");
+          assertThat(request.getPath()).isEqualTo("/");
+          assertThat(request.getQuery()).isEmpty();
+          assertThat(request.getQueryParameters()).isEmpty();
+          assertThat(request.getContentType()).isEmpty();
+          assertThat(request.getContentLength()).isEqualTo(0L);
+        };
     AtomicReference<Throwable> exceptionReference = new AtomicReference<>();
     AtomicReference<HttpRequestTest> testReference = new AtomicReference<>(test);
     HttpRequestServlet testServlet = new HttpRequestServlet(testReference, exceptionReference);
@@ -245,39 +251,38 @@ public void multiPartRequest() throws Exception {
     assertThat(bytesHttpFields.getValuesList("foo")).containsExactly("baz", "buh");
     multiPart.addFilePart(
         "binary", "/tmp/binary.x", new BytesContentProvider(RANDOM_BYTES), bytesHttpFields);
-    HttpRequestTest test = request -> {
-      // The Content-Type header will also have a boundary=something attribute.
-      assertThat(request.getContentType().get()).startsWith("multipart/form-data");
-      assertThat(request.getParts().keySet()).containsExactly("text", "binary");
-      HttpPart textPart = request.getParts().get("text");
-      assertThat(textPart.getFileName()).isEmpty();
-      assertThat(textPart.getContentLength()).isEqualTo(TEST_BODY.length());
-      assertThat(textPart.getContentType().get()).startsWith("text/plain");
-      assertThat(textPart.getCharacterEncoding()).isPresent();
-      assertThat(textPart.getCharacterEncoding().get()).ignoringCase().isEqualTo("utf-8");
-      assertThat(textPart.getHeaders()).containsAtLeast("foo", Arrays.asList("bar"));
-      assertThat(textPart.getFirstHeader("foo")).hasValue("bar");
-      validateReader(textPart.getReader());
-      HttpPart bytesPart = request.getParts().get("binary");
-      assertThat(bytesPart.getFileName()).hasValue("/tmp/binary.x");
-      assertThat(bytesPart.getContentLength()).isEqualTo(RANDOM_BYTES.length);
-      assertThat(bytesPart.getContentType()).hasValue("application/octet-stream");
-      // We only see ["buh"] here, not ["baz", "buh"], apparently due to a Jetty bug.
-      // Repeated headers on multi-part content are not a big problem anyway.
-      List<String> foos = bytesPart.getHeaders().get("foo");
-      assertThat(foos).contains("buh");
-      byte[] bytes = new byte[RANDOM_BYTES.length];
-      try (InputStream inputStream = bytesPart.getInputStream()) {
-        assertThat(inputStream.read(bytes)).isEqualTo(bytes.length);
-        assertThat(inputStream.read()).isEqualTo(-1);
-        assertThat(bytes).isEqualTo(RANDOM_BYTES);
-      }
-   };
+    HttpRequestTest test =
+        request -> {
+          // The Content-Type header will also have a boundary=something attribute.
+          assertThat(request.getContentType().get()).startsWith("multipart/form-data");
+          assertThat(request.getParts().keySet()).containsExactly("text", "binary");
+          HttpPart textPart = request.getParts().get("text");
+          assertThat(textPart.getFileName()).isEmpty();
+          assertThat(textPart.getContentLength()).isEqualTo(TEST_BODY.length());
+          assertThat(textPart.getContentType().get()).startsWith("text/plain");
+          assertThat(textPart.getCharacterEncoding()).isPresent();
+          assertThat(textPart.getCharacterEncoding().get()).ignoringCase().isEqualTo("utf-8");
+          assertThat(textPart.getHeaders()).containsAtLeast("foo", Arrays.asList("bar"));
+          assertThat(textPart.getFirstHeader("foo")).hasValue("bar");
+          validateReader(textPart.getReader());
+          HttpPart bytesPart = request.getParts().get("binary");
+          assertThat(bytesPart.getFileName()).hasValue("/tmp/binary.x");
+          assertThat(bytesPart.getContentLength()).isEqualTo(RANDOM_BYTES.length);
+          assertThat(bytesPart.getContentType()).hasValue("application/octet-stream");
+          // We only see ["buh"] here, not ["baz", "buh"], apparently due to a Jetty bug.
+          // Repeated headers on multi-part content are not a big problem anyway.
+          List<String> foos = bytesPart.getHeaders().get("foo");
+          assertThat(foos).contains("buh");
+          byte[] bytes = new byte[RANDOM_BYTES.length];
+          try (InputStream inputStream = bytesPart.getInputStream()) {
+            assertThat(inputStream.read(bytes)).isEqualTo(bytes.length);
+            assertThat(inputStream.read()).isEqualTo(-1);
+            assertThat(bytes).isEqualTo(RANDOM_BYTES);
+          }
+        };
     try (SimpleServer server = new SimpleServer(testServlet)) {
       testReference.set(test);
-      Request request = httpClient.POST(uri)
-          .header("foo", "oof")
-          .content(multiPart);
+      Request request = httpClient.POST(uri).header("foo", "oof").content(multiPart);
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());
@@ -311,9 +316,9 @@ private interface HttpResponseTest {
   }
 
   /**
-   * Tests interactions with the {@link HttpResponse} object while the request is still ongoing.
-   * For example, if we append a header then we should see that header in
-   * {@link HttpResponse#getHeaders()}.
+   * Tests interactions with the {@link HttpResponse} object while the request is still ongoing. For
+   * example, if we append a header then we should see that header in {@link
+   * HttpResponse#getHeaders()}.
    */
   @Test
   public void httpResponseSetAndGet() throws Exception {
@@ -327,31 +332,32 @@ public void httpResponseSetAndGet() throws Exception {
 
   private void httpResponseSetAndGet(
       AtomicReference<HttpResponseTest> testReference,
-      AtomicReference<Throwable> exceptionReference) throws Exception {
+      AtomicReference<Throwable> exceptionReference)
+      throws Exception {
     HttpResponseTest[] tests = {
-        response -> assertThat(response.getContentType()).isEmpty(),
-        response -> {
-          response.setContentType("text/plain; charset=utf-8");
-          assertThat(response.getContentType().get()).matches("(?i)text/plain;\\s*charset=utf-8");
-        },
-        response -> {
-          response.appendHeader("Content-Type", "application/octet-stream");
-          assertThat(response.getContentType()).hasValue("application/octet-stream");
-          assertThat(response.getHeaders())
-              .containsAtLeast("Content-Type", Arrays.asList("application/octet-stream"));
-        },
-        response -> {
-          Map<String, List<String>> initialHeaders = response.getHeaders();
-          // The servlet spec says this should be empty, but actually we get a Date header here.
-          // So we just check that we can add our own headers.
-          response.appendHeader("foo", "bar");
-          response.appendHeader("wibbly", "wobbly");
-          response.appendHeader("foo", "baz");
-          Map<String, List<String>> updatedHeaders = new TreeMap<>(response.getHeaders());
-          updatedHeaders.keySet().removeAll(initialHeaders.keySet());
-          assertThat(updatedHeaders).containsExactly(
-              "foo", Arrays.asList("bar", "baz"), "wibbly", Arrays.asList("wobbly"));
-        },
+      response -> assertThat(response.getContentType()).isEmpty(),
+      response -> {
+        response.setContentType("text/plain; charset=utf-8");
+        assertThat(response.getContentType().get()).matches("(?i)text/plain;\\s*charset=utf-8");
+      },
+      response -> {
+        response.appendHeader("Content-Type", "application/octet-stream");
+        assertThat(response.getContentType()).hasValue("application/octet-stream");
+        assertThat(response.getHeaders())
+            .containsAtLeast("Content-Type", Arrays.asList("application/octet-stream"));
+      },
+      response -> {
+        Map<String, List<String>> initialHeaders = response.getHeaders();
+        // The servlet spec says this should be empty, but actually we get a Date header here.
+        // So we just check that we can add our own headers.
+        response.appendHeader("foo", "bar");
+        response.appendHeader("wibbly", "wobbly");
+        response.appendHeader("foo", "baz");
+        Map<String, List<String>> updatedHeaders = new TreeMap<>(response.getHeaders());
+        updatedHeaders.keySet().removeAll(initialHeaders.keySet());
+        assertThat(updatedHeaders)
+            .containsExactly("foo", Arrays.asList("bar", "baz"), "wibbly", Arrays.asList("wobbly"));
+      },
     };
     for (HttpResponseTest test : tests) {
       testReference.set(test);
@@ -395,9 +401,7 @@ private static class ResponseTest {
     final HttpResponseTest responseOperation;
     final ResponseCheck responseCheck;
 
-    private ResponseTest(
-        HttpResponseTest responseOperation,
-        ResponseCheck responseCheck) {
+    private ResponseTest(HttpResponseTest responseOperation, ResponseCheck responseCheck) {
       this.responseOperation = responseOperation;
       this.responseCheck = responseCheck;
     }
@@ -426,58 +430,59 @@ public void httpResponseEffects() throws Exception {
 
   private void httpResponseEffects(
       AtomicReference<HttpResponseTest> testReference,
-      AtomicReference<Throwable> exceptionReference) throws Exception {
+      AtomicReference<Throwable> exceptionReference)
+      throws Exception {
     ResponseTest[] tests = {
-        responseTest(
-            response -> {},
-            response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200)),
-        responseTest(
-            response -> response.setStatusCode(HttpStatus.OK_200),
-            response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200)),
-        responseTest(
-            response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418),
-            response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418)),
-        responseTest(
-            response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418, "Je suis une théière"),
-            response -> {
-              assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418);
-              assertThat(response.getReason()).isEqualTo("Je suis une théière");
-            }),
-        responseTest(
-            response -> response.setContentType("application/noddy"),
-            response -> assertThat(response.getMediaType()).isEqualTo("application/noddy")),
-        responseTest(
-            response -> {
-              response.appendHeader("foo", "bar");
-              response.appendHeader("blim", "blam");
-              response.appendHeader("foo", "baz");
-            },
-            response -> {
-              assertThat(response.getHeaders().getValuesList("foo")).containsExactly("bar", "baz");
-              assertThat(response.getHeaders().getValuesList("blim")).containsExactly("blam");
-            }),
-        responseTest(
-            response -> {
-              response.setContentType("text/plain");
-              try (BufferedWriter writer = response.getWriter()) {
-                writer.write(TEST_BODY);
-              }
-            },
-            response -> {
-              assertThat(response.getMediaType()).isEqualTo("text/plain");
-              assertThat(response.getContentAsString()).isEqualTo(TEST_BODY);
-            }),
-        responseTest(
-            response -> {
-              response.setContentType("application/octet-stream");
-              try (OutputStream outputStream = response.getOutputStream()) {
-                outputStream.write(RANDOM_BYTES);
-              }
-            },
-            response -> {
-              assertThat(response.getMediaType()).isEqualTo("application/octet-stream");
-              assertThat(response.getContent()).isEqualTo(RANDOM_BYTES);
-            }),
+      responseTest(
+          response -> {},
+          response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200)),
+      responseTest(
+          response -> response.setStatusCode(HttpStatus.OK_200),
+          response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200)),
+      responseTest(
+          response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418),
+          response -> assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418)),
+      responseTest(
+          response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418, "Je suis une théière"),
+          response -> {
+            assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418);
+            assertThat(response.getReason()).isEqualTo("Je suis une théière");
+          }),
+      responseTest(
+          response -> response.setContentType("application/noddy"),
+          response -> assertThat(response.getMediaType()).isEqualTo("application/noddy")),
+      responseTest(
+          response -> {
+            response.appendHeader("foo", "bar");
+            response.appendHeader("blim", "blam");
+            response.appendHeader("foo", "baz");
+          },
+          response -> {
+            assertThat(response.getHeaders().getValuesList("foo")).containsExactly("bar", "baz");
+            assertThat(response.getHeaders().getValuesList("blim")).containsExactly("blam");
+          }),
+      responseTest(
+          response -> {
+            response.setContentType("text/plain");
+            try (BufferedWriter writer = response.getWriter()) {
+              writer.write(TEST_BODY);
+            }
+          },
+          response -> {
+            assertThat(response.getMediaType()).isEqualTo("text/plain");
+            assertThat(response.getContentAsString()).isEqualTo(TEST_BODY);
+          }),
+      responseTest(
+          response -> {
+            response.setContentType("application/octet-stream");
+            try (OutputStream outputStream = response.getOutputStream()) {
+              outputStream.write(RANDOM_BYTES);
+            }
+          },
+          response -> {
+            assertThat(response.getMediaType()).isEqualTo("application/octet-stream");
+            assertThat(response.getContent()).isEqualTo(RANDOM_BYTES);
+          }),
     };
     for (ResponseTest test : tests) {
       testReference.set(test.responseOperation);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
index 6c90963d..b3569e4e 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
@@ -16,7 +16,6 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
-import java.util.stream.Collectors;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -25,10 +24,12 @@
 public class InvokerTest {
   @Test
   public void help() throws IOException {
-    String help = captureOutput(() -> {
-      Optional<Invoker> invoker = Invoker.makeInvoker("--help");
-      assertThat(invoker).isEmpty();
-    });
+    String help =
+        captureOutput(
+            () -> {
+              Optional<Invoker> invoker = Invoker.makeInvoker("--help");
+              assertThat(invoker).isEmpty();
+            });
     assertThat(help).contains("Usage:");
     assertThat(help).contains("--target");
     assertThat(help).containsMatch("separated\\s+by\\s+'" + File.pathSeparator + "'");
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
index cd23de0d..439e712d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/CloudEventSnoop.java
@@ -21,7 +21,8 @@ public void accept(CloudEvent event) throws Exception {
     if (targetFile == null) {
       throw new IllegalArgumentException("Expected targetFile in JSON payload");
     }
-    EventFormat jsonFormat = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    EventFormat jsonFormat =
+        EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
     byte[] bytes = jsonFormat.serialize(event);
     try (FileOutputStream out = new FileOutputStream(targetFile)) {
       out.write(bytes);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
index aa766663..37102bbc 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Multipart.java
@@ -11,8 +11,8 @@
 /**
  * A simple proof-of-concept function for multipart handling.
  *
- * {@code HttpTest} contains more detailed testing, but this function is part of the
- * integration test that shows that we can indeed access the multipart API from a function.
+ * <p>{@code HttpTest} contains more detailed testing, but this function is part of the integration
+ * test that shows that we can indeed access the multipart API from a function.
  */
 public class Multipart implements HttpFunction {
   @Override
@@ -30,7 +30,6 @@ public void service(HttpRequest request, HttpResponse response) throws Exception
           writer.printf(
               "part %s type %s length %d\n",
               name, contents.getContentType().get(), contents.getContentLength());
-        }
-    );
+        });
   }
 }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
index 7335f5a3..b1adfbe6 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
@@ -16,8 +16,7 @@
  * identical to the JSON payload that the Functions Framework received from the client in the test.
  * This will need to be rewritten when we switch to CloudEvents.
  */
-public class TypedBackgroundSnoop
-    implements BackgroundFunction<TypedBackgroundSnoop.Payload> {
+public class TypedBackgroundSnoop implements BackgroundFunction<TypedBackgroundSnoop.Payload> {
   public static class Payload {
     public int a;
     public int b;
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
index c4c9fed4..c79fcd05 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
@@ -14,37 +14,36 @@
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
 /**
- * Runs a function using the Java Functions Framework. Typically this plugin is configured in one
- * of two ways. Either in the pom.xml file, like this...
+ * Runs a function using the Java Functions Framework. Typically this plugin is configured in one of
+ * two ways. Either in the pom.xml file, like this...
  *
  * <pre>{@code
- *  <plugin>
- *    <groupId>com.google.cloud.functions</groupId>
- *    <artifactId>function-maven-plugin</artifactId>
- *    <version>1.0.0-alpha-2-rc3</version>
- *    <configuration>
- *      <functionTarget>com.example.function.Echo</functionTarget>
- *    </configuration>
- *  </plugin>
+ * <plugin>
+ *   <groupId>com.google.cloud.functions</groupId>
+ *   <artifactId>function-maven-plugin</artifactId>
+ *   <version>1.0.0-alpha-2-rc3</version>
+ *   <configuration>
+ *     <functionTarget>com.example.function.Echo</functionTarget>
+ *   </configuration>
+ * </plugin>
  * }</pre>
  *
  * ...and then run using {@code mvn function:run}. Or using properties on the command line, like
  * this...<br>
  *
  * <pre>{@code
- *   mvn com.google.cloud.functions:function:1.0.0-alpha-2-rc3:run \
- *       -Drun.functionTarget=com.example.function.Echo}
- * </pre>
- *
+ * mvn com.google.cloud.functions:function:1.0.0-alpha-2-rc3:run \
+ *     -Drun.functionTarget=com.example.function.Echo
+ * }</pre>
  */
-@Mojo(name = "run",
+@Mojo(
+    name = "run",
     defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
     requiresDependencyResolution = ResolutionScope.RUNTIME,
     requiresDependencyCollection = ResolutionScope.RUNTIME)
 @Execute(phase = LifecyclePhase.COMPILE)
 public class RunFunction extends AbstractMojo {
 
-
   /**
    * The name of the function to run. This is the name of a class that implements one of the
    * interfaces in {@code com.google.cloud.functions}.
@@ -52,9 +51,7 @@ public class RunFunction extends AbstractMojo {
   @Parameter(property = "run.functionTarget")
   private String functionTarget;
 
-  /**
-   * The port on which the HTTP server wrapping the function should listen.
-   */
+  /** The port on which the HTTP server wrapping the function should listen. */
   @Parameter(property = "run.port", defaultValue = "8080")
   private Integer port;
 
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Background.java b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
index 6b18b54c..66123a08 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
@@ -20,9 +20,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-/**
- * @author emcmanus@google.com (Éamonn McManus)
- */
+/** @author emcmanus@google.com (Éamonn McManus) */
 public class Background implements RawBackgroundFunction {
   @Override
   public void accept(String json, Context context) {
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
index 19c78cd2..2a4d3920 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
@@ -23,8 +23,7 @@ void serviceOrAssert(String runtimeClassName) {
       throw new AssertionError(
           String.format(
               "ClassLoader mismatch: mine %s; context %s",
-              getClass().getClassLoader(),
-              Thread.currentThread().getContextClassLoader()));
+              getClass().getClassLoader(), Thread.currentThread().getContextClassLoader()));
     }
 
     ClassLoader myLoader = getClass().getClassLoader();

From 51d6503177f45efdaae60fc19aade11879e47962 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <744973+grant@users.noreply.github.com>
Date: Wed, 27 Oct 2021 12:22:13 -0700
Subject: [PATCH 089/308] ci: add run conformance command (#124)

Adds command to run conformance tests.

- Adds `run_conformance_tests.sh`
- Adds detailed docs about setting up Java and contributing to this repo

Very similar to the Go setup, with a few minor modifications.

<details><summary>FULL LOGS</summary>
<p>

```
./run_conformance_tests.sh
Defaulting to v1.2.0 client.
Use './run_conformance_tests vX.X.X' to specify a specific release version.

========== INSTALLING CLIENT@v1.2.0 ==========
Note: only works with Go 1.16+ by default, see run_conformance_tests.sh for more information.
Done installing client@v1.2.0

========== HTTP CONFORMANCE TESTS ==========
2021/10/26 17:29:46 Validating for http...
2021/10/26 17:29:46 Framework server started.
2021/10/26 17:29:51 HTTP validation started...
2021/10/26 17:29:51 HTTP validation passed!
2021/10/26 17:29:51 Framework server shut down. Wrote logs to /var/folders/27/9q8h1w651z91hycvdf4qf0h0009rgz/T/serverlog_stdout.txt and /var/folders/27/9q8h1w651z91hycvdf4qf0h0009rgz/T/serverlog_stderr.txt.
2021/10/26 17:29:51 All validation passed!

========== BACKGROUND EVENT CONFORMANCE TESTS ==========
2021/10/26 17:29:51 Validating for legacyevent...
2021/10/26 17:29:51 Framework server started.
2021/10/26 17:29:56 Legacy event validation with legacy event requests...
2021/10/26 17:29:56 Events tried:
        - firebase-auth (PASSED)
        - firebase-db1 (PASSED)
        - firebase-db2 (PASSED)
        - firebase-db3 (PASSED)
        - firebase-db4 (PASSED)
        - firebase-db5 (PASSED)
        - firebase-db6 (PASSED)
        - firebase-db7 (PASSED)
        - firebase-db8 (PASSED)
        - firebase-dbdelete1 (PASSED)
        - firebase-dbdelete2 (PASSED)
        - firestore_complex (PASSED)
        - firestore_simple (PASSED)
        - legacy_pubsub (PASSED)
        - pubsub_binary (PASSED)
        - pubsub_text (PASSED)
        - storage (PASSED)
2021/10/26 17:29:56 Legacy event validation passed!
2021/10/26 17:29:56 Framework server shut down. Wrote logs to /var/folders/27/9q8h1w651z91hycvdf4qf0h0009rgz/T/serverlog_stdout.txt and /var/folders/27/9q8h1w651z91hycvdf4qf0h0009rgz/T/serverlog_stderr.txt.
2021/10/26 17:29:56 All validation passed!

========== CLOUDEVENT CONFORMANCE TESTS ==========
2021/10/26 17:29:56 Validating for cloudevent...
2021/10/26 17:29:56 Framework server started.
2021/10/26 17:30:01 CloudEvent validation with CloudEvent requests...
2021/10/26 17:30:01 Events tried:
        - firebase-auth (PASSED)
        - firebase-db1 (PASSED)
        - firebase-db2 (PASSED)
        - firebase-db3 (PASSED)
        - firebase-db4 (PASSED)
        - firebase-db5 (PASSED)
        - firebase-db6 (PASSED)
        - firebase-db7 (PASSED)
        - firebase-db8 (PASSED)
        - firebase-dbdelete1 (PASSED)
        - firebase-dbdelete2 (PASSED)
        - firestore_complex (PASSED)
        - firestore_simple (PASSED)
        - legacy_pubsub (PASSED)
        - pubsub_binary (PASSED)
        - pubsub_text (PASSED)
        - storage (PASSED)
2021/10/26 17:30:01 CloudEvent validation passed!
2021/10/26 17:30:01 Framework server shut down. Wrote logs to /var/folders/27/9q8h1w651z91hycvdf4qf0h0009rgz/T/serverlog_stdout.txt and /var/folders/27/9q8h1w651z91hycvdf4qf0h0009rgz/T/serverlog_stderr.txt.
2021/10/26 17:30:01 All validation passed!
```

</p>
</details>
---
 CONTRIBUTING.md          | 22 ++++++++++++------
 run_conformance_tests.sh | 48 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 7 deletions(-)
 create mode 100755 run_conformance_tests.sh

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7e7cc4ed..f7e4114c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,12 +31,12 @@ Guidelines](https://opensource.google.com/conduct/).
 
 This project is divided into multiple packages, primarily:
 
-- [`functions-framework-api`](./functions-framework-api)
-  - `core`
-  - `testfunction`
-  - `function-maven-plugin`
-  - `conformance`
+- [`functions-framework-api`](./functions-framework-api) – The interfaces for functions.
 - [`java-function-invoker`](./invoker)
+  - `core` - The function invoker
+  - `testfunction` - A set of test functions
+  - `function-maven-plugin` - The Maven plugin for building functions
+  - `conformance` - A set of functions used for conformance testing
 
 ### Setup JDK 11 / 17
 
@@ -44,8 +44,8 @@ Install JDK 11 and 17. One way to install these is through [SDK man](https://sdk
 
 ```sh
 sdk install java 11.0.2-open
-sdk install java 17
-sdk use java 17
+sdk install java 17-open
+sdk use java 17-open
 sdk use java 11.0.2-open
 ```
 
@@ -72,3 +72,11 @@ formatting tool locally using one of the options provided at
 cd invoker;
 mvn test;
 ```
+
+### Running Conformance Tests Locally
+
+First, install Go 1.16+, then run the conformance tests with this script:
+
+```
+./run_conformance_tests.sh
+```
diff --git a/run_conformance_tests.sh b/run_conformance_tests.sh
new file mode 100755
index 00000000..6276f158
--- /dev/null
+++ b/run_conformance_tests.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+# Runs the conformance tests locally from https://github.com/GoogleCloudPlatform/functions-framework-conformance
+#
+# Servers may fail to shutdown between tests on error, leaving port 8080 bound.
+# You can see what's running on port 8080 by running `lsof -i :8080`. You can
+# run `kill -9 <PID>` to terminate a process.
+#
+# USAGE:
+# ./run_conformance_tests.sh [client_version]
+#
+# client_version (optional):
+# The version of the conformance tests client to use, formatted as "vX.X.X".
+# Defaults to the latest version of the repo, which may be ahead of the
+# latest release.
+
+CLIENT_VERSION=$1
+if [ $CLIENT_VERSION ]; then
+    CLIENT_VERSION="@$CLIENT_VERSION"
+else
+    echo "Defaulting to v1.2.0 client."
+    echo "Use './run_conformance_tests vX.X.X' to specify a specific release version."
+    CLIENT_VERSION="@v1.2.0"
+fi
+
+function print_header() {
+    echo
+    echo "========== $1 =========="
+}
+
+# Fail if any command fails
+set -e
+
+print_header "INSTALLING CLIENT$CLIENT_VERSION"
+echo "Note: only works with Go 1.16+ by default, see run_conformance_tests.sh for more information."
+# Go install @version only works on go 1.16+, if using a lower Go version
+# replace command with:
+# go get github.com/GoogleCloudPlatform/functions-framework-conformance/client$CLIENT_VERSION && go install github.com/GoogleCloudPlatform/functions-framework-conformance/client
+go install github.com/GoogleCloudPlatform/functions-framework-conformance/client$CLIENT_VERSION
+echo "Done installing client$CLIENT_VERSION"
+
+print_header "HTTP CONFORMANCE TESTS"
+client -buildpacks=false -type=http -cmd='mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction' -start-delay 5
+
+print_header "BACKGROUND EVENT CONFORMANCE TESTS"
+client -buildpacks=false -type=legacyevent -cmd='mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.BackgroundEventConformanceFunction' -start-delay 5 -validate-mapping=false
+
+print_header "CLOUDEVENT CONFORMANCE TESTS"
+client -buildpacks=false -type=cloudevent -cmd='mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction' -start-delay 5 -validate-mapping=false

From 1c4a01470cc4ee7b3de3c3d7ae4af24e47eb2810 Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Wed, 27 Oct 2021 15:40:08 -0700
Subject: [PATCH 090/308] feat: enable converting CloudEvent requests to
 Background Event requests (#123)

This enables backwards compatability for GCF Background Functions with
newer CloudEvent-based eventing systems and brings FF Java up-to-date
with conformance tests.
---
 .github/workflows/conformance.yaml            |  11 +-
 invoker/conformance/pom.xml                   |  10 +
 .../BackgroundEventConformanceFunction.java   |   8 +-
 .../CloudEventsConformanceFunction.java       |  33 +-
 invoker/core/pom.xml                          |   5 +
 .../invoker/BackgroundFunctionExecutor.java   |  11 +-
 .../cloud/functions/invoker/CloudEvents.java  | 296 ++++++++++++++++++
 .../invoker/CloudFunctionsContext.java        |   9 +-
 .../google/cloud/functions/invoker/Event.java |  10 +-
 .../functions/invoker/CloudEventsTest.java    | 100 ++++++
 .../functions/invoker/IntegrationTest.java    |  17 +-
 .../testfunctions/BackgroundSnoop.java        |   1 -
 .../testfunctions/TypedBackgroundSnoop.java   |   1 -
 .../firebase-auth-cloudevent-input.json       |  24 ++
 .../firebase-auth-legacy-output.json          |  23 ++
 .../firebase-db1-cloudevent-input.json        |  15 +
 .../resources/firebase-db1-legacy-output.json |  14 +
 .../firebase-db2-cloudevent-input.json        |  17 +
 .../resources/firebase-db2-legacy-output.json |  16 +
 .../firestore_complex-cloudevent-input.json   |  80 +++++
 .../firestore_complex-legacy-output.json      |  79 +++++
 .../pubsub_text-cloudevent-input.json         |  20 ++
 .../resources/pubsub_text-legacy-output.json  |  19 ++
 .../resources/storage-cloudevent-input.json   |  28 ++
 .../test/resources/storage-legacy-output.json |  31 ++
 25 files changed, 812 insertions(+), 66 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEvents.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/CloudEventsTest.java
 create mode 100644 invoker/core/src/test/resources/firebase-auth-cloudevent-input.json
 create mode 100644 invoker/core/src/test/resources/firebase-auth-legacy-output.json
 create mode 100644 invoker/core/src/test/resources/firebase-db1-cloudevent-input.json
 create mode 100644 invoker/core/src/test/resources/firebase-db1-legacy-output.json
 create mode 100644 invoker/core/src/test/resources/firebase-db2-cloudevent-input.json
 create mode 100644 invoker/core/src/test/resources/firebase-db2-legacy-output.json
 create mode 100644 invoker/core/src/test/resources/firestore_complex-cloudevent-input.json
 create mode 100644 invoker/core/src/test/resources/firestore_complex-legacy-output.json
 create mode 100644 invoker/core/src/test/resources/pubsub_text-cloudevent-input.json
 create mode 100644 invoker/core/src/test/resources/pubsub_text-legacy-output.json
 create mode 100644 invoker/core/src/test/resources/storage-cloudevent-input.json
 create mode 100644 invoker/core/src/test/resources/storage-legacy-output.json

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 02686a9d..fbd1ce18 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -34,25 +34,28 @@ jobs:
       run: (cd invoker/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.2.1
       with:
+        version: 'v1.2.1'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.2.1
       with:
+        version: 'v1.2.1'
         functionType: 'legacyevent'
         useBuildpacks: false
-        validateMapping: false
+        validateMapping: true
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.BackgroundEventConformanceFunction'"
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.0.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.2.1
       with:
+        version: 'v1.2.1'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 67ff436e..5a794814 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -34,6 +34,16 @@
       <artifactId>gson</artifactId>
       <version>2.8.6</version>
     </dependency>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-core</artifactId>
+      <version>2.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-json-jackson</artifactId>
+      <version>2.2.0</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
index 8193abbd..b21e68c8 100644
--- a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/BackgroundEventConformanceFunction.java
@@ -40,8 +40,12 @@ private String serialize(String data, Context context) {
     contextJson.addProperty("timestamp", context.timestamp());
     contextJson.addProperty("eventType", context.eventType());
 
-    JsonElement resource = gson.fromJson(context.resource(), JsonElement.class);
-    contextJson.add("resource", resource);
+    if (context.resource().startsWith("{")) {
+      JsonElement resource = gson.fromJson(context.resource(), JsonElement.class);
+      contextJson.add("resource", resource);
+    } else {
+      contextJson.addProperty("resource", context.resource());
+    }
 
     JsonObject dataJson = gson.fromJson(data, JsonObject.class);
 
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
index 04371952..7faa079c 100644
--- a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/CloudEventsConformanceFunction.java
@@ -17,13 +17,12 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.google.cloud.functions.CloudEventsFunction;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonObject;
 import io.cloudevents.CloudEvent;
+import io.cloudevents.core.format.EventFormat;
+import io.cloudevents.core.provider.EventFormatProvider;
+import io.cloudevents.jackson.JsonFormat;
 import java.io.BufferedWriter;
 import java.io.FileWriter;
-import java.time.format.DateTimeFormatter;
 
 /**
  * This class is used by the Functions Framework Conformance Tools to validate the framework's Cloud
@@ -40,33 +39,11 @@
  */
 public class CloudEventsConformanceFunction implements CloudEventsFunction {
 
-  private static final Gson gson = new GsonBuilder().serializeNulls().setPrettyPrinting().create();
-
   @Override
   public void accept(CloudEvent event) throws Exception {
     try (BufferedWriter writer = new BufferedWriter(new FileWriter("function_output.json"))) {
-      writer.write(serialize(event));
+      EventFormat format = EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+      writer.write(new String(format.serialize(event), UTF_8));
     }
   }
-
-  /** Create a structured JSON representation of a cloud event */
-  private String serialize(CloudEvent event) {
-    JsonObject jsonEvent = new JsonObject();
-
-    jsonEvent.addProperty("id", event.getId());
-    jsonEvent.addProperty("source", event.getSource().toString());
-    jsonEvent.addProperty("type", event.getType());
-    jsonEvent.addProperty("datacontenttype", event.getDataContentType());
-    jsonEvent.addProperty("subject", event.getSubject());
-    jsonEvent.addProperty("specversion", event.getSpecVersion().toString());
-
-    DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ssXXX");
-    jsonEvent.addProperty("time", event.getTime().format(formatter));
-
-    String payloadJson = new String(event.getData().toBytes(), UTF_8);
-    JsonObject jsonObject = new Gson().fromJson(payloadJson, JsonObject.class);
-    jsonEvent.add("data", jsonObject);
-
-    return gson.toJson(jsonEvent);
-  }
 }
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index af524717..5fd4a9f5 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -130,6 +130,11 @@
       <version>4.13.1</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.re2j</groupId>
+      <artifactId>re2j</artifactId>
+      <version>1.6</version>
+    </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 6f320438..98b9bc8a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -14,7 +14,6 @@
 
 package com.google.cloud.functions.invoker;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Collectors.toMap;
 
@@ -263,10 +262,7 @@ void serviceLegacyEvent(Event legacyEvent) throws Exception {
 
     @Override
     void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
-      Context context = contextFromCloudEvent(cloudEvent);
-      String jsonData =
-          (cloudEvent.getData() == null) ? "{}" : new String(cloudEvent.getData().toBytes(), UTF_8);
-      function.accept(jsonData, context);
+      serviceLegacyEvent(CloudEvents.convertToLegacyEvent(cloudEvent));
     }
   }
 
@@ -295,10 +291,7 @@ void serviceLegacyEvent(Event legacyEvent) throws Exception {
     @Override
     void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
       if (cloudEvent.getData() != null) {
-        String data = new String(cloudEvent.getData().toBytes(), UTF_8);
-        T payload = new Gson().fromJson(data, type);
-        Context context = contextFromCloudEvent(cloudEvent);
-        function.accept(payload, context);
+        serviceLegacyEvent(CloudEvents.convertToLegacyEvent(cloudEvent));
       } else {
         throw new IllegalStateException("Event has no \"data\" component");
       }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEvents.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEvents.java
new file mode 100644
index 00000000..0021d44e
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudEvents.java
@@ -0,0 +1,296 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker;
+
+import static java.util.Map.entry;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.re2j.Matcher;
+import com.google.re2j.Pattern;
+import io.cloudevents.CloudEvent;
+import java.time.OffsetDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Map;
+import java.util.Optional;
+
+/** Conversions from CloudEvents events to GCF Background Events. */
+class CloudEvents {
+  private static final String PUB_SUB_MESSAGE_TYPE =
+      "type.googleapis.com/google.pubsub.v1.PubsubMessage";
+
+  private static final Map<String, EventAdapter> EVENT_TYPE_MAPPING =
+      Map.ofEntries(
+          entry(
+              "google.cloud.pubsub.topic.v1.messagePublished",
+              new PubSubEventAdapter("google.pubsub.topic.publish")),
+          entry(
+              "google.cloud.storage.object.v1.finalized",
+              new StorageEventAdapter("google.storage.object.finalize")),
+          entry(
+              "google.cloud.storage.object.v1.deleted",
+              new StorageEventAdapter("google.storage.object.delete")),
+          entry(
+              "google.cloud.storage.object.v1.archived",
+              new StorageEventAdapter("google.storage.object.archive")),
+          entry(
+              "google.cloud.storage.object.v1.metadataUpdated",
+              new StorageEventAdapter("google.storage.object.metadataUpdate")),
+          entry(
+              "google.cloud.firestore.document.v1.written",
+              new EventAdapter("providers/cloud.firestore/eventTypes/document.write")),
+          entry(
+              "google.cloud.firestore.document.v1.created",
+              new EventAdapter("providers/cloud.firestore/eventTypes/document.create")),
+          entry(
+              "google.cloud.firestore.document.v1.updated",
+              new EventAdapter("providers/cloud.firestore/eventTypes/document.update")),
+          entry(
+              "google.cloud.firestore.document.v1.deleted",
+              new EventAdapter("providers/cloud.firestore/eventTypes/document.delete")),
+          entry(
+              "google.firebase.analytics.log.v1.written",
+              new EventAdapter("providers/google.firebase.analytics/eventTypes/event.log")),
+          entry(
+              "google.firebase.auth.user.v1.created",
+              new FirebaseAuthEventAdapter("providers/firebase.auth/eventTypes/user.create")),
+          entry(
+              "google.firebase.auth.user.v1.deleted",
+              new FirebaseAuthEventAdapter("providers/firebase.auth/eventTypes/user.delete")),
+          entry(
+              "google.firebase.database.ref.v1.created",
+              new FirebaseDatabaseEventAdapter(
+                  "providers/google.firebase.database/eventTypes/ref.create")),
+          entry(
+              "google.firebase.database.ref.v1.written",
+              new FirebaseDatabaseEventAdapter(
+                  "providers/google.firebase.database/eventTypes/ref.write")),
+          entry(
+              "google.firebase.database.ref.v1.updated",
+              new FirebaseDatabaseEventAdapter(
+                  "providers/google.firebase.database/eventTypes/ref.update")),
+          entry(
+              "google.firebase.database.ref.v1.deleted",
+              new FirebaseDatabaseEventAdapter(
+                  "providers/google.firebase.database/eventTypes/ref.delete")),
+          entry(
+              "google.cloud.storage.object.v1.changed",
+              new StorageEventAdapter("providers/cloud.storage/eventTypes/object.change")));
+
+  private static final Gson GSON = new GsonBuilder().serializeNulls().create();
+
+  /**
+   * Converts a CloudEvent to the legacy event format.
+   *
+   * @param cloudEvent the CloudEvent to convert
+   * @return the legacy event representation of the Cloud Event
+   */
+  static Event convertToLegacyEvent(CloudEvent cloudEvent) {
+    String eventType = cloudEvent.getType();
+    EventAdapter eventAdapter = EVENT_TYPE_MAPPING.get(eventType);
+    if (eventAdapter == null) {
+      throw new IllegalArgumentException("Unrecognized CloudEvent type \"" + eventType + "\"");
+    }
+    return eventAdapter.convertToLegacyEvent(cloudEvent);
+  }
+
+  private static class EventAdapter {
+    private final String legacyEventType;
+    private static Pattern sourcePattern = Pattern.compile("//([^/]+)/(.+)");
+
+    protected class ParsedCloudEvent {
+      public final String Resource;
+      public final String Service;
+      public final String Name;
+
+      public ParsedCloudEvent(String resource, String service, String name) {
+        this.Resource = resource;
+        this.Service = service;
+        this.Name = name;
+      }
+    }
+    ;
+
+    /**
+     * Creates an adapter to convert from the CloudEvent to a legacy event.
+     *
+     * @param legacyEventType the event type of the legacy event being created
+     */
+    EventAdapter(String legacyEventType) {
+      this.legacyEventType = legacyEventType;
+    }
+
+    /**
+     * Converts a CloudEvent to the legacy event format.
+     *
+     * @param cloudEvent the CloudEvent to convert
+     * @return the legacy event representation of the Cloud Event
+     */
+    final Event convertToLegacyEvent(CloudEvent cloudEvent) {
+      /*
+        Ex 1: "//firebaseauth.googleapis.com/projects/my-project-id"
+        m.group(0): "//firebaseauth.googleapis.com/projects/my-project-id"
+        m.group(1): "firebaseauth.googleapis.com"
+        m.group(2): "projects/my-project-id"
+
+        Ex 2: "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test"
+        m.group(0): "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test"
+        m.group(1): "pubsub.googleapis.com"
+        m.group(2): "projects/sample-project/topics/gcf-test"
+      */
+      Matcher m = sourcePattern.matcher(cloudEvent.getSource().toString());
+      if (!m.find() || m.groupCount() != 2) {
+        throw new IllegalArgumentException(
+            String.format(
+                "Invalid CloudEvent source '%s', unable to parse into resource service and name",
+                cloudEvent.getSource().toString()));
+      }
+
+      String service = m.group(1);
+      String name = m.group(2);
+      String resource = String.format("%s/%s", name, cloudEvent.getSubject());
+      ParsedCloudEvent parsed = new ParsedCloudEvent(resource, service, name);
+
+      OffsetDateTime timestamp =
+          Optional.ofNullable(cloudEvent.getTime()).orElse(OffsetDateTime.now());
+
+      CloudFunctionsContext.Builder ctxBuilder =
+          CloudFunctionsContext.builder()
+              .setEventId(cloudEvent.getId())
+              .setEventType(this.legacyEventType)
+              .setResource(resource)
+              .setTimestamp(DateTimeFormatter.ISO_INSTANT.format(timestamp));
+
+      JsonObject data =
+          GSON.fromJson(
+              new String(cloudEvent.getData().toBytes(), java.nio.charset.StandardCharsets.UTF_8),
+              JsonObject.class);
+      return createLegacyEvent(parsed, ctxBuilder, data);
+    }
+
+    /**
+     * Provides a hook to furither modify the converted event for specific event adapter subclasses.
+     *
+     * @param event convenient information parsed from the original CloudEvent
+     * @param builder the builder for the converted legacy event's context, pre-populated with
+     *     defaults from the original CloudEvent
+     * @param data the data for the converted legacy event's data, pre-populated with defaults from
+     *     the original CloudEvent
+     * @return the fully converted legacy event
+     */
+    Event createLegacyEvent(
+        ParsedCloudEvent event, CloudFunctionsContext.Builder builder, JsonObject data) {
+      return Event.of(data, builder.build());
+    }
+  }
+
+  private static class PubSubEventAdapter extends EventAdapter {
+    PubSubEventAdapter(String legacyEventType) {
+      super(legacyEventType);
+    }
+
+    @Override
+    Event createLegacyEvent(
+        ParsedCloudEvent event, CloudFunctionsContext.Builder builder, JsonObject data) {
+      JsonObject resource = new JsonObject();
+      resource.addProperty("service", event.Service);
+      resource.addProperty("name", event.Name);
+      resource.addProperty("type", PUB_SUB_MESSAGE_TYPE);
+      builder.setResource(GSON.toJson(resource));
+
+      // Lift the "message" field into the main "data" field.
+      if (data.has("message")) {
+        JsonElement message = data.get("message");
+        if (message.isJsonObject()) {
+          data = message.getAsJsonObject();
+        }
+      }
+
+      data.remove("messageId");
+      data.remove("publishTime");
+
+      return Event.of(data, builder.build());
+    }
+  }
+
+  private static class FirebaseAuthEventAdapter extends EventAdapter {
+    FirebaseAuthEventAdapter(String legacyEventType) {
+      super(legacyEventType);
+    }
+
+    @Override
+    Event createLegacyEvent(
+        ParsedCloudEvent event, CloudFunctionsContext.Builder builder, JsonObject data) {
+      builder.setResource(event.Name);
+
+      if (data.has("metadata")) {
+        JsonElement meta = data.get("metadata");
+        if (meta.isJsonObject()) {
+          JsonObject metaObj = meta.getAsJsonObject();
+
+          JsonElement createTime = metaObj.get("createTime");
+          if (createTime != null) {
+            metaObj.add("createdAt", createTime);
+            metaObj.remove("createTime");
+          }
+
+          JsonElement lastSignInTime = metaObj.get("lastSignInTime");
+          if (lastSignInTime != null) {
+            metaObj.add("lastSignedInAt", lastSignInTime);
+            metaObj.remove("lastSignInTime");
+          }
+        }
+      }
+      return Event.of(data, builder.build());
+    }
+  }
+
+  private static class FirebaseDatabaseEventAdapter extends EventAdapter {
+    private static Pattern resourcePattern = Pattern.compile("/locations/[^/]+");
+
+    FirebaseDatabaseEventAdapter(String legacyEventType) {
+      super(legacyEventType);
+    }
+
+    @Override
+    Event createLegacyEvent(
+        ParsedCloudEvent event, CloudFunctionsContext.Builder builder, JsonObject data) {
+      builder.setResource(resourcePattern.matcher(event.Resource).replaceAll(""));
+      return Event.of(data, builder.build());
+    }
+  }
+
+  private static class StorageEventAdapter extends EventAdapter {
+    StorageEventAdapter(String legacyEventType) {
+      super(legacyEventType);
+    }
+
+    @Override
+    Event createLegacyEvent(
+        ParsedCloudEvent event, CloudFunctionsContext.Builder builder, JsonObject data) {
+      JsonObject resource = new JsonObject();
+      resource.addProperty("service", event.Service);
+      resource.addProperty("name", event.Resource);
+      if (data.has("kind")) {
+        resource.addProperty("type", data.get("kind").getAsString());
+      }
+
+      builder.setResource(GSON.toJson(resource));
+      return Event.of(data, builder.build());
+    }
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index 4efc045d..65df5411 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -103,17 +103,12 @@ static TypeAdapter<Resource> typeAdapter(Gson gson) {
     }
 
     static Resource from(String s) {
-      Gson baseGson = new Gson();
-      if (s.startsWith("\"") && s.endsWith("\"")) {
-        String name = baseGson.fromJson(s, String.class);
-        return builder().setName(name).build();
-      }
       if (s.startsWith("{") && (s.endsWith("}") || s.endsWith("}\n"))) {
-        TypeAdapter<Resource> typeAdapter = typeAdapter(baseGson);
+        TypeAdapter<Resource> typeAdapter = typeAdapter(new Gson());
         Gson gson = new GsonBuilder().registerTypeAdapter(Resource.class, typeAdapter).create();
         return gson.fromJson(s, Resource.class);
       }
-      throw new IllegalArgumentException("Unexpected resource syntax: " + s);
+      return builder().setName(s).build();
     }
 
     static Builder builder() {
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
index ed12efe2..642e5118 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
@@ -107,10 +107,12 @@ private boolean isPubSubEmulatorPayload(JsonObject root) {
      * to be a string.
      */
     private JsonObject adjustContextResource(JsonObject contextObject) {
-      String resourceValue =
-          contextObject.has("resource") ? contextObject.get("resource").toString() : "";
-      contextObject.remove("resource");
-      contextObject.addProperty("resource", resourceValue);
+      if (contextObject.has("resource")) {
+        JsonElement resourceElement = contextObject.get("resource");
+        if (resourceElement.isJsonObject()) {
+          contextObject.addProperty("resource", resourceElement.toString());
+        }
+      }
       return contextObject;
     }
   }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/CloudEventsTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/CloudEventsTest.java
new file mode 100644
index 00000000..3e964d7b
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/CloudEventsTest.java
@@ -0,0 +1,100 @@
+// Copyright 2021 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
+import io.cloudevents.CloudEvent;
+import io.cloudevents.jackson.JsonFormat;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.StringReader;
+import org.junit.Test;
+
+public class CloudEventsTest {
+  @Test
+  public void firebaseFirestoreTest() throws Exception {
+    CloudEvent cloudEvent = cloudEventForResource("firestore_complex-cloudevent-input.json");
+    Event actualEvent = CloudEvents.convertToLegacyEvent(cloudEvent);
+
+    Event expEvent = legacyEventForResource("firestore_complex-legacy-output.json");
+    assertThat(actualEvent).isEqualTo(expEvent);
+  }
+
+  @Test
+  public void pubSubTest() throws Exception {
+    CloudEvent cloudEvent = cloudEventForResource("pubsub_text-cloudevent-input.json");
+    Event actualEvent = CloudEvents.convertToLegacyEvent(cloudEvent);
+
+    Event expEvent = legacyEventForResource("pubsub_text-legacy-output.json");
+    assertThat(actualEvent).isEqualTo(expEvent);
+  }
+
+  @Test
+  public void firebaseAuthTest() throws Exception {
+    CloudEvent cloudEvent = cloudEventForResource("firebase-auth-cloudevent-input.json");
+    Event actualEvent = CloudEvents.convertToLegacyEvent(cloudEvent);
+
+    Event expEvent = legacyEventForResource("firebase-auth-legacy-output.json");
+    assertThat(actualEvent).isEqualTo(expEvent);
+  }
+
+  @Test
+  public void firebaseDb1Test() throws Exception {
+    CloudEvent cloudEvent = cloudEventForResource("firebase-db1-cloudevent-input.json");
+    Event actualEvent = CloudEvents.convertToLegacyEvent(cloudEvent);
+
+    Event expEvent = legacyEventForResource("firebase-db1-legacy-output.json");
+    assertThat(actualEvent).isEqualTo(expEvent);
+  }
+
+  @Test
+  public void firebaseDb2Test() throws Exception {
+    CloudEvent cloudEvent = cloudEventForResource("firebase-db2-cloudevent-input.json");
+    Event actualEvent = CloudEvents.convertToLegacyEvent(cloudEvent);
+
+    Event expEvent = legacyEventForResource("firebase-db2-legacy-output.json");
+    assertThat(actualEvent).isEqualTo(expEvent);
+  }
+
+  @Test
+  public void storageTest() throws Exception {
+    CloudEvent cloudEvent = cloudEventForResource("storage-cloudevent-input.json");
+    Event actualEvent = CloudEvents.convertToLegacyEvent(cloudEvent);
+
+    Event expEvent = legacyEventForResource("storage-legacy-output.json");
+    assertThat(actualEvent).isEqualTo(expEvent);
+  }
+
+  private CloudEvent cloudEventForResource(String resourceName) throws IOException {
+    try (InputStream in = getClass().getResourceAsStream("/" + resourceName)) {
+      assertWithMessage("No such resource /%s", resourceName).that(in).isNotNull();
+      byte[] req = in.readAllBytes();
+      return io.cloudevents.core.provider.EventFormatProvider.getInstance()
+          .resolveFormat(JsonFormat.CONTENT_TYPE)
+          .deserialize(req);
+    }
+  }
+
+  private Event legacyEventForResource(String resourceName) throws IOException {
+    try (InputStream in = getClass().getResourceAsStream("/" + resourceName)) {
+      assertWithMessage("No such resource /%s", resourceName).that(in).isNotNull();
+      String legacyEventString = new String(in.readAllBytes(), UTF_8);
+      return BackgroundFunctionExecutor.parseLegacyEvent(new StringReader(legacyEventString));
+    }
+  }
+}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 7a2bee14..335cc7de 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -103,11 +103,11 @@ private static String sampleLegacyEvent(File snoopFile) {
         + "  \"context\": {\n"
         + "    \"eventId\": \"B234-1234-1234\",\n"
         + "    \"timestamp\": \"2018-04-05T17:31:00Z\",\n"
-        + "    \"eventType\": \"com.example.someevent.new\",\n"
+        + "    \"eventType\": \"google.pubsub.topic.publish\",\n"
         + "    \"resource\": {\n"
-        + "      \"service\":\"test-service\",\n"
-        + "      \"name\":\"test-name\",\n"
-        + "      \"type\":\"test-type\"\n"
+        + "      \"service\":\"pubsub.googleapis.com\",\n"
+        + "      \"name\":\"projects/sample-project/topics/gcf-test\",\n"
+        + "      \"type\":\"type.googleapis.com/google.pubsub.v1.PubsubMessage\"\n"
         + "    }\n"
         + "  }\n"
         + "}";
@@ -116,8 +116,9 @@ private static String sampleLegacyEvent(File snoopFile) {
   private static CloudEvent sampleCloudEvent(File snoopFile) {
     return CloudEventBuilder.v1()
         .withId("B234-1234-1234")
-        .withSource(URI.create("/source"))
-        .withType("com.example.someevent.new")
+        .withSource(URI.create("//pubsub.googleapis.com/projects/sample-project/topics/gcf-test"))
+        .withSubject("documents/gcf-test/2Vm2mI1d0wIaK2Waj5to")
+        .withType("google.cloud.pubsub.topic.v1.messagePublished")
         .withDataSchema(URI.create("/schema"))
         .withDataContentType("application/json")
         .withData(("{\"a\": 2, \"b\": 3, \"targetFile\": \"" + snoopFile + "\"}").getBytes(UTF_8))
@@ -386,8 +387,6 @@ private void backgroundTest(String target) throws Exception {
     File snoopFile = snoopFile();
     String gcfRequestText = sampleLegacyEvent(snoopFile);
     JsonObject expectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
-    // We don't currently put anything in the attributes() map for legacy events.
-    expectedJson.add("attributes", new JsonObject());
     TestCase gcfTestCase =
         TestCase.builder()
             .setRequestText(gcfRequestText)
@@ -404,8 +403,6 @@ private void backgroundTest(String target) throws Exception {
     // For CloudEvents, we don't currently populate Context#getResource with anything interesting,
     // so we excise that from the expected text we would have with legacy events.
     JsonObject cloudEventExpectedJson = new Gson().fromJson(gcfRequestText, JsonObject.class);
-    cloudEventExpectedJson.getAsJsonObject("context").add("resource", new JsonObject());
-    cloudEventExpectedJson.add("attributes", expectedCloudEventAttributes());
     TestCase cloudEventsStructuredTestCase =
         TestCase.builder()
             .setSnoopFile(snoopFile)
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
index 825de1f0..0a6dba42 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
@@ -34,7 +34,6 @@ public void accept(String json, Context context) {
     JsonObject contextAndPayloadJson = new JsonObject();
     contextAndPayloadJson.add("data", jsonObject);
     contextAndPayloadJson.add("context", contextJson);
-    contextAndPayloadJson.add("attributes", gson.toJsonTree(context.attributes()));
     try (FileWriter fileWriter = new FileWriter(targetFile);
         PrintWriter writer = new PrintWriter(fileWriter)) {
       writer.println(contextAndPayloadJson);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
index b1adfbe6..c1e489b4 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedBackgroundSnoop.java
@@ -39,7 +39,6 @@ public void accept(Payload payload, Context context) {
     JsonObject contextAndPayloadJson = new JsonObject();
     contextAndPayloadJson.add("data", gson.toJsonTree(payload));
     contextAndPayloadJson.add("context", contextJson);
-    contextAndPayloadJson.add("attributes", gson.toJsonTree(context.attributes()));
     try (FileWriter fileWriter = new FileWriter(targetFile);
         PrintWriter writer = new PrintWriter(fileWriter)) {
       writer.println(contextAndPayloadJson);
diff --git a/invoker/core/src/test/resources/firebase-auth-cloudevent-input.json b/invoker/core/src/test/resources/firebase-auth-cloudevent-input.json
new file mode 100644
index 00000000..285878e9
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-auth-cloudevent-input.json
@@ -0,0 +1,24 @@
+{
+  "specversion": "1.0",
+  "type": "google.firebase.auth.user.v1.created",
+  "source": "//firebaseauth.googleapis.com/projects/my-project-id",
+  "subject": "users/UUpby3s4spZre6kHsgVSPetzQ8l2",
+  "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+  "time": "2020-09-29T11:32:00.123Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "email": "test@nowhere.com",
+    "metadata": {
+      "createTime": "2020-05-26T10:42:27Z",
+      "lastSignInTime": "2020-10-24T11:00:00Z"
+    },
+    "providerData": [
+      {
+        "email": "test@nowhere.com",
+        "providerId": "password",
+        "uid": "test@nowhere.com"
+      }
+    ],
+    "uid": "UUpby3s4spZre6kHsgVSPetzQ8l2"
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/firebase-auth-legacy-output.json b/invoker/core/src/test/resources/firebase-auth-legacy-output.json
new file mode 100644
index 00000000..cf0e572f
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-auth-legacy-output.json
@@ -0,0 +1,23 @@
+{
+  "data": {
+    "email": "test@nowhere.com",
+    "metadata": {
+      "createdAt": "2020-05-26T10:42:27Z",
+      "lastSignedInAt": "2020-10-24T11:00:00Z"
+    },
+    "providerData": [
+      {
+        "email": "test@nowhere.com",
+        "providerId": "password",
+        "uid": "test@nowhere.com"
+      }
+    ],
+    "uid": "UUpby3s4spZre6kHsgVSPetzQ8l2"
+  },
+  "context": {
+    "eventId": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+    "eventType": "providers/firebase.auth/eventTypes/user.create",
+    "resource": "projects/my-project-id",
+    "timestamp": "2020-09-29T11:32:00.123Z"
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/firebase-db1-cloudevent-input.json b/invoker/core/src/test/resources/firebase-db1-cloudevent-input.json
new file mode 100644
index 00000000..0d9783c3
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-db1-cloudevent-input.json
@@ -0,0 +1,15 @@
+{
+  "specversion": "1.0",
+  "type": "google.firebase.database.ref.v1.written",
+  "source": "//firebasedatabase.googleapis.com/projects/_/locations/us-central1/instances/my-project-id",
+  "subject": "refs/gcf-test/xyz",
+  "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+  "time": "2020-09-29T11:32:00.123Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "data": null,
+    "delta": {
+      "grandchild": "other"
+    }
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/firebase-db1-legacy-output.json b/invoker/core/src/test/resources/firebase-db1-legacy-output.json
new file mode 100644
index 00000000..50190855
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-db1-legacy-output.json
@@ -0,0 +1,14 @@
+{
+  "data": {
+    "data": null,
+    "delta": {
+      "grandchild": "other"
+    }
+  },
+  "context": {
+    "resource": "projects/_/instances/my-project-id/refs/gcf-test/xyz",
+    "timestamp": "2020-09-29T11:32:00.123Z",
+    "eventId": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+    "eventType": "providers/google.firebase.database/eventTypes/ref.write" 
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/firebase-db2-cloudevent-input.json b/invoker/core/src/test/resources/firebase-db2-cloudevent-input.json
new file mode 100644
index 00000000..71974d42
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-db2-cloudevent-input.json
@@ -0,0 +1,17 @@
+{
+  "specversion": "1.0",
+  "type": "google.firebase.database.ref.v1.written",
+  "source": "//firebasedatabase.googleapis.com/projects/_/locations/europe-west1/instances/my-project-id",
+  "subject": "refs/gcf-test/xyz",
+  "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+  "time": "2020-09-29T11:32:00.123Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "data": {
+      "grandchild": "other"
+    },
+    "delta": {
+      "grandchild": "other changed"
+    }
+  }
+}
\ No newline at end of file
diff --git a/invoker/core/src/test/resources/firebase-db2-legacy-output.json b/invoker/core/src/test/resources/firebase-db2-legacy-output.json
new file mode 100644
index 00000000..402868fa
--- /dev/null
+++ b/invoker/core/src/test/resources/firebase-db2-legacy-output.json
@@ -0,0 +1,16 @@
+{
+  "data": {
+    "data": {
+      "grandchild": "other"
+    },
+    "delta": {
+      "grandchild": "other changed"
+    }
+  },
+  "context": {
+    "resource": "projects/_/instances/my-project-id/refs/gcf-test/xyz",
+    "timestamp": "2020-09-29T11:32:00.123Z",
+    "eventType": "providers/google.firebase.database/eventTypes/ref.write",
+    "eventId": "aaaaaa-1111-bbbb-2222-cccccccccccc"
+  }
+}
diff --git a/invoker/core/src/test/resources/firestore_complex-cloudevent-input.json b/invoker/core/src/test/resources/firestore_complex-cloudevent-input.json
new file mode 100644
index 00000000..fd5aadfb
--- /dev/null
+++ b/invoker/core/src/test/resources/firestore_complex-cloudevent-input.json
@@ -0,0 +1,80 @@
+{
+  "specversion": "1.0",
+  "type": "google.cloud.firestore.document.v1.written",
+  "source": "//firestore.googleapis.com/projects/project-id/databases/(default)",
+  "subject": "documents/gcf-test/IH75dRdeYJKd4uuQiqch",
+  "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+  "time": "2020-09-29T11:32:00.123Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "oldValue": {},
+    "updateMask": {},
+    "value": {
+      "createTime": "2020-04-23T14:25:05.349632Z",
+      "fields": {
+        "arrayValue": {
+          "arrayValue": {
+            "values": [
+              {
+                "integerValue": "1"
+              },
+              {
+                "integerValue": "2"
+              }
+            ]
+          }
+        },
+        "booleanValue": {
+          "booleanValue": true
+        },
+        "doubleValue": {
+          "doubleValue": 5.5
+        },
+        "geoPointValue": {
+          "geoPointValue": {
+            "latitude": 51.4543,
+            "longitude": -0.9781
+          }
+        },
+        "intValue": {
+          "integerValue": "50"
+        },
+        "mapValue": {
+          "mapValue": {
+            "fields": {
+              "field1": {
+                "stringValue": "x"
+              },
+              "field2": {
+                "arrayValue": {
+                  "values": [
+                    {
+                      "stringValue": "x"
+                    },
+                    {
+                      "integerValue": "1"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "nullValue": {
+          "nullValue": null
+        },
+        "referenceValue": {
+          "referenceValue": "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"
+        },
+        "stringValue": {
+          "stringValue": "text"
+        },
+        "timestampValue": {
+          "timestampValue": "2020-04-23T14:23:53.241Z"
+        }
+      },
+      "name": "projects/project-id/databases/(default)/documents/gcf-test/IH75dRdeYJKd4uuQiqch",
+      "updateTime": "2020-04-23T14:25:05.349632Z"
+    }
+  }
+}
diff --git a/invoker/core/src/test/resources/firestore_complex-legacy-output.json b/invoker/core/src/test/resources/firestore_complex-legacy-output.json
new file mode 100644
index 00000000..dc7a26b4
--- /dev/null
+++ b/invoker/core/src/test/resources/firestore_complex-legacy-output.json
@@ -0,0 +1,79 @@
+{
+  "data": {
+    "oldValue": {},
+    "updateMask": {},
+    "value": {
+      "createTime": "2020-04-23T14:25:05.349632Z",
+      "fields": {
+        "arrayValue": {
+          "arrayValue": {
+            "values": [
+              {
+                "integerValue": "1"
+              },
+              {
+                "integerValue": "2"
+              }
+            ]
+          }
+        },
+        "booleanValue": {
+          "booleanValue": true
+        },
+        "doubleValue": {
+          "doubleValue": 5.5
+        },
+        "geoPointValue": {
+          "geoPointValue": {
+            "latitude": 51.4543,
+            "longitude": -0.9781
+          }
+        },
+        "intValue": {
+          "integerValue": "50"
+        },
+        "mapValue": {
+          "mapValue": {
+            "fields": {
+              "field1": {
+                "stringValue": "x"
+              },
+              "field2": {
+                "arrayValue": {
+                  "values": [
+                    {
+                      "stringValue": "x"
+                    },
+                    {
+                      "integerValue": "1"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        "nullValue": {
+          "nullValue": null
+        },
+        "referenceValue": {
+          "referenceValue": "projects/project-id/databases/(default)/documents/foo/bar/baz/qux"
+        },
+        "stringValue": {
+          "stringValue": "text"
+        },
+        "timestampValue": {
+          "timestampValue": "2020-04-23T14:23:53.241Z"
+        }
+      },
+      "name": "projects/project-id/databases/(default)/documents/gcf-test/IH75dRdeYJKd4uuQiqch",
+      "updateTime": "2020-04-23T14:25:05.349632Z"
+    }
+  },
+  "context": {
+    "eventId": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+    "eventType": "providers/cloud.firestore/eventTypes/document.write",
+    "resource": "projects/project-id/databases/(default)/documents/gcf-test/IH75dRdeYJKd4uuQiqch",
+    "timestamp": "2020-09-29T11:32:00.123Z"
+  }
+}
diff --git a/invoker/core/src/test/resources/pubsub_text-cloudevent-input.json b/invoker/core/src/test/resources/pubsub_text-cloudevent-input.json
new file mode 100644
index 00000000..f4994ee8
--- /dev/null
+++ b/invoker/core/src/test/resources/pubsub_text-cloudevent-input.json
@@ -0,0 +1,20 @@
+{
+  "specversion": "1.0",
+  "type": "google.cloud.pubsub.topic.v1.messagePublished",
+  "source": "//pubsub.googleapis.com/projects/sample-project/topics/gcf-test",
+  "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+  "time": "2020-09-29T11:32:00.123Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "subscription": "projects/sample-project/subscriptions/sample-subscription",
+    "message": {
+      "@type": "type.googleapis.com/google.pubsub.v1.PubsubMessage",
+      "messageId": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+      "publishTime": "2020-09-29T11:32:00.123Z",
+      "attributes": {
+         "attr1":"attr1-value"
+      },
+      "data": "dGVzdCBtZXNzYWdlIDM="
+    }
+  }
+}
diff --git a/invoker/core/src/test/resources/pubsub_text-legacy-output.json b/invoker/core/src/test/resources/pubsub_text-legacy-output.json
new file mode 100644
index 00000000..e1b8b8f9
--- /dev/null
+++ b/invoker/core/src/test/resources/pubsub_text-legacy-output.json
@@ -0,0 +1,19 @@
+{
+   "context": {
+      "eventId":"aaaaaa-1111-bbbb-2222-cccccccccccc",
+      "timestamp":"2020-09-29T11:32:00.123Z",
+      "eventType":"google.pubsub.topic.publish",
+      "resource":{
+        "service":"pubsub.googleapis.com",
+        "name":"projects/sample-project/topics/gcf-test",
+        "type":"type.googleapis.com/google.pubsub.v1.PubsubMessage"
+      }
+   },
+   "data": {
+      "@type": "type.googleapis.com/google.pubsub.v1.PubsubMessage",
+      "attributes": {
+         "attr1":"attr1-value"
+      },
+      "data": "dGVzdCBtZXNzYWdlIDM="
+   }
+}
diff --git a/invoker/core/src/test/resources/storage-cloudevent-input.json b/invoker/core/src/test/resources/storage-cloudevent-input.json
new file mode 100644
index 00000000..2948b99f
--- /dev/null
+++ b/invoker/core/src/test/resources/storage-cloudevent-input.json
@@ -0,0 +1,28 @@
+{
+  "specversion": "1.0",
+  "type": "google.cloud.storage.object.v1.finalized",
+  "source": "//storage.googleapis.com/projects/_/buckets/some-bucket",
+  "subject": "objects/folder/Test.cs",
+  "id": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+  "time": "2020-09-29T11:32:00.123Z",
+  "datacontenttype": "application/json",
+  "data": {
+    "bucket": "some-bucket",
+    "contentType": "text/plain",
+    "crc32c": "rTVTeQ==",
+    "etag": "CNHZkbuF/ugCEAE=",
+    "generation": "1587627537231057",
+    "id": "some-bucket/folder/Test.cs/1587627537231057",
+    "kind": "storage#object",
+    "md5Hash": "kF8MuJ5+CTJxvyhHS1xzRg==",
+    "mediaLink": "https://www.googleapis.com/download/storage/v1/b/some-bucket/o/folder%2FTest.cs?generation=1587627537231057\u0026alt=media",
+    "metageneration": "1",
+    "name": "folder/Test.cs",
+    "selfLink": "https://www.googleapis.com/storage/v1/b/some-bucket/o/folder/Test.cs",
+    "size": "352",
+    "storageClass": "MULTI_REGIONAL",
+    "timeCreated": "2020-04-23T07:38:57.230Z",
+    "timeStorageClassUpdated": "2020-04-23T07:38:57.230Z",
+    "updated": "2020-04-23T07:38:57.230Z"
+  }
+}
diff --git a/invoker/core/src/test/resources/storage-legacy-output.json b/invoker/core/src/test/resources/storage-legacy-output.json
new file mode 100644
index 00000000..88a9fd57
--- /dev/null
+++ b/invoker/core/src/test/resources/storage-legacy-output.json
@@ -0,0 +1,31 @@
+{
+   "context": {
+      "eventId": "aaaaaa-1111-bbbb-2222-cccccccccccc",
+      "timestamp": "2020-09-29T11:32:00.123Z",
+      "eventType": "google.storage.object.finalize",
+      "resource": {
+         "service": "storage.googleapis.com",
+         "name": "projects/_/buckets/some-bucket/objects/folder/Test.cs",
+         "type": "storage#object"
+      }
+   },
+   "data": {
+      "bucket": "some-bucket",
+      "contentType": "text/plain",
+      "crc32c": "rTVTeQ==",
+      "etag": "CNHZkbuF/ugCEAE=",
+      "generation": "1587627537231057",
+      "id": "some-bucket/folder/Test.cs/1587627537231057",
+      "kind": "storage#object",
+      "md5Hash": "kF8MuJ5+CTJxvyhHS1xzRg==",
+      "mediaLink": "https://www.googleapis.com/download/storage/v1/b/some-bucket/o/folder%2FTest.cs?generation=1587627537231057\u0026alt=media",
+      "metageneration": "1",
+      "name": "folder/Test.cs",
+      "selfLink": "https://www.googleapis.com/storage/v1/b/some-bucket/o/folder/Test.cs",
+      "size": "352",
+      "storageClass": "MULTI_REGIONAL",
+      "timeCreated": "2020-04-23T07:38:57.230Z",
+      "timeStorageClassUpdated": "2020-04-23T07:38:57.230Z",
+      "updated": "2020-04-23T07:38:57.230Z"
+   }
+}

From 3e154e3d28f2676653915b90fa67213a562030b5 Mon Sep 17 00:00:00 2001
From: Annie Fu <anniefu@google.com>
Date: Mon, 8 Nov 2021 13:44:24 -0800
Subject: [PATCH 091/308] [maven-release-plugin] prepare release
 java-function-invoker-parent-1.1.0

---
 invoker/conformance/pom.xml           | 6 +++---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 5a794814..a629a29e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.1.0</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -52,7 +52,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.9.9-SNAPSHOT</version>
+          <version>0.10.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 5fd4a9f5..cba7638b 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.1.0</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.1.0</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index bf5d8107..5ee799d0 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.9.9-SNAPSHOT</version>
+  <version>0.10.0</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.0.4-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 989794e6..397605e6 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.1.0</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index b381e41e..c34fb1d2 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.0.4-SNAPSHOT</version>
+    <version>1.1.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.0.4-SNAPSHOT</version>
+  <version>1.1.0</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 1863d1314d95b57a53003f2cf83f1221f46b2502 Mon Sep 17 00:00:00 2001
From: Annie Fu <anniefu@google.com>
Date: Mon, 8 Nov 2021 13:44:52 -0800
Subject: [PATCH 092/308] [maven-release-plugin] prepare for next development
 iteration

---
 invoker/conformance/pom.xml           | 6 +++---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index a629a29e..189f656f 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -52,7 +52,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.10.0</version>
+          <version>0.10.1-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index cba7638b..be3404bb 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 5ee799d0..09782cf5 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.10.0</version>
+  <version>0.10.1-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 397605e6..87b43b62 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index c34fb1d2..6dada9d4 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 6312e648e79d3c0bbc299ea4f64d622e4dbc3b4c Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Fri, 12 Nov 2021 13:32:50 -0800
Subject: [PATCH 093/308] docs: update README.md to use newest release (#125)

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 04a34659..ade347b4 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ You can configure the plugin in `pom.xml`:
 <plugin>
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
-  <version>0.9.8</version>
+  <version>0.10.0</version>
   <configuration>
     <functionTarget>com.example.function.Echo</functionTarget>
   </configuration>
@@ -176,7 +176,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function-maven-plugin:0.9.7:run \
+  mvn com.google.cloud.functions:function-maven-plugin:0.10.0:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 
@@ -187,7 +187,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.3' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.1.0' \
     -DoutputDirectory=.
 ```
 
@@ -195,7 +195,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.0.3 \
+java -jar java-function-invoker-1.1.0 \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -215,7 +215,7 @@ configurations {
 
 dependencies {
     implementation 'com.google.cloud.functions:functions-framework-api:1.0.4'
-    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.0.2'
+    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.1.0'
 }
 
 tasks.register("runFunction", JavaExec) {
@@ -288,7 +288,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.0.3 \
+java -jar java-function-invoker-1.1.0 \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From 14908caa9e5be824dfb74fff3a3234c4bce688e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Mathieu?= <loikeseke@gmail.com>
Date: Mon, 21 Feb 2022 19:05:36 +0100
Subject: [PATCH 094/308] feat: allow to stop the invoker (#128)

---
 .../functions/invoker/runner/Invoker.java     | 76 ++++++++++++++++++-
 1 file changed, 74 insertions(+), 2 deletions(-)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 3256e989..83ad121f 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -198,6 +198,8 @@ private static class FunctionClassLoader extends URLClassLoader {
   private final String functionSignatureType;
   private final ClassLoader functionClassLoader;
 
+  private Server server;
+
   public Invoker(
       Integer port,
       String functionTarget,
@@ -225,8 +227,58 @@ ClassLoader getFunctionClassLoader() {
     return functionClassLoader;
   }
 
+  /**
+   * This will start the server and wait (join) for function calls.
+   * To start the server inside a unit or integration test, use {@link #startTestServer()} instead.
+   *
+   * @see #stopServer()
+   * @throws Exception
+   */
   public void startServer() throws Exception {
-    Server server = new Server(port);
+    startServer(true);
+  }
+
+
+  /**
+   * This will start the server and return.
+   *
+   * This method is designed to be used for unit or integration testing only.
+   * For other use cases use {@link #startServer()}.
+   *
+   * Inside a test a typical usage will be:
+   * <pre>
+   * {@code
+   *         // Create an invoker
+   *         Invoker invoker = new Invoker(
+   *                 8081,
+   *                 "org.example.MyHttpFunction",
+   *                 "http",
+   *                 Thread.currentThread().getContextClassLoader()
+   *         );
+   *
+   *         // Start the test server
+   *         invoker.startTestServer();
+   *
+   *         // Test the function
+   *
+   *         // Stop the test server
+   *         invoker.stopServer();
+   * }
+   * </pre>
+   *
+   * @see #stopServer()
+   * @throws Exception
+   */
+  public void startTestServer() throws Exception {
+    startServer(false);
+  }
+
+  private void startServer(boolean join) throws Exception {
+    if (server != null) {
+      throw new IllegalStateException("Server already started");
+    }
+
+    server = new Server(port);
 
     ServletContextHandler servletContextHandler = new ServletContextHandler();
     servletContextHandler.setContextPath("/");
@@ -261,7 +313,27 @@ public void startServer() throws Exception {
 
     server.start();
     logServerInfo();
-    server.join();
+    if (join) {
+      server.join();
+    }
+  }
+
+  /**
+   * Stop the server.
+   *
+   * @see #startServer()
+   * @see #startTestServer()
+   *
+   * @throws Exception
+   */
+  public void stopServer() throws Exception {
+    if (server == null) {
+      throw new IllegalStateException("Server not yet started");
+    }
+
+    server.stop();
+    // setting the server to null, so it can be started again
+    server = null;
   }
 
   private Class<?> loadFunctionClass() throws ClassNotFoundException {

From aef01901fafcd9fa134a6b0234e7344b1140aaa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?= <emcmanus@google.com>
Date: Mon, 21 Feb 2022 10:15:07 -0800
Subject: [PATCH 095/308] Fix formatting. (#129)

* Fix formatting.

* Another format fix, due to a change in the formatter.
---
 .../functions/invoker/runner/Invoker.java     | 43 +++++++++----------
 .../com/example/functionjar/Background.java   |  4 +-
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 83ad121f..b03b8c63 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -228,8 +228,8 @@ ClassLoader getFunctionClassLoader() {
   }
 
   /**
-   * This will start the server and wait (join) for function calls.
-   * To start the server inside a unit or integration test, use {@link #startTestServer()} instead.
+   * This will start the server and wait (join) for function calls. To start the server inside a
+   * unit or integration test, use {@link #startTestServer()} instead.
    *
    * @see #stopServer()
    * @throws Exception
@@ -238,33 +238,31 @@ public void startServer() throws Exception {
     startServer(true);
   }
 
-
   /**
    * This will start the server and return.
    *
-   * This method is designed to be used for unit or integration testing only.
-   * For other use cases use {@link #startServer()}.
+   * <p>This method is designed to be used for unit or integration testing only. For other use cases
+   * use {@link #startServer()}.
+   *
+   * <p>Inside a test a typical usage will be:
    *
-   * Inside a test a typical usage will be:
-   * <pre>
-   * {@code
-   *         // Create an invoker
-   *         Invoker invoker = new Invoker(
-   *                 8081,
-   *                 "org.example.MyHttpFunction",
-   *                 "http",
-   *                 Thread.currentThread().getContextClassLoader()
-   *         );
+   * <pre>{@code
+   * // Create an invoker
+   * Invoker invoker = new Invoker(
+   *         8081,
+   *         "org.example.MyHttpFunction",
+   *         "http",
+   *         Thread.currentThread().getContextClassLoader()
+   * );
    *
-   *         // Start the test server
-   *         invoker.startTestServer();
+   * // Start the test server
+   * invoker.startTestServer();
    *
-   *         // Test the function
+   * // Test the function
    *
-   *         // Stop the test server
-   *         invoker.stopServer();
-   * }
-   * </pre>
+   * // Stop the test server
+   * invoker.stopServer();
+   * }</pre>
    *
    * @see #stopServer()
    * @throws Exception
@@ -323,7 +321,6 @@ private void startServer(boolean join) throws Exception {
    *
    * @see #startServer()
    * @see #startTestServer()
-   *
    * @throws Exception
    */
   public void stopServer() throws Exception {
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Background.java b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
index 66123a08..6b18b54c 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
@@ -20,7 +20,9 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 
-/** @author emcmanus@google.com (Éamonn McManus) */
+/**
+ * @author emcmanus@google.com (Éamonn McManus)
+ */
 public class Background implements RawBackgroundFunction {
   @Override
   public void accept(String json, Context context) {

From 0e052f376231192278061ec79bcf9d710ec310f4 Mon Sep 17 00:00:00 2001
From: Ludovic Champenois <ludo@google.com>
Date: Thu, 24 Mar 2022 10:37:35 -0700
Subject: [PATCH 096/308] fix: Add build env vars support for function
 deployment. (#133)

* Add build env vars support for function deployment.

* Format.

* Format.
---
 .../functions/plugin/DeployFunction.java      | 23 +++++++++++++++++++
 .../functions/plugin/DeployFunctionTest.java  |  4 ++++
 2 files changed, 27 insertions(+)

diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index 74e0b73f..ed1f760a 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -200,11 +200,27 @@ public class DeployFunction extends CloudSdkMojo {
    */
   @Parameter(alias = "deploy.envvarsfile", property = "function.deploy.envvarsfile")
   String envVarsFile;
+  /**
+   * List of key-value pairs to set as build environment variables. All existing environment variables
+   * will be removed first.
+   */
+  @Parameter(alias = "deploy.setbuildenvvars", property = "function.deploy.setbuildenvvars")
+  Map<String, String> buildEnvironmentVariables;
+  /**
+   * Path to a local YAML file with definitions for all build environment variables. All existing
+   * environment variables will be removed before the new environment variables are added.
+   */
+  @Parameter(alias = "deploy.buildenvvarsfile", property = "function.deploy.buildenvvarsfile")
+  String buildEnvVarsFile;
 
   boolean hasEnvVariables() {
     return (this.environmentVariables != null && !this.environmentVariables.isEmpty());
   }
 
+  boolean hasBuildEnvVariables() {
+    return (this.buildEnvironmentVariables != null && !this.buildEnvironmentVariables.isEmpty());
+  }
+  
   // Select a downloaded Cloud SDK or a user defined Cloud SDK version.
   static Function<String, ManagedCloudSdk> newManagedSdkFactory() {
     return version -> {
@@ -331,6 +347,13 @@ public List<String> getCommands() {
     if (envVarsFile != null) {
       commands.add("--env-vars-file=" + envVarsFile);
     }
+    if (hasBuildEnvVariables()) {
+      Joiner.MapJoiner mapJoiner = Joiner.on(",").withKeyValueSeparator("=");
+      commands.add("--set-build-env-vars=" + mapJoiner.join(buildEnvironmentVariables));
+    }
+    if (buildEnvVarsFile != null) {
+      commands.add("--build-env-vars-file=" + buildEnvVarsFile);
+    }
     commands.add("--runtime=" + runtime);
 
     if (projectId != null) {
diff --git a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
index f1730b96..e5a2913d 100644
--- a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
+++ b/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
@@ -16,6 +16,7 @@ public class DeployFunctionTest {
   public void testDeployFunctionCommandLine() {
     DeployFunction mojo = new DeployFunction();
     mojo.envVarsFile = "myfile";
+    mojo.buildEnvVarsFile = "myfile2";
     mojo.functionTarget = "function";
     mojo.ignoreFile = "ff";
     mojo.maxInstances = new Integer(3);
@@ -30,6 +31,7 @@ public void testDeployFunctionCommandLine() {
     mojo.triggerHttp = true;
     mojo.allowUnauthenticated = true;
     mojo.environmentVariables = ImmutableMap.of("env1", "a", "env2", "b");
+    mojo.buildEnvironmentVariables = ImmutableMap.of("env1", "a", "env2", "b");
     List<String> expected =
         ImmutableList.of(
             "functions",
@@ -49,6 +51,8 @@ public void testDeployFunctionCommandLine() {
             "--max-instances=3",
             "--set-env-vars=env1=a,env2=b",
             "--env-vars-file=myfile",
+            "--set-build-env-vars=env1=a,env2=b",
+            "--build-env-vars-file=myfile2",
             "--runtime=java11");
     assertThat(mojo.getCommands()).isEqualTo(expected);
   }

From faff79d16c6df178d66f0185fb78fba003e60745 Mon Sep 17 00:00:00 2001
From: Ludovic Champenois <ludo@google.com>
Date: Thu, 24 Mar 2022 14:56:09 -0700
Subject: [PATCH 097/308] fix: bump dependency versions (#134)

* Add build env vars support for function deployment.

* Format.

* Format.

* fix: bump some dependendy versions to latest.
---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index be3404bb..b751e6a2 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -97,17 +97,17 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.26.v20200117</version>
+      <version>9.4.45.v20220203</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.26.v20200117</version>
+      <version>9.4.45.v20220203</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
       <artifactId>jcommander</artifactId>
-      <version>1.78</version>
+      <version>1.82</version>
     </dependency>
 
     <!-- Test dependencies -->
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 09782cf5..bb3ee58a 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.2.0</version>
+      <version>2.4.1</version>
       <type>jar</type>
     </dependency>
 

From e9e53e3b52afbe94e1987693ff91f63617ae0241 Mon Sep 17 00:00:00 2001
From: Grant Timmerman <744973+grant@users.noreply.github.com>
Date: Sun, 17 Apr 2022 08:27:14 -0700
Subject: [PATCH 098/308] style: fix lint issues (#135)

Signed-off-by: Grant Timmerman <granttimmerman@gmail.com>
---
 .../com/google/cloud/functions/plugin/DeployFunction.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index ed1f760a..509ccf3e 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -201,8 +201,8 @@ public class DeployFunction extends CloudSdkMojo {
   @Parameter(alias = "deploy.envvarsfile", property = "function.deploy.envvarsfile")
   String envVarsFile;
   /**
-   * List of key-value pairs to set as build environment variables. All existing environment variables
-   * will be removed first.
+   * List of key-value pairs to set as build environment variables. All existing environment
+   * variables will be removed first.
    */
   @Parameter(alias = "deploy.setbuildenvvars", property = "function.deploy.setbuildenvvars")
   Map<String, String> buildEnvironmentVariables;
@@ -220,7 +220,7 @@ boolean hasEnvVariables() {
   boolean hasBuildEnvVariables() {
     return (this.buildEnvironmentVariables != null && !this.buildEnvironmentVariables.isEmpty());
   }
-  
+
   // Select a downloaded Cloud SDK or a user defined Cloud SDK version.
   static Function<String, ManagedCloudSdk> newManagedSdkFactory() {
     return version -> {

From 1ef1fdd5c8f29672746deb3e11f81bf809075816 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 May 2022 15:16:41 -0700
Subject: [PATCH 099/308] Bump gson from 2.8.6 to 2.8.9 in /invoker/conformance
 (#138)

Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 189f656f..9ae9fb7f 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -32,7 +32,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version>
+      <version>2.8.9</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>

From 5345cca5052f0ed04903169305179a98fa37df6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 May 2022 15:16:58 -0700
Subject: [PATCH 100/308] Bump gson from 2.8.6 to 2.8.9 in
 /invoker/testfunction (#137)

Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 invoker/testfunction/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 6dada9d4..b361f97d 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version>
+      <version>2.8.9</version>
     </dependency>
   </dependencies>
 

From 7afcfbbaa723d34cee7534ee8b3fe9834cd82877 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 May 2022 15:17:15 -0700
Subject: [PATCH 101/308] Bump gson from 2.8.6 to 2.8.9 in /invoker/core (#136)

Bumps [gson](https://github.com/google/gson) from 2.8.6 to 2.8.9.
- [Release notes](https://github.com/google/gson/releases)
- [Changelog](https://github.com/google/gson/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/gson/compare/gson-parent-2.8.6...gson-parent-2.8.9)

---
updated-dependencies:
- dependency-name: com.google.code.gson:gson
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 invoker/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index b751e6a2..1475c9e2 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.6</version>
+      <version>2.8.9</version>
     </dependency>
     <dependency>
       <groupId>com.ryanharter.auto.value</groupId>

From 4726b572f6feb0e224f2ffeb0790a4916cb93afd Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <107430880+kappratiksha@users.noreply.github.com>
Date: Thu, 7 Jul 2022 14:47:05 -0700
Subject: [PATCH 102/308] chore: Add buildpack-integration-test for ff java
 (#140)

* adding buildpack integration for java

* add comments

* addressing comments

* accessing tmpdir

* using/tmp

* fixing minor errors

* fixing comments
---
 .../workflows/buildpack-integration-test.yml  | 30 +++++++++++
 invoker/conformance/buildpack_pom.xml         | 52 +++++++++++++++++++
 invoker/conformance/prerun.sh                 | 39 ++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 .github/workflows/buildpack-integration-test.yml
 create mode 100644 invoker/conformance/buildpack_pom.xml
 create mode 100755 invoker/conformance/prerun.sh

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
new file mode 100644
index 00000000..1c4b3a41
--- /dev/null
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -0,0 +1,30 @@
+# Validates Functions Framework with GCF buildpacks.
+name: Buildpack Integration Test
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+jobs:
+  java11-buildpack-test:
+    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.4.1
+    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'
+      # Latest uploaded tag from us.gcr.io/fn-img/us/buildpacks/java11/builder
+      builder-tag: 'java11_20220620_11_0_RC00'
+  java17-buildpack-test:
+    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.4.1
+    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: 'java17'
+      # Latest uploaded tag from us.gcr.io/fn-img/us/buildpacks/java17/builder
+      builder-tag: 'java17_20220617_17_0_RC00'
\ No newline at end of file
diff --git a/invoker/conformance/buildpack_pom.xml b/invoker/conformance/buildpack_pom.xml
new file mode 100644
index 00000000..40fa9e78
--- /dev/null
+++ b/invoker/conformance/buildpack_pom.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud.functions.invoker</groupId>
+  <artifactId>conformance</artifactId>
+  <version>0.0.0-SNAPSHOT</version>
+
+  <name>GCF Conformance Tests</name>
+  <description>
+    A GCF project used to validate conformance to the Functions Framework contract
+    using the Functions Framework Conformance tools.
+  </description>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-conformance</url>
+
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
+  </properties>
+  <repositories>
+    <repository>
+    <id>conformance</id>
+      <url>file:./artifacts</url></repository>
+  </repositories>
+<dependencies>
+    <dependency>
+      <groupId>com.google.cloud.functions</groupId>
+      <artifactId>functions-framework-api</artifactId>
+      <version>0.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.cloud.functions.invoker</groupId>
+      <artifactId>java-function-invoker</artifactId>
+      <version>0.0.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>2.8.9</version>
+    </dependency>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-core</artifactId>
+      <version>2.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>io.cloudevents</groupId>
+      <artifactId>cloudevents-json-jackson</artifactId>
+      <version>2.2.0</version>
+    </dependency>
+  </dependencies>
+</project>
\ No newline at end of file
diff --git a/invoker/conformance/prerun.sh b/invoker/conformance/prerun.sh
new file mode 100755
index 00000000..669d5f49
--- /dev/null
+++ b/invoker/conformance/prerun.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# This script is used for buildpack validation.
+# Its purpose is to run conformance tests using a buildpack
+# with the latest code of functions-framework.
+#
+# Note: buildpack_pom.xml contains the configuration to use the local versions
+# java-function-invoker and functions-framework-api. We will be using this file
+# for running our conformance tests with buildpack.
+#
+# Steps:
+#
+# - Clear out the temp directory
+# - Copy the conformance tests folder into temp
+# - Build java-function-invoker with version 0.0.0-SNAPSHOT into artifacts
+#  folder
+# - Build functions-framework-api with version 0.0.0-SNAPSHOT into artifacts 
+# folder
+# - Ensure that we use the buildpack_pom.xml file by renaming it to pom.xml
+
+
+set -e
+REPO_ROOT=$(git rev-parse --show-toplevel)
+
+rm -rf /tmp/tests
+mkdir /tmp/tests
+
+cp -r $REPO_ROOT/invoker/conformance /tmp/tests
+
+cd $REPO_ROOT/invoker
+mvn versions:set -DnewVersion=0.0.0-SNAPSHOT -DprocessAllModules=true
+mvn install -Dmaven.repo.local=/tmp/tests/conformance/artifacts
+
+cd $REPO_ROOT/functions-framework-api 
+mvn versions:set -DnewVersion=0.0.0-SNAPSHOT -DprocessAllModules=true
+mvn install -Dmaven.repo.local=/tmp/tests/conformance/artifacts
+
+rm /tmp/tests/conformance/pom.xml
+mv /tmp/tests/conformance/buildpack_pom.xml /tmp/tests/conformance/pom.xml

From 439d0b5d77b2f765e65d84e7d5f31399e547d004 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <107430880+kappratiksha@users.noreply.github.com>
Date: Thu, 11 Aug 2022 10:51:57 -0700
Subject: [PATCH 103/308] feat: Increase maximum concurrent requests for jetty
 server to 1000.  (#144)

* Scale java server to support 1000 concurrent requests
---
 .github/workflows/conformance.yaml            | 24 +++++++----
 .../ConcurrentHttpConformanceFunction.java    | 41 +++++++++++++++++++
 .../functions/invoker/runner/Invoker.java     |  9 +++-
 run_conformance_tests.sh                      |  3 ++
 4 files changed, 69 insertions(+), 8 deletions(-)
 create mode 100644 invoker/conformance/src/main/java/com/google/cloud/functions/conformance/ConcurrentHttpConformanceFunction.java

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index fbd1ce18..5c56a303 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -25,7 +25,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@v2
       with:
-        go-version: '1.15'
+        go-version: '1.16'
 
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
@@ -34,18 +34,18 @@ jobs:
       run: (cd invoker/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
       with:
-        version: 'v1.2.1'
+        version: 'v1.6.0'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
       with:
-        version: 'v1.2.1'
+        version: 'v1.6.0'
         functionType: 'legacyevent'
         useBuildpacks: false
         validateMapping: true
@@ -53,11 +53,21 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.2.1
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
       with:
-        version: 'v1.2.1'
+        version: 'v1.6.0'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction'"
         startDelay: 10
+
+    - name: Run HTTP concurrency conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
+      with:
+        version: 'v1.6.0'
+        functionType: 'http'
+        useBuildpacks: false
+        validateConcurrency: true
+        cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.ConcurrentHttpConformanceFunction'"
+        startDelay: 10
\ No newline at end of file
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/ConcurrentHttpConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/ConcurrentHttpConformanceFunction.java
new file mode 100644
index 00000000..a342b2ea
--- /dev/null
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/ConcurrentHttpConformanceFunction.java
@@ -0,0 +1,41 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.conformance;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+
+/**
+ * This class is used by the Functions Framework Conformance Tools to validate concurrency for HTTP
+ * functions. It can be run with the following command:
+ *
+ * <pre>{@code
+ * $ functions-framework-conformance-client \
+ *   -cmd="mvn function:run -Drun.functionTarget=com.google.cloud.functions.conformance.ConcurrentHttpConformanceFunction" \
+ *   -type=http \
+ *   -buildpacks=false \
+ *   -validate-mapping=false \
+ *   -start-delay=5 \
+ *   -validate-concurrency=true
+ * }</pre>
+ */
+public class ConcurrentHttpConformanceFunction implements HttpFunction {
+
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws InterruptedException {
+    Thread.sleep(1000);
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index b03b8c63..d35e21ea 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -52,11 +52,14 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 /**
  * Java server that runs the user's code (a jar file) on HTTP request and an HTTP response is sent
@@ -276,7 +279,11 @@ private void startServer(boolean join) throws Exception {
       throw new IllegalStateException("Server already started");
     }
 
-    server = new Server(port);
+    QueuedThreadPool pool = new QueuedThreadPool(1024);
+    server = new Server(pool);
+    ServerConnector connector = new ServerConnector(server);
+    connector.setPort(port);
+    server.setConnectors(new Connector[] {connector});
 
     ServletContextHandler servletContextHandler = new ServletContextHandler();
     servletContextHandler.setContextPath("/");
diff --git a/run_conformance_tests.sh b/run_conformance_tests.sh
index 6276f158..9f344caa 100755
--- a/run_conformance_tests.sh
+++ b/run_conformance_tests.sh
@@ -46,3 +46,6 @@ client -buildpacks=false -type=legacyevent -cmd='mvn -f invoker/conformance/pom.
 
 print_header "CLOUDEVENT CONFORMANCE TESTS"
 client -buildpacks=false -type=cloudevent -cmd='mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.CloudEventsConformanceFunction' -start-delay 5 -validate-mapping=false
+
+print_header "HTTP CONCURRENCY TESTS"
+client -buildpacks=false -type=http -cmd='mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.ConcurrentHttpConformanceFunction' -start-delay 5 -validate-concurrency=true

From 06fae5bf01d1322b5e12005fc735d1ccd3d1a721 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <107430880+kappratiksha@users.noreply.github.com>
Date: Wed, 17 Aug 2022 13:44:51 -0700
Subject: [PATCH 104/308] chore: Prepare for next development iteration  (#145)

* [maven-release-plugin] prepare release java-function-invoker-parent-1.1.1

* [maven-release-plugin] prepare for next development iteration
---
 invoker/conformance/pom.xml           | 6 +++---
 invoker/core/pom.xml                  | 6 +++---
 invoker/function-maven-plugin/pom.xml | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 9ae9fb7f..0a34c40d 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -52,7 +52,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.10.1-SNAPSHOT</version>
+          <version>0.10.2-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 1475c9e2..dab8e9ce 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index bb3ee58a..67b34ffd 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.10.1-SNAPSHOT</version>
+  <version>0.10.2-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.2-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 87b43b62..80862acf 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index b361f97d..e62b5f40 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 99908bb573a6fa6652f4ee8246bed2c8675fa0fa Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <107430880+kappratiksha@users.noreply.github.com>
Date: Wed, 17 Aug 2022 17:07:20 -0700
Subject: [PATCH 105/308] docs: update README.md to use latest release (#146)

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index ade347b4..780a8c34 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ You can configure the plugin in `pom.xml`:
 <plugin>
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
-  <version>0.10.0</version>
+  <version>0.10.1</version>
   <configuration>
     <functionTarget>com.example.function.Echo</functionTarget>
   </configuration>
@@ -176,7 +176,7 @@ mvn function:run
 You can alternatively configure the plugin with properties on the command line:
 
 ```sh
-  mvn com.google.cloud.functions:function-maven-plugin:0.10.0:run \
+  mvn com.google.cloud.functions:function-maven-plugin:0.10.1:run \
       -Drun.functionTarget=com.example.function.Echo
 ```
 
@@ -187,7 +187,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.1.0' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.1.1' \
     -DoutputDirectory=.
 ```
 
@@ -195,7 +195,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.1.0 \
+java -jar java-function-invoker-1.1.1 \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -215,7 +215,7 @@ configurations {
 
 dependencies {
     implementation 'com.google.cloud.functions:functions-framework-api:1.0.4'
-    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.1.0'
+    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.1.1'
 }
 
 tasks.register("runFunction", JavaExec) {
@@ -288,7 +288,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.1.0 \
+java -jar java-function-invoker-1.1.1 \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From 925a75cc046626a49cc8d30c4ad99b249909f712 Mon Sep 17 00:00:00 2001
From: Pratiksha Kap <107430880+kappratiksha@users.noreply.github.com>
Date: Fri, 2 Sep 2022 09:42:43 -0700
Subject: [PATCH 106/308] chore: Code restructuring. Move maven plugin into top
 level directory (#147)

---
 .../pom.xml                                   | 63 ++++++++++++++++---
 .../functions/plugin/DeployFunction.java      |  0
 .../cloud/functions/plugin/RunFunction.java   |  0
 .../functions/plugin/DeployFunctionTest.java  |  0
 invoker/conformance/pom.xml                   |  2 +-
 invoker/pom.xml                               |  1 -
 6 files changed, 57 insertions(+), 9 deletions(-)
 rename {invoker/function-maven-plugin => function-maven-plugin}/pom.xml (57%)
 rename {invoker/function-maven-plugin => function-maven-plugin}/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java (100%)
 rename {invoker/function-maven-plugin => function-maven-plugin}/src/main/java/com/google/cloud/functions/plugin/RunFunction.java (100%)
 rename {invoker/function-maven-plugin => function-maven-plugin}/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java (100%)

diff --git a/invoker/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
similarity index 57%
rename from invoker/function-maven-plugin/pom.xml
rename to function-maven-plugin/pom.xml
index 67b34ffd..3297047a 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -1,12 +1,6 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>com.google.cloud.functions.invoker</groupId>
-    <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
-  </parent>
-
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -16,6 +10,13 @@
     using the Java Functions Framework.</description>
   <url>http://maven.apache.org</url>
 
+  <scm>
+    <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
+    <connection>scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/GoogleCloudPlatform/functions-framework-java.git</developerConnection>
+    <tag>HEAD</tag>
+  </scm>
+
   <properties>
     <maven.compiler.release>8</maven.compiler.release>
     <maven.compiler.source>8</maven.compiler.source>
@@ -44,7 +45,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.1.1</version>
     </dependency>
 
     <dependency>
@@ -85,4 +86,52 @@
       </plugin>
     </plugins>
   </build>
+  <distributionManagement>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <name>Sonatype Nexus Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <name>Nexus Release Repository</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
+  <profiles>
+    <profile>
+      <id>sonatype-oss-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
similarity index 100%
rename from invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
rename to function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
similarity index 100%
rename from invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
rename to function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
diff --git a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
similarity index 100%
rename from invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
rename to function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 0a34c40d..06b13b59 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -52,7 +52,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.10.2-SNAPSHOT</version>
+          <version>0.10.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 80862acf..86bcb069 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -27,7 +27,6 @@
   <modules>
     <module>core</module>
     <module>testfunction</module>
-    <module>function-maven-plugin</module>
     <module>conformance</module>
   </modules>
 

From 9c88d183bc6bb0e591a2e107e7147eade9be1f7b Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Fri, 9 Sep 2022 13:53:24 -0700
Subject: [PATCH 107/308] chore: Check in initial kokoro build config and build
 script (#149)

---
 .kokoro/release.cfg | 14 ++++++++++++++
 .kokoro/release.sh  |  2 ++
 2 files changed, 16 insertions(+)
 create mode 100644 .kokoro/release.cfg
 create mode 100644 .kokoro/release.sh

diff --git a/.kokoro/release.cfg b/.kokoro/release.cfg
new file mode 100644
index 00000000..6fc853b0
--- /dev/null
+++ b/.kokoro/release.cfg
@@ -0,0 +1,14 @@
+build_file: "functions-framework-java/.kokoro/release.sh"
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 75669
+      keyname: "functions-framework-java-release-bot-gpg-passphrase"
+    }
+    keystore_resource {
+      keystore_config_id: 75669
+      keyname: "functions-framework-java-release-bot-sonatype-password"
+    }
+  }
+}
\ No newline at end of file
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
new file mode 100644
index 00000000..67dd6dab
--- /dev/null
+++ b/.kokoro/release.sh
@@ -0,0 +1,2 @@
+# Make sure `JAVA_HOME` is set.
+echo "JAVA_HOME = $JAVA_HOME"
\ No newline at end of file

From 06d3f4437e75deba1cd3b0062bf508ae827f54ec Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:50:12 -0700
Subject: [PATCH 108/308] chore: setup Release Please (#148)

* chore: setup Release Please

This creates PRs that can be merged to create GitHub Releases for each
of the components of Functions Framework Java.
---
 .github/.release-please-manifest.json |  1 +
 .github/release-please-config.json    | 73 +++++++++++++++++++++++++++
 .github/release-please.yml            |  5 ++
 3 files changed, 79 insertions(+)
 create mode 100644 .github/.release-please-manifest.json
 create mode 100644 .github/release-please-config.json
 create mode 100644 .github/release-please.yml

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
new file mode 100644
index 00000000..369e3ece
--- /dev/null
+++ b/.github/.release-please-manifest.json
@@ -0,0 +1 @@
+{"functions-framework-api":"1.0.4","invoker":"1.1.1","function-maven-plugin":"0.10.1"}
\ No newline at end of file
diff --git a/.github/release-please-config.json b/.github/release-please-config.json
new file mode 100644
index 00000000..afc739a2
--- /dev/null
+++ b/.github/release-please-config.json
@@ -0,0 +1,73 @@
+{
+    "separate-pull-requests": true,
+    "packages": {
+        "functions-framework-api": {
+            "release-type": "maven",
+            "component": "functions-framework-api",
+            "extra-files": [
+                {
+                    "type": "xml",
+                    "path": "pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='functions-framework-api']/parent::*/*[local-name()='version']"
+                }
+            ]
+        },
+        "invoker": {
+            "release-type": "maven",
+            "component": "java-function-invoker",
+            "extra-files": [
+                {
+                    "type": "xml",
+                    "path": "pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker-parent']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "core/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker-parent']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "core/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "core/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker-testfunction']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "conformance/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker-parent']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "conformance/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='conformance']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "testfunction/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker-parent']/parent::*/*[local-name()='version']"
+                },
+                {
+                    "type": "xml",
+                    "path": "testfunction/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='java-function-invoker-testfunction']/parent::*/*[local-name()='version']"
+                }
+            ]
+        },
+        "function-maven-plugin": {
+            "release-type": "maven",
+            "component": "function-maven-plugin",
+            "extra-files": [
+                {
+                    "type": "xml",
+                    "path": "pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='function-maven-plugin']/parent::*/*[local-name()='version']"
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/.github/release-please.yml b/.github/release-please.yml
new file mode 100644
index 00000000..2e936db0
--- /dev/null
+++ b/.github/release-please.yml
@@ -0,0 +1,5 @@
+handleGHRelease: true
+monorepoTags: true
+manifest: true
+manifestConfig: '.github/release-please-config.json'
+manifestFile: '.github/.release-please-manifest.json'
\ No newline at end of file

From e82898654bc7735ed38cc3c85d05e8839b18e0a1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 10:58:26 -0700
Subject: [PATCH 109/308] chore(master): release function-maven-plugin
 0.10.2-SNAPSHOT (#152)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

From 919e515019ef638874de807396bb4146e3d230aa Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 11:09:54 -0700
Subject: [PATCH 110/308] chore(master): release java-function-invoker
 1.1.2-SNAPSHOT (#151)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

From 72f14378d82816a1c283bd5cdb757cbe75a6d387 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 11:10:12 -0700
Subject: [PATCH 111/308] chore(master): release functions-framework-api
 1.0.5-SNAPSHOT (#150)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>

From b0c80dd0e0e55b0744ed2bd3cee8cd5cb174bde3 Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Tue, 13 Sep 2022 13:09:58 -0700
Subject: [PATCH 112/308] chore: Print kokoro job name in script (#155)

* chore: Check in initial kokoro build config and build script

* chore: Print out kokoro job name

* remove space in printed out strings
---
 .kokoro/release.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 67dd6dab..ba9d33e3 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -1,2 +1,6 @@
+#!/bin/bash
+
 # Make sure `JAVA_HOME` is set.
-echo "JAVA_HOME = $JAVA_HOME"
\ No newline at end of file
+echo "JAVA_HOME=$JAVA_HOME"
+
+echo "KOKORO_JOB_NAME=${KOKORO_JOB_NAME}"

From 1845551f13274676b2bed28cc6a279122c33c913 Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Wed, 14 Sep 2022 13:57:28 -0700
Subject: [PATCH 113/308] chore: add nexus-staging-maven-plugin for auto
 closing the staging repo (#156)

---
 function-maven-plugin/pom.xml   | 29 +++++++++++--
 functions-framework-api/pom.xml | 11 +++++
 invoker/pom.xml                 | 73 +++++++++++++++++++++++++++++++++
 3 files changed, 110 insertions(+), 3 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 3297047a..43124011 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -18,9 +18,8 @@
   </scm>
 
   <properties>
-    <maven.compiler.release>8</maven.compiler.release>
-    <maven.compiler.source>8</maven.compiler.source>
-    <maven.compiler.target>8</maven.compiler.target>
+    <maven.compiler.source>11</maven.compiler.source>
+    <maven.compiler.target>11</maven.compiler.target>
   </properties>
 
   <dependencies>
@@ -116,6 +115,19 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.1.0</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
@@ -130,6 +142,17 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>sonatype-nexus-snapshots</serverId>
+              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 27246b71..4e779dc6 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -186,6 +186,17 @@
               </execution>
             </executions>
           </plugin>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>sonatype-nexus-snapshots</serverId>
+              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+            </configuration>
+          </plugin>
         </plugins>
       </build>
     </profile>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 86bcb069..6d0113ba 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -46,4 +46,77 @@
       </dependency>
     </dependencies>
   </dependencyManagement>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <name>Sonatype Nexus Snapshots</name>
+      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <name>Nexus Release Repository</name>
+      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+  </distributionManagement>
+  <profiles>
+    <profile>
+      <id>sonatype-oss-release</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+              <execution>
+                <id>attach-sources</id>
+                <goals>
+                  <goal>jar-no-fork</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.1.0</version>
+            <executions>
+              <execution>
+                <id>attach-javadocs</id>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.6</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.13</version>
+            <extensions>true</extensions>
+            <configuration>
+              <serverId>sonatype-nexus-snapshots</serverId>
+              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
 </project>

From 58222eedb4db5836261cf6c452bd6c307e25466d Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Thu, 15 Sep 2022 15:15:40 -0700
Subject: [PATCH 114/308] chore: Update kokoro build script to push to Maven
 (#157)

* chore: update build script to push to Maven

* print out the current dir

* comment on the gpg keybox file

* add more mvn flags
---
 .kokoro/release.cfg |  6 ++++-
 .kokoro/release.sh  | 63 +++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/.kokoro/release.cfg b/.kokoro/release.cfg
index 6fc853b0..109948a0 100644
--- a/.kokoro/release.cfg
+++ b/.kokoro/release.cfg
@@ -2,6 +2,10 @@ build_file: "functions-framework-java/.kokoro/release.sh"
 
 before_action {
   fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 75669
+      keyname: "functions-framework-java-release-bot-gpg-pubring"
+    }
     keystore_resource {
       keystore_config_id: 75669
       keyname: "functions-framework-java-release-bot-gpg-passphrase"
@@ -11,4 +15,4 @@ before_action {
       keyname: "functions-framework-java-release-bot-sonatype-password"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index ba9d33e3..abd3b431 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -1,6 +1,65 @@
 #!/bin/bash
 
-# Make sure `JAVA_HOME` is set.
-echo "JAVA_HOME=$JAVA_HOME"
+# Get secrets from keystore and set and environment variables.
+setup_environment_secrets() {
+  export SONATYPE_USERNAME=functions-framework-release-bot
+  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password)
+  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-passphrase)
+
+  # Add the keybox file to $GNUPGHOME to verify the GPG credentials.
+  export GNUPGHOME=/tmp/gpg
+  mkdir $GNUPGHOME
+  mv ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-pubring $GNUPGHOME/pubring.kbx
+}
+
+create_settings_xml_file() {
+  echo "<settings>
+   <profiles>
+     <profile>
+         <activation>
+             <activeByDefault>true</activeByDefault>
+         </activation>
+         <properties>
+             <gpg.passphrase>${GPG_PASSPHRASE}</gpg.passphrase>
+         </properties>
+     </profile>
+  </profiles>
+  <servers>
+    <server>
+      <id>sonatype-nexus-staging</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>" > $1
+}
 
+setup_environment_secrets
+
+# Pick the right package to release based on the Kokoro job name.
+cd ${KOKORO_ARTIFACTS_DIR}/github/functions-framework-java
+create_settings_xml_file "settings.xml"
 echo "KOKORO_JOB_NAME=${KOKORO_JOB_NAME}"
+if [[ $KOKORO_JOB_NAME == *"function-maven-plugin"* ]]; then
+  cd function-maven-plugin
+elif [[ $KOKORO_JOB_NAME == *"functions-framework-api"* ]]; then
+  cd functions-framework-api
+else
+  cd invoker
+fi
+echo "pwd=$(pwd)"
+
+# Make sure `JAVA_HOME` is set and using jdk11.
+sudo update-java-alternatives --set java-1.11.0-openjdk-amd64
+echo "JAVA_HOME=$JAVA_HOME"
+mvn clean deploy -B \
+  -P sonatype-oss-release \
+  --settings=../settings.xml \
+  -Dgpg.executable=gpg \
+  -Dgpg.passphrase=${GPG_PASSPHRASE} \
+  -Dgpg.homedir=${GNUPGHOME}

From ffcda6009a5475355e02945878ab37a416ab43ac Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Thu, 15 Sep 2022 17:05:10 -0700
Subject: [PATCH 115/308] chore: explicitly set JAVA_HOME (#158)

---
 .kokoro/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index abd3b431..5cd5449b 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -55,7 +55,7 @@ fi
 echo "pwd=$(pwd)"
 
 # Make sure `JAVA_HOME` is set and using jdk11.
-sudo update-java-alternatives --set java-1.11.0-openjdk-amd64
+export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
 echo "JAVA_HOME=$JAVA_HOME"
 mvn clean deploy -B \
   -P sonatype-oss-release \

From a74d17814a9f37dbc9124f84f1c7018eda1083cc Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Thu, 15 Sep 2022 18:28:26 -0700
Subject: [PATCH 116/308] chore: restart gpg agent (#159)

---
 .kokoro/release.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 5cd5449b..b3324f20 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -10,6 +10,8 @@ setup_environment_secrets() {
   export GNUPGHOME=/tmp/gpg
   mkdir $GNUPGHOME
   mv ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-pubring $GNUPGHOME/pubring.kbx
+  # Restart the gpg-agent to avoid the error of no default secret key.
+  gpg -k
 }
 
 create_settings_xml_file() {

From fea34f64b6c10d95259385ecd0e6733ee4ec898a Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Fri, 16 Sep 2022 14:04:02 -0700
Subject: [PATCH 117/308] chore: use gpg2 to sign the packages (#160)

---
 .kokoro/release.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index b3324f20..e08a55e1 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Stop execution when any command fails.
+set -e
+
 # Get secrets from keystore and set and environment variables.
 setup_environment_secrets() {
   export SONATYPE_USERNAME=functions-framework-release-bot
@@ -11,7 +14,7 @@ setup_environment_secrets() {
   mkdir $GNUPGHOME
   mv ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-pubring $GNUPGHOME/pubring.kbx
   # Restart the gpg-agent to avoid the error of no default secret key.
-  gpg -k
+  gpg2 -k
 }
 
 create_settings_xml_file() {
@@ -62,6 +65,6 @@ echo "JAVA_HOME=$JAVA_HOME"
 mvn clean deploy -B \
   -P sonatype-oss-release \
   --settings=../settings.xml \
-  -Dgpg.executable=gpg \
+  -Dgpg.executable=gpg2 \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \
   -Dgpg.homedir=${GNUPGHOME}

From daa3c045d7f08dd3e76c1ed55650e6c629fad2ec Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Fri, 16 Sep 2022 14:43:44 -0700
Subject: [PATCH 118/308] chore: don't list all keys in the gpg keybox (#161)

---
 .kokoro/release.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index e08a55e1..7a946000 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -13,8 +13,6 @@ setup_environment_secrets() {
   export GNUPGHOME=/tmp/gpg
   mkdir $GNUPGHOME
   mv ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-pubring $GNUPGHOME/pubring.kbx
-  # Restart the gpg-agent to avoid the error of no default secret key.
-  gpg2 -k
 }
 
 create_settings_xml_file() {

From 1e29d09ccfc1db9659d4573999f668df0369d17b Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Mon, 19 Sep 2022 13:40:01 -0700
Subject: [PATCH 119/308] chore: update gpg credentials for signing Maven jars
 (#162)

---
 .kokoro/release.cfg | 14 +++++++++-----
 .kokoro/release.sh  | 10 ++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.kokoro/release.cfg b/.kokoro/release.cfg
index 109948a0..f2ee4665 100644
--- a/.kokoro/release.cfg
+++ b/.kokoro/release.cfg
@@ -4,15 +4,19 @@ before_action {
   fetch_keystore {
     keystore_resource {
       keystore_config_id: 75669
-      keyname: "functions-framework-java-release-bot-gpg-pubring"
+      keyname: "functions-framework-java-release-bot-sonatype-password"
     }
     keystore_resource {
-      keystore_config_id: 75669
-      keyname: "functions-framework-java-release-bot-gpg-passphrase"
+      keystore_config_id: 70247
+      keyname: "maven-gpg-pubkeyring"
     }
     keystore_resource {
-      keystore_config_id: 75669
-      keyname: "functions-framework-java-release-bot-sonatype-password"
+      keystore_config_id: 70247
+      keyname: "maven-gpg-keyring"
+    }
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-passphrase"
     }
   }
 }
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 7a946000..2e3a96d3 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -7,12 +7,14 @@ set -e
 setup_environment_secrets() {
   export SONATYPE_USERNAME=functions-framework-release-bot
   export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password)
-  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-passphrase)
+  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
 
-  # Add the keybox file to $GNUPGHOME to verify the GPG credentials.
+  # Add the key ring files to $GNUPGHOME to verify the GPG credentials.
   export GNUPGHOME=/tmp/gpg
   mkdir $GNUPGHOME
-  mv ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-pubring $GNUPGHOME/pubring.kbx
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GNUPGHOME/pubring.gpg
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GNUPGHOME/secring.gpg
+  gpg -k
 }
 
 create_settings_xml_file() {
@@ -63,6 +65,6 @@ echo "JAVA_HOME=$JAVA_HOME"
 mvn clean deploy -B \
   -P sonatype-oss-release \
   --settings=../settings.xml \
-  -Dgpg.executable=gpg2 \
+  -Dgpg.executable=gpg \
   -Dgpg.passphrase=${GPG_PASSPHRASE} \
   -Dgpg.homedir=${GNUPGHOME}

From f7f6e6dcf4cd0a0ba0eaf7e5de342215f563b460 Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Mon, 3 Oct 2022 16:24:54 -0700
Subject: [PATCH 120/308] chore: enable release trigger (#163)

---
 .github/release-trigger.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/release-trigger.yml

diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
new file mode 100644
index 00000000..7fe36225
--- /dev/null
+++ b/.github/release-trigger.yml
@@ -0,0 +1 @@
+enabled: true
\ No newline at end of file

From f5231a2303aa3565b29d494936e40ee1ec78fdbb Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Wed, 5 Oct 2022 13:44:04 -0700
Subject: [PATCH 121/308] fix: bump jetty version to 9.4.49.v20220914 (#164)

---
 invoker/core/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index dab8e9ce..80727128 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -97,12 +97,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.45.v20220203</version>
+      <version>9.4.49.v20220914</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.45.v20220203</version>
+      <version>9.4.49.v20220914</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>

From 4a4e471d05c93a95c5bb84dadd71ab7ae92352f0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 5 Oct 2022 14:12:41 -0700
Subject: [PATCH 122/308] chore(master): release java-function-invoker 1.2.0
 (#154)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 invoker/CHANGELOG.md                  | 19 +++++++++++++++++++
 invoker/conformance/pom.xml           |  6 +++---
 invoker/core/pom.xml                  |  8 ++++----
 invoker/pom.xml                       |  4 ++--
 invoker/testfunction/pom.xml          |  6 +++---
 6 files changed, 32 insertions(+), 13 deletions(-)
 create mode 100644 invoker/CHANGELOG.md

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 369e3ece..485ec31c 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.0.4","invoker":"1.1.1","function-maven-plugin":"0.10.1"}
\ No newline at end of file
+{"functions-framework-api":"1.0.4","invoker":"1.2.0","function-maven-plugin":"0.10.1"}
\ No newline at end of file
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
new file mode 100644
index 00000000..21d264fc
--- /dev/null
+++ b/invoker/CHANGELOG.md
@@ -0,0 +1,19 @@
+# Changelog
+
+## [1.2.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.1.1...java-function-invoker-v1.2.0) (2022-10-05)
+
+
+### Features
+
+* allow to stop the invoker ([#128](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/128)) ([14908ca](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/14908caa9e5be824dfb74fff3a3234c4bce688e7))
+* enable converting CloudEvent requests to Background Event requests ([#123](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/123)) ([1c4a014](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/1c4a01470cc4ee7b3de3c3d7ae4af24e47eb2810))
+* Increase maximum concurrent requests for jetty server to 1000.  ([#144](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/144)) ([439d0b5](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/439d0b5d77b2f765e65d84e7d5f31399e547d004))
+
+
+### Bug Fixes
+
+* Add build env vars support for function deployment. ([#133](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/133)) ([0e052f3](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/0e052f376231192278061ec79bcf9d710ec310f4))
+* bump dependency versions ([#134](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/134)) ([faff79d](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/faff79d16c6df178d66f0185fb78fba003e60745))
+* bump jetty version to 9.4.49.v20220914 ([#164](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/164)) ([f5231a2](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/f5231a2303aa3565b29d494936e40ee1ec78fdbb))
+* make user function exceptions log level SEVERE ([#113](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/113)) ([1684c0e](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/1684c0ef55dc33f2c4c7f7514d99b0e7af75c44f))
+* update conformance tests ([#108](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/108)) ([72852d0](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/72852d0f23cdaed48569245440dcd1533c8c7563))
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 06b13b59..baa9ec63 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -57,4 +57,4 @@
       </plugins>
     </pluginManagement>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 80727128..1139e1ed 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.1.2-SNAPSHOT</version>
+      <version>1.2.0</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -183,4 +183,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 6d0113ba..9f363ab5 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
@@ -119,4 +119,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index e62b5f40..ab0b7a00 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.2.0</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.
@@ -92,4 +92,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
\ No newline at end of file

From 2bd81be88f8b99e2d4a23f0c9c1a9a429f9f1d86 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Oct 2022 14:47:56 -0700
Subject: [PATCH 123/308] chore(master): release java-function-invoker
 1.2.1-SNAPSHOT (#165)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index baa9ec63..4531c93c 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 1139e1ed..6688f2b9 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.0</version>
+      <version>1.2.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 9f363ab5..d1b0e50f 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index ab0b7a00..d89eef20 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.0</version>
+    <version>1.2.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.0</version>
+  <version>1.2.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 6a6662c2a61472f5bfaad806dec370c065ee386f Mon Sep 17 00:00:00 2001
From: Jihui Nie <56172920+jihuin@users.noreply.github.com>
Date: Thu, 6 Oct 2022 14:54:47 -0700
Subject: [PATCH 124/308] chore: auto release to Maven after closing staging
 repo (#166)

---
 function-maven-plugin/pom.xml   | 2 +-
 functions-framework-api/pom.xml | 2 +-
 invoker/pom.xml                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 43124011..61e69484 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -150,7 +150,7 @@
             <configuration>
               <serverId>sonatype-nexus-snapshots</serverId>
               <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+              <autoReleaseAfterClose>true</autoReleaseAfterClose>
             </configuration>
           </plugin>
         </plugins>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 4e779dc6..565aa357 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -194,7 +194,7 @@
             <configuration>
               <serverId>sonatype-nexus-snapshots</serverId>
               <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+              <autoReleaseAfterClose>true</autoReleaseAfterClose>
             </configuration>
           </plugin>
         </plugins>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index d1b0e50f..44640217 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -112,7 +112,7 @@
             <configuration>
               <serverId>sonatype-nexus-snapshots</serverId>
               <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>false</autoReleaseAfterClose>
+              <autoReleaseAfterClose>true</autoReleaseAfterClose>
             </configuration>
           </plugin>
         </plugins>

From 99b162a91c6a1089597c550e76dd28c083a09ce4 Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Mon, 7 Nov 2022 15:15:15 -0800
Subject: [PATCH 125/308] chore: update buildpack integration test (#168)

---
 .github/workflows/buildpack-integration-test.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 1c4b3a41..6d290f64 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -7,7 +7,7 @@ on:
   workflow_dispatch:
 jobs:
   java11-buildpack-test:
-    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.4.1
+    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.8.0
     with:
       http-builder-source: '/tmp/tests/conformance'
       http-builder-target: 'com.google.cloud.functions.conformance.HttpConformanceFunction'
@@ -15,16 +15,12 @@ jobs:
       cloudevent-builder-target: 'com.google.cloud.functions.conformance.CloudEventsConformanceFunction'
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java11'
-      # Latest uploaded tag from us.gcr.io/fn-img/us/buildpacks/java11/builder
-      builder-tag: 'java11_20220620_11_0_RC00'
   java17-buildpack-test:
-    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.4.1
+    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.8.0
     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: 'java17'
-      # Latest uploaded tag from us.gcr.io/fn-img/us/buildpacks/java17/builder
-      builder-tag: 'java17_20220617_17_0_RC00'
\ No newline at end of file
+      builder-runtime: 'java17'
\ No newline at end of file

From 64ead930064fff55424d6337ea75caf63f9a30e6 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Tue, 29 Nov 2022 10:13:39 -0800
Subject: [PATCH 126/308] Fix type in README.md (#169)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 780a8c34..9edaee1e 100644
--- a/README.md
+++ b/README.md
@@ -305,7 +305,7 @@ It is a list of entries separated by `:` (`;` on Windows), where each entry is:
   in that directory (file called `foo.jar`) is treated the same way as if it
   had been named explicitly.
 
-#### Simplifying the claspath
+#### Simplifying the classpath
 
 Specifying the right classpath can be tricky. A simpler alternative is to
 build the function as a "fat jar", where the function code and all its

From 3b7b70152ca614e2a3b52f1a7c07d89221095a7d Mon Sep 17 00:00:00 2001
From: Pablo Perich <pablo.perich@gmail.com>
Date: Thu, 1 Dec 2022 19:08:33 -0300
Subject: [PATCH 127/308] feat: Add --gen2 support (#172)

---
 .../google/cloud/functions/plugin/DeployFunction.java  | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index 509ccf3e..821467e0 100644
--- a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -212,7 +212,12 @@ public class DeployFunction extends CloudSdkMojo {
    */
   @Parameter(alias = "deploy.buildenvvarsfile", property = "function.deploy.buildenvvarsfile")
   String buildEnvVarsFile;
-
+  /**
+  * If true, deploys the function in the 2nd Generation Environment.
+  */
+  @Parameter(alias = "deploy.gen2", property = "function.deploy.gen2", defaultValue = "false")
+  boolean gen2;
+    
   boolean hasEnvVariables() {
     return (this.environmentVariables != null && !this.environmentVariables.isEmpty());
   }
@@ -287,6 +292,9 @@ public List<String> getCommands() {
     commands.add("functions");
     commands.add("deploy");
     commands.add(name);
+    if (gen2) {
+      commands.add("--gen2");
+    }
     if (region != null) {
       commands.add("--region=" + region);
     }

From 19fd8ebfe4b5267e858a865c447f279d6f8b5db1 Mon Sep 17 00:00:00 2001
From: Annie Fu <16651409+anniefu@users.noreply.github.com>
Date: Thu, 1 Dec 2022 17:22:08 -0800
Subject: [PATCH 128/308] chore: fix formatting and linting action (#174)

* chore: fix formatting and linting action

* fix formatting in DeployFunction.java
---
 .github/workflows/lint.yaml                        | 14 +++++---------
 .../cloud/functions/plugin/DeployFunction.java     |  6 ++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 82a20cfe..a6356989 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -25,16 +25,12 @@ jobs:
   formatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2 # v2 minimum required
+      - uses: actions/checkout@v3 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@v3
         with:
-          args: "--dry-run --set-exit-if-changed"
-        continue-on-error: true
-      - name: Check for failure
-        if: steps.formatter.outcome != 'success'
-        run: |
-          echo "Java format check failed, see 'Run formatter' step for more information."
-          echo "See https://github.com/google/google-java-format for options on running the formatter locally."
-          exit 1
\ No newline at end of file
+          args: "--replace"
+          skip-commit: true
+      - name: Print diffs
+        run: git --no-pager diff --exit-code
diff --git a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index 821467e0..f36fa984 100644
--- a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -212,12 +212,10 @@ public class DeployFunction extends CloudSdkMojo {
    */
   @Parameter(alias = "deploy.buildenvvarsfile", property = "function.deploy.buildenvvarsfile")
   String buildEnvVarsFile;
-  /**
-  * If true, deploys the function in the 2nd Generation Environment.
-  */
+  /** If true, deploys the function in the 2nd Generation Environment. */
   @Parameter(alias = "deploy.gen2", property = "function.deploy.gen2", defaultValue = "false")
   boolean gen2;
-    
+
   boolean hasEnvVariables() {
     return (this.environmentVariables != null && !this.environmentVariables.isEmpty());
   }

From adf81d13104a219d2e75c914cc40aaa0ce1df5bb Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Wed, 1 Feb 2023 14:12:36 -0800
Subject: [PATCH 129/308] feat: configure security score card action (#175)

---
 .github/workflows/scorecard.yml | 47 +++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 .github/workflows/scorecard.yml

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
new file mode 100644
index 00000000..75522f35
--- /dev/null
+++ b/.github/workflows/scorecard.yml
@@ -0,0 +1,47 @@
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '0 */12 * * *'
+  push:
+    branches: [ "master" ]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+
+    steps:
+      - name: "Checkout code"
+        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          # Public repositories:
+          #   - Publish results to OpenSSF REST API for easy access by consumers
+          #   - Allows the repository to include the Scorecard badge.
+          #   - See https://github.com/ossf/scorecard-action#publishing-results.
+          publish_results: true
+
+      # Upload the results to GitHub's code scanning dashboard.
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        with:
+          sarif_file: results.sarif

From 6ac80aae8122fc0dcf332b6c563d243434bd7e1f Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Wed, 8 Feb 2023 12:51:15 -0800
Subject: [PATCH 130/308] chore: configure codeql workflow (#176)

---
 .github/workflows/codeql.yml | 54 ++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 00000000..199eb9df
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,54 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix: 
+        # Autobuild each of these seperate maven projects
+        working-directory: ['invoker', 'functions-framework-api', 'function-maven-plugin']
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+        languages: java
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+      with:
+        working-directory: ${{ matrix.working-directory }}
+        
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: ${{ matrix.working-directory }}

From 3ac1abda2d0d34076d11a93d15bd47ae73ff81fe Mon Sep 17 00:00:00 2001
From: StepSecurity Bot <bot@stepsecurity.io>
Date: Thu, 23 Feb 2023 08:56:35 -0800
Subject: [PATCH 131/308] chore: [StepSecurity] Harden GitHub Actions (#177)

---
 .github/workflows/codeql.yml       | 16 ++++++++++++----
 .github/workflows/conformance.yaml | 19 ++++++++++++-------
 .github/workflows/lint.yaml        | 21 +++++++++++++++++----
 .github/workflows/scorecard.yml    |  5 +++++
 .github/workflows/unit.yaml        | 12 ++++++++++--
 5 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 199eb9df..f41dd57a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -7,6 +7,9 @@ on:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]
 
+permissions:
+  contents: read
+
 jobs:
   analyze:
     name: Analyze
@@ -24,12 +27,17 @@ jobs:
         working-directory: ['invoker', 'functions-framework-api', 'function-maven-plugin']
 
     steps:
+    - name: Harden Runner
+      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -43,12 +51,12 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
       with:
         working-directory: ${{ matrix.working-directory }}
         
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 5c56a303..5fdeae65 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -15,15 +15,20 @@ jobs:
           # 13.x
         ]
     steps:
-    - uses: actions/checkout@v2
+    - name: Harden Runner
+      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
       with:
         java-version: ${{ matrix.java }}
 
     - name: Setup Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0
       with:
         go-version: '1.16'
 
@@ -34,7 +39,7 @@ jobs:
       run: (cd invoker/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
       with:
         version: 'v1.6.0'
         functionType: 'http'
@@ -43,7 +48,7 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
       with:
         version: 'v1.6.0'
         functionType: 'legacyevent'
@@ -53,7 +58,7 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
       with:
         version: 'v1.6.0'
         functionType: 'cloudevent'
@@ -63,7 +68,7 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
       with:
         version: 'v1.6.0'
         functionType: 'http'
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index a6356989..78ef3450 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -5,13 +5,21 @@ on:
     - master
   pull_request:
   workflow_dispatch:
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Harden Runner
+      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
     - name: Set up JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
       with:
         java-version: 11.x
     - name: Build API with Maven
@@ -25,10 +33,15 @@ jobs:
   formatting:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3 # v2 minimum required
+      - name: Harden Runner
+        uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 # v2 minimum required
       - name: Run formatter
         id: formatter
-        uses: axel-op/googlejavaformat-action@v3
+        uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
         with:
           args: "--replace"
           skip-commit: true
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 75522f35..49d3d2ba 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -24,6 +24,11 @@ jobs:
       id-token: write
 
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+        with:
+          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
       - name: "Checkout code"
         uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
         with:
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 1938fc01..b510fef7 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -4,6 +4,9 @@ on:
     branches:
     - master
   pull_request:
+permissions:
+  contents: read
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -14,9 +17,14 @@ jobs:
           17.x
         ]
     steps:
-    - uses: actions/checkout@v2
+    - name: Harden Runner
+      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      with:
+        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+
+    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # v2.5.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin

From 44da871e06e967ce132bea06c3b7c5d1b06ddd6b Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Thu, 2 Mar 2023 10:22:18 -0800
Subject: [PATCH 132/308] fix: retrieving http headers on request object should
 be case insenstive (#178)

* Add test case covering case sensitive header operations
* Make HttpRequest.getFirstHeader case insensitive
---
 .../invoker/http/HttpRequestImpl.java         |  9 +++++--
 .../invoker/http/HttpResponseImpl.java        | 25 +++++++++++++------
 .../functions/invoker/http/HttpTest.java      | 10 +++++---
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
index db53936e..2119645a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import javax.servlet.ServletException;
@@ -116,8 +117,12 @@ public BufferedReader getReader() throws IOException {
   @Override
   public Map<String, List<String>> getHeaders() {
     return Collections.list(request.getHeaderNames()).stream()
-        .map(name -> new SimpleEntry<>(name, Collections.list(request.getHeaders(name))))
-        .collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+        .collect(
+            toMap(
+                name -> name,
+                name -> Collections.list(request.getHeaders(name)),
+                (a, b) -> b,
+                () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)));
   }
 
   private static class HttpPartImpl implements HttpPart {
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
index 41a96e36..b455eb47 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
@@ -20,12 +20,12 @@
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
 import javax.servlet.http.HttpServletResponse;
 
 public class HttpResponseImpl implements HttpResponse {
@@ -64,8 +64,12 @@ public void appendHeader(String key, String value) {
   @Override
   public Map<String, List<String>> getHeaders() {
     return response.getHeaderNames().stream()
-        .map(header -> new SimpleEntry<>(header, list(response.getHeaders(header))))
-        .collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+        .collect(
+            toMap(
+                name -> name,
+                name -> new ArrayList<>(response.getHeaders(name)),
+                (a, b) -> b,
+                () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)));
   }
 
   private static <T> List<T> list(Collection<T> collection) {
@@ -82,12 +86,17 @@ public OutputStream getOutputStream() throws IOException {
   @Override
   public synchronized BufferedWriter getWriter() throws IOException {
     if (writer == null) {
-      // Unfortunately this means that we get two intermediate objects between the object we return
-      // and the underlying Writer that response.getWriter() wraps. We could try accessing the
-      // PrintWriter.out field via reflection, but that sort of access to non-public fields of
-      // platform classes is now frowned on and may draw warnings or even fail in subsequent
+      // Unfortunately this means that we get two intermediate objects between the
+      // object we return
+      // and the underlying Writer that response.getWriter() wraps. We could try
+      // accessing the
+      // PrintWriter.out field via reflection, but that sort of access to non-public
+      // fields of
+      // platform classes is now frowned on and may draw warnings or even fail in
+      // subsequent
       // versions.
-      // We could instead wrap the OutputStream, but that would require us to deduce the appropriate
+      // We could instead wrap the OutputStream, but that would require us to deduce
+      // the appropriate
       // Charset, using logic like this:
       // https://github.com/eclipse/jetty.project/blob/923ec38adf/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java#L731
       // We may end up doing that if performance is an issue.
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
index 9ef51b2a..e52ec62a 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
@@ -181,6 +181,8 @@ private void httpRequestMethods(
         assertThat(request.getHeaders()).containsAtLeastEntriesIn(expectedHeaders);
       },
       request -> assertThat(request.getFirstHeader("foo")).hasValue("bar"),
+      request -> assertThat(request.getFirstHeader("CaSe-SeNsItIvE")).hasValue("VaLuE"),
+      request -> assertThat(request.getFirstHeader("case-sensitive")).hasValue("VaLuE"),
       request -> {
         try {
           request.getParts();
@@ -197,6 +199,7 @@ private void httpRequestMethods(
               .header(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8")
               .header("foo", "bar")
               .header("foo", "baz")
+              .header("CaSe-SeNsItIvE", "VaLuE")
               .content(new StringContentProvider(TEST_BODY));
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
@@ -352,11 +355,10 @@ private void httpResponseSetAndGet(
         // So we just check that we can add our own headers.
         response.appendHeader("foo", "bar");
         response.appendHeader("wibbly", "wobbly");
-        response.appendHeader("foo", "baz");
-        Map<String, List<String>> updatedHeaders = new TreeMap<>(response.getHeaders());
-        updatedHeaders.keySet().removeAll(initialHeaders.keySet());
+        response.appendHeader("FoO", "baz");
+        var updatedHeaders = response.getHeaders();
         assertThat(updatedHeaders)
-            .containsExactly("foo", Arrays.asList("bar", "baz"), "wibbly", Arrays.asList("wobbly"));
+            .containsAtLeast("foo", Arrays.asList("bar", "baz"), "wibbly", Arrays.asList("wobbly"));
       },
     };
     for (HttpResponseTest test : tests) {

From ed91e93f1be748cea4d28c49740782b5065b89bf Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 24 Mar 2023 14:25:58 -0700
Subject: [PATCH 133/308] chore(master): release java-function-invoker 1.2.1
 (#179)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 485ec31c..0f1a7d79 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.0.4","invoker":"1.2.0","function-maven-plugin":"0.10.1"}
\ No newline at end of file
+{"functions-framework-api":"1.0.4","invoker":"1.2.1","function-maven-plugin":"0.10.1"}
\ No newline at end of file
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 21d264fc..f8106cf7 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.2.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.2.0...java-function-invoker-v1.2.1) (2023-03-02)
+
+
+### Bug Fixes
+
+* retrieving http headers on request object should be case insenstive ([#178](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/178)) ([44da871](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/44da871e06e967ce132bea06c3b7c5d1b06ddd6b))
+
 ## [1.2.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.1.1...java-function-invoker-v1.2.0) (2022-10-05)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 4531c93c..c12bf37e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 6688f2b9..6420cf93 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.1-SNAPSHOT</version>
+      <version>1.2.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 44640217..eef187d8 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d89eef20..ce9bdb5d 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.1-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.1-SNAPSHOT</version>
+  <version>1.2.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 89b57bf5a1c7006d9bfd323e93180d255ed77fd4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 24 Mar 2023 14:31:24 -0700
Subject: [PATCH 134/308] chore(master): release java-function-invoker
 1.2.2-SNAPSHOT (#180)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index c12bf37e..dc1e3172 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 6420cf93..08ade5e3 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index eef187d8..691e4785 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index ce9bdb5d..61730b65 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 648f4a8b73d211dde7ea3b230cef829076ed6b09 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Fri, 31 Mar 2023 14:10:04 -0700
Subject: [PATCH 135/308] chore: add missing env variable to fix gpg error
 (#181)

---
 .kokoro/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 2e3a96d3..0a599f31 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -5,6 +5,7 @@ set -e
 
 # Get secrets from keystore and set and environment variables.
 setup_environment_secrets() {
+  export GPG_TTY=$(tty)
   export SONATYPE_USERNAME=functions-framework-release-bot
   export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password)
   export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)

From f435ad04d674a955b9c4216a05916af64d68059a Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Fri, 31 Mar 2023 16:49:09 -0700
Subject: [PATCH 136/308] chore: update gpg maven plugin to make it compatible
 with gpg v2.1+ (#182)

---
 function-maven-plugin/pom.xml   |  8 +++++---
 functions-framework-api/pom.xml | 12 ++++++++----
 invoker/pom.xml                 |  6 ++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 61e69484..c1f217c3 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.google.cloud.functions</groupId>
@@ -131,7 +133,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -157,4 +159,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 565aa357..f8375b76 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -13,7 +13,9 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -122,7 +124,9 @@
             <execution>
               <id>attach-docs</id>
               <phase>post-integration-test</phase>
-              <goals><goal>jar</goal></goals>
+              <goals>
+                <goal>jar</goal>
+              </goals>
             </execution>
           </executions>
         </plugin>
@@ -175,7 +179,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -201,4 +205,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>
\ No newline at end of file
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 691e4785..b1017747 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.sonatype.oss</groupId>
@@ -93,7 +95,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.6</version>
+            <version>3.0.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>

From 9f209bef86a2e01ce794e42505c64fc2f0be1e10 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Mon, 3 Apr 2023 14:18:17 -0700
Subject: [PATCH 137/308] Revert "chore(master): release java-function-invoker
 1.2.2-SNAPSHOT (#180)" (#184)

This reverts commit 89b57bf5a1c7006d9bfd323e93180d255ed77fd4.
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index dc1e3172..c12bf37e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.1</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 08ade5e3..6420cf93 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b1017747..49815646 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 61730b65..ce9bdb5d 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 8db1e85ce7defb9eab32cfa3e23499cdb5d6858f Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Mon, 3 Apr 2023 15:22:15 -0700
Subject: [PATCH 138/308] Revert "Revert "chore(master): release
 java-function-invoker 1.2.2-SNAPSHOT (#180)" (#184)" (#185)

This reverts commit 9f209bef86a2e01ce794e42505c64fc2f0be1e10.
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index c12bf37e..dc1e3172 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 6420cf93..08ade5e3 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -114,7 +114,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 49815646..b1017747 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index ce9bdb5d..61730b65 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.1</version>
+  <version>1.2.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From e4820d96d3fd747767b0df3db592e84f0d114d1a Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Thu, 6 Apr 2023 11:59:30 -0700
Subject: [PATCH 139/308] chore: address some scorecard findings on github
 actions (#183)

---
 .github/workflows/buildpack-integration-test.yml | 4 ++++
 .github/workflows/conformance.yaml               | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 6d290f64..35e9b6c7 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -5,6 +5,10 @@ on:
     branches:
       - master
   workflow_dispatch:
+
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   java11-buildpack-test:
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.8.0
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 5fdeae65..14b5e066 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -4,6 +4,10 @@ on:
     branches:
     - master
   pull_request:
+
+# Declare default permissions as read only.
+permissions: read-all
+
 jobs:
   build:
     runs-on: ubuntu-latest

From de61196b6211dab6bec023e553f7015c7afe2790 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Thu, 13 Apr 2023 11:08:10 -0700
Subject: [PATCH 140/308] chore: Configure blunderbuss.yml (#188)

---
 .github/blunderbuss.yml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .github/blunderbuss.yml

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
new file mode 100644
index 00000000..61347444
--- /dev/null
+++ b/.github/blunderbuss.yml
@@ -0,0 +1,5 @@
+assign_prs:
+  - GoogleCloudPlatform/functions-framework-google
+
+assign_issues:
+  - GoogleCloudPlatform/functions-framework-google

From fdbdfcecaf263ec0b3d8b88553ef764a5762f2e9 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Thu, 13 Apr 2023 11:16:24 -0700
Subject: [PATCH 141/308] chore: Create renovate bot config (#187)

* chore: Create renovate bot config

* Update renovate.json
---
 .github/renovate.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/renovate.json

diff --git a/.github/renovate.json b/.github/renovate.json
new file mode 100644
index 00000000..7287767f
--- /dev/null
+++ b/.github/renovate.json
@@ -0,0 +1,12 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["group:allNonMajor", "schedule:monthly"],
+  "packageRules": [
+    {
+      "description": "Create a PR whenever there is a new major version",
+      "matchUpdateTypes": [
+        "major"
+      ]
+    }
+  ]
+}

From 3e3129eeae86c5fddd5253e9bcf14e5e561bca79 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 2 May 2023 11:10:27 -0700
Subject: [PATCH 142/308] chore: Update blunderbuss.yml according to preference
 (#189)

---
 .github/blunderbuss.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 61347444..4234009b 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,5 +1,9 @@
 assign_prs:
-  - GoogleCloudPlatform/functions-framework-google
+  - janell-chen
+  - HKWinterhalter
+  - garethgeorge
 
 assign_issues:
-  - GoogleCloudPlatform/functions-framework-google
+  - janell-chen
+  - HKWinterhalter
+  - garethgeorge

From a3712448c09e59e7cf71de9f19aad8f21bb511a0 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 2 May 2023 13:45:33 -0700
Subject: [PATCH 143/308] chore: fix ci lint errors (#195)

---
 .../com/google/cloud/functions/plugin/DeployFunction.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index f36fa984..35dab3f8 100644
--- a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -182,36 +182,42 @@ public class DeployFunction extends CloudSdkMojo {
    */
   @Parameter(alias = "deploy.vpcconnector", property = "function.deploy.vpcconnector")
   String vpcConnector;
+
   /**
    * Sets the maximum number of instances for the function. A function execution that would exceed
    * max-instances times out.
    */
   @Parameter(alias = "deploy.maxinstances", property = "function.deploy.maxinstances")
   Integer maxInstances;
+
   /**
    * List of key-value pairs to set as environment variables. All existing environment variables
    * will be removed first.
    */
   @Parameter(alias = "deploy.setenvvars", property = "function.deploy.setenvvars")
   Map<String, String> environmentVariables;
+
   /**
    * Path to a local YAML file with definitions for all environment variables. All existing
    * environment variables will be removed before the new environment variables are added.
    */
   @Parameter(alias = "deploy.envvarsfile", property = "function.deploy.envvarsfile")
   String envVarsFile;
+
   /**
    * List of key-value pairs to set as build environment variables. All existing environment
    * variables will be removed first.
    */
   @Parameter(alias = "deploy.setbuildenvvars", property = "function.deploy.setbuildenvvars")
   Map<String, String> buildEnvironmentVariables;
+
   /**
    * Path to a local YAML file with definitions for all build environment variables. All existing
    * environment variables will be removed before the new environment variables are added.
    */
   @Parameter(alias = "deploy.buildenvvarsfile", property = "function.deploy.buildenvvarsfile")
   String buildEnvVarsFile;
+
   /** If true, deploys the function in the 2nd Generation Environment. */
   @Parameter(alias = "deploy.gen2", property = "function.deploy.gen2", defaultValue = "false")
   boolean gen2;

From aadefa5fc09aa94da937f11f8f5cbfcd708c95bd Mon Sep 17 00:00:00 2001
From: Mend Renovate <renovate@whitesourcesoftware.com>
Date: Mon, 15 May 2023 21:22:50 +0200
Subject: [PATCH 144/308] chore(deps): update actions/checkout action to v3
 (#192)

---
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 2 +-
 .github/workflows/unit.yaml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 14b5e066..0ee3236e 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -24,7 +24,7 @@ jobs:
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 78ef3450..d559d9f7 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -17,7 +17,7 @@ jobs:
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK
       uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
       with:
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index b510fef7..405a9b57 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -22,7 +22,7 @@ jobs:
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-    - uses: actions/checkout@dc323e67f16fb5f7663d20ff7941f27f5809e9b6 # v2.6.0
+    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # v2.5.0
       with:

From f3220ce5304add7d198c2a60cf76ae64e9fb0791 Mon Sep 17 00:00:00 2001
From: Mend Renovate <renovate@whitesourcesoftware.com>
Date: Mon, 15 May 2023 22:16:31 +0200
Subject: [PATCH 145/308] chore(deps): update actions/setup-go action to v4
 (#193)

---
 .github/workflows/conformance.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 0ee3236e..20a14c9d 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -32,7 +32,7 @@ jobs:
         java-version: ${{ matrix.java }}
 
     - name: Setup Go
-      uses: actions/setup-go@bfdd3570ce990073878bf10f6b2d79082de49492 # v2.2.0
+      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
       with:
         go-version: '1.16'
 

From 94ed3bfcdcb57d4452aa2e3307acee1e4a48c28f Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Tue, 16 May 2023 12:06:03 -0700
Subject: [PATCH 146/308] chore(deps): update actions/setup-java to v3 (#196)

---
 .github/workflows/conformance.yaml | 3 ++-
 .github/workflows/lint.yaml        | 3 ++-
 .github/workflows/unit.yaml        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 20a14c9d..8cda2e27 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -27,9 +27,10 @@ jobs:
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
       with:
         java-version: ${{ matrix.java }}
+        distribution: temurin
 
     - name: Setup Go
       uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index d559d9f7..291ab619 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -19,9 +19,10 @@ jobs:
 
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK
-      uses: actions/setup-java@d202f5dbf7256730fb690ec59f6381650114feb2 # v1.4.3
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
       with:
         java-version: 11.x
+        distribution: temurin
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
     - name: Lint Functions Framework API
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 405a9b57..22668053 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -24,7 +24,7 @@ jobs:
 
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@f0bb91606209742fe3ea40199be2f3ef195ecabf # v2.5.0
+      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin

From d6396d10388217993278d35a3c902856dfd89e9c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 17 May 2023 19:17:56 +0200
Subject: [PATCH 147/308] chore(deps): update all non-major dependencies (#191)

---
 .github/workflows/codeql.yml       | 10 +++++-----
 .github/workflows/conformance.yaml | 10 +++++-----
 .github/workflows/lint.yaml        |  6 +++---
 .github/workflows/scorecard.yml    |  8 ++++----
 .github/workflows/unit.yaml        |  2 +-
 function-maven-plugin/pom.xml      | 20 ++++++++++----------
 functions-framework-api/pom.xml    |  8 ++++----
 invoker/conformance/pom.xml        |  6 +++---
 invoker/core/pom.xml               | 28 ++++++++++++++--------------
 invoker/pom.xml                    |  4 ++--
 invoker/testfunction/pom.xml       |  6 +++---
 11 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f41dd57a..45f6540c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,16 +28,16 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
     - name: Checkout repository
-      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+      uses: github/codeql-action/init@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -51,12 +51,12 @@ jobs:
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
     - name: Autobuild
-      uses: github/codeql-action/autobuild@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+      uses: github/codeql-action/autobuild@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
       with:
         working-directory: ${{ matrix.working-directory }}
         
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@17573ee1cc1b9d061760f3a006fc4aac4f944fd5 # v2.2.4
+      uses: github/codeql-action/analyze@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 8cda2e27..77bf6860 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -20,7 +20,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
@@ -44,7 +44,7 @@ jobs:
       run: (cd invoker/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
       with:
         version: 'v1.6.0'
         functionType: 'http'
@@ -53,7 +53,7 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
       with:
         version: 'v1.6.0'
         functionType: 'legacyevent'
@@ -63,7 +63,7 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
       with:
         version: 'v1.6.0'
         functionType: 'cloudevent'
@@ -73,7 +73,7 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@c52662e612b2685a027b1c3e02224306517722fc # v1.6.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
       with:
         version: 'v1.6.0'
         functionType: 'http'
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 291ab619..8ece5d60 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
@@ -35,11 +35,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0 # v2 minimum required
+      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 49d3d2ba..f87e3f7f 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -25,17 +25,17 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - name: "Checkout code"
-        uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
+        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@99c53751e09b9529366343771cc321ec74e9bd3d # v2.0.6
+        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -47,6 +47,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@807578363a7869ca324a79039e6db9c843e0e100 # v2.1.27
+        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 22668053..6f4dc3d0 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@18bf8ad2ca49c14cbb28b91346d626ccfb00c518 # v2.1.0
+      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
         egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index c1f217c3..ca3a98a5 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -29,43 +29,43 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.6.3</version>
+      <version>3.9.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.6.3</version>
+      <version>3.9.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.6.0</version>
+      <version>3.9.0</version>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.1.1</version>
+      <version>1.2.1</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.4.1</version>
+      <version>2.4.4</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.0.1</version>
+      <version>1.1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -75,7 +75,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.9.0</version>
         <executions>
           <execution>
             <id>help-goal</id>
@@ -120,7 +120,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.5.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -133,7 +133,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index f8375b76..ebc27ba4 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -30,8 +30,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.1.0</maven-javadoc-plugin.version>
+    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
+    <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>2.0.0.RC2</version>
+      <version>2.5.0</version>
     </dependency>
   </dependencies>
 
@@ -179,7 +179,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index dc1e3172..553d688e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -32,17 +32,17 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.10.1</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
-      <version>2.2.0</version>
+      <version>2.5.0</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>2.2.0</version>
+      <version>2.5.0</version>
     </dependency>
   </dependencies>
 
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 08ade5e3..860c0b4c 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -22,7 +22,7 @@
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <cloudevents.sdk.version>2.0.0.RC2</cloudevents.sdk.version>
+    <cloudevents.sdk.version>2.5.0</cloudevents.sdk.version>
   </properties>
 
   <licenses>
@@ -68,12 +68,12 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.10.1</version>
     </dependency>
     <dependency>
       <groupId>com.ryanharter.auto.value</groupId>
       <artifactId>auto-value-gson</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -85,19 +85,19 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>1.7</version>
+      <version>1.10.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>1.7</version>
+      <version>1.10.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.49.v20220914</version>
+      <version>9.4.51.v20230217</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -121,36 +121,36 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.2.4</version>
+      <version>3.12.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.13.1</version>
+      <version>4.13.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.re2j</groupId>
       <artifactId>re2j</artifactId>
-      <version>1.6</version>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.0.1</version>
+      <version>1.1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.0.1</version>
+      <version>1.1.3</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.26.v20200117</version>
+      <version>9.4.51.v20230217</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -159,7 +159,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.3.0</version>
         <configuration>
           <archive>
             <manifest>
@@ -171,7 +171,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b1017747..7c2b515e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -82,7 +82,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.5.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -95,7 +95,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.0.1</version>
+            <version>3.1.0</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 61730b65..d6571a6d 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -35,7 +35,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.8.9</version>
+      <version>2.10.1</version>
     </dependency>
   </dependencies>
 
@@ -43,7 +43,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.3.0</version>
         <configuration>
           <archive>
             <manifest>
@@ -85,7 +85,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.0.0-M1</version>
+        <version>3.1.1</version>
         <configuration>
           <skip>true</skip>
         </configuration>

From 5264e35b2522a789d65f0e0fd9bb5584694529eb Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Tue, 23 May 2023 12:12:35 -0700
Subject: [PATCH 148/308] feat: Define strongly typed function interface (#186)

Introduces a new Typed signature to the functions framework which provides automatic request deserialization and response serialization.
---
 .github/workflows/codeql.yml                  |  12 +-
 function-maven-plugin/pom.xml                 |   2 +-
 functions-framework-api/pom.xml               |   2 +-
 .../google/cloud/functions/TypedFunction.java |  59 +++++++
 invoker/conformance/pom.xml                   |   4 +-
 invoker/core/pom.xml                          |   7 +-
 .../invoker/HttpFunctionExecutor.java         |  14 +-
 .../invoker/TypedFunctionExecutor.java        | 165 ++++++++++++++++++
 .../invoker/http/HttpResponseImpl.java        |  34 ++--
 .../functions/invoker/runner/Invoker.java     |  37 ++--
 .../BackgroundFunctionExecutorTest.java       |   1 -
 .../functions/invoker/IntegrationTest.java    |  60 ++++++-
 .../invoker/TypedFunctionExecutorTest.java    |  37 ++++
 .../invoker/testfunctions/Typed.java          |  25 +++
 .../testfunctions/TypedCustomFormat.java      |  38 ++++
 .../invoker/testfunctions/TypedVoid.java      |  12 ++
 .../resources/typed_nameconcat_request.json   |   4 +
 invoker/pom.xml                               |   2 +-
 invoker/testfunction/pom.xml                  |   5 +-
 .../java/com/example/functionjar/Typed.java   |  25 +++
 20 files changed, 488 insertions(+), 57 deletions(-)
 create mode 100644 functions-framework-api/src/main/java/com/google/cloud/functions/TypedFunction.java
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Typed.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedCustomFormat.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedVoid.java
 create mode 100644 invoker/core/src/test/resources/typed_nameconcat_request.json
 create mode 100644 invoker/testfunction/src/test/java/com/example/functionjar/Typed.java

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 45f6540c..3d013efd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -49,12 +49,12 @@ jobs:
         # queries: security-extended,security-and-quality
 
 
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, Go, or Java).
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
-      with:
-        working-directory: ${{ matrix.working-directory }}
-        
+    
+    - name: Build
+      run: |
+        (cd functions-framework-api/ && mvn install)
+        (cd invoker/ && mvn clean install)
+        (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index ca3a98a5..eab73245 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.2.1</version>
+      <version>1.2.3-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index ebc27ba4..3bdeffa7 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -26,7 +26,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.0.6-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/TypedFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/TypedFunction.java
new file mode 100644
index 00000000..16baf0b6
--- /dev/null
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/TypedFunction.java
@@ -0,0 +1,59 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions;
+
+import java.lang.reflect.Type;
+
+/**
+ * Represents a Cloud Function with a strongly typed interface that is activated by an HTTP request.
+ */
+@FunctionalInterface
+public interface TypedFunction<RequestT, ResponseT> {
+  /**
+   * Called to service an incoming HTTP request. This interface is implemented by user code to
+   * provide the action for a given HTTP function. If this method throws any exception (including
+   * any {@link Error}) then the HTTP response will have a 500 status code.
+   *
+   * @param arg the payload of the event, deserialized from the original JSON string.
+   * @return invocation result or null to indicate the body of the response should be empty.
+   * @throws Exception to produce a 500 status code in the HTTP response.
+   */
+  public ResponseT apply(RequestT arg) throws Exception;
+
+  /**
+   * Called to get the the format object that handles request decoding and response encoding. If
+   * null is returned a default JSON format is used.
+   *
+   * @return the {@link WireFormat} to use for serialization
+   */
+  public default WireFormat getWireFormat() {
+    return null;
+  }
+
+  /**
+   * Describes how to deserialize request object and serialize response objects for an HTTP
+   * invocation.
+   */
+  public interface WireFormat {
+    /** Serialize is expected to encode the object to the provided HttpResponse. */
+    void serialize(Object object, HttpResponse response) throws Exception;
+
+    /**
+     * Deserialize is expected to read an object of {@code Type} from the HttpRequest. The Type is
+     * determined through reflection on the user's function.
+     */
+    Object deserialize(HttpRequest request, Type type) throws Exception;
+  }
+}
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 553d688e..354b3568 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 860c0b4c..dde36f33 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -44,6 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
+      <version>1.0.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -114,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.2-SNAPSHOT</version>
+      <version>1.2.3-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 7a66fefd..21115666 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -17,7 +17,6 @@
 import com.google.cloud.functions.HttpFunction;
 import com.google.cloud.functions.invoker.http.HttpRequestImpl;
 import com.google.cloud.functions.invoker.http.HttpResponseImpl;
-import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.servlet.http.HttpServlet;
@@ -72,18 +71,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     } finally {
       Thread.currentThread().setContextClassLoader(oldContextLoader);
-      try {
-        // We can't use HttpServletResponse.flushBuffer() because we wrap the PrintWriter
-        // returned by HttpServletResponse in our own BufferedWriter to match our API.
-        // So we have to flush whichever of getWriter() or getOutputStream() works.
-        try {
-          respImpl.getOutputStream().flush();
-        } catch (IllegalStateException e) {
-          respImpl.getWriter().flush();
-        }
-      } catch (IOException e) {
-        // Too bad, can't flush.
-      }
+      respImpl.flush();
     }
   }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java
new file mode 100644
index 00000000..a6edfc32
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java
@@ -0,0 +1,165 @@
+package com.google.cloud.functions.invoker;
+
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import com.google.cloud.functions.TypedFunction;
+import com.google.cloud.functions.TypedFunction.WireFormat;
+import com.google.cloud.functions.invoker.http.HttpRequestImpl;
+import com.google.cloud.functions.invoker.http.HttpResponseImpl;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class TypedFunctionExecutor extends HttpServlet {
+  private static final String APPLY_METHOD = "apply";
+  private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
+
+  private final Type argType;
+  private final TypedFunction<Object, Object> function;
+  private final WireFormat format;
+
+  private TypedFunctionExecutor(
+      Type argType, TypedFunction<Object, Object> func, WireFormat format) {
+    this.argType = argType;
+    this.function = func;
+    this.format = format;
+  }
+
+  public static TypedFunctionExecutor forClass(Class<?> functionClass) {
+    if (!TypedFunction.class.isAssignableFrom(functionClass)) {
+      throw new RuntimeException(
+          "Class "
+              + functionClass.getName()
+              + " does not implement "
+              + TypedFunction.class.getName());
+    }
+    @SuppressWarnings("unchecked")
+    Class<? extends TypedFunction<?, ?>> typedFunctionClass =
+        (Class<? extends TypedFunction<?, ?>>) functionClass.asSubclass(TypedFunction.class);
+
+    Optional<Type> argType = handlerTypeArgument(typedFunctionClass);
+    if (argType.isEmpty()) {
+      throw new RuntimeException(
+          "Class "
+              + typedFunctionClass.getName()
+              + " does not implement "
+              + TypedFunction.class.getName());
+    }
+
+    TypedFunction<?, ?> typedFunction;
+    try {
+      typedFunction = typedFunctionClass.getDeclaredConstructor().newInstance();
+    } catch (Exception e) {
+      throw new RuntimeException(
+          "Class "
+              + typedFunctionClass.getName()
+              + " must declare a valid default constructor to be usable as a strongly typed"
+              + " function. Could not use constructor: "
+              + e.toString());
+    }
+
+    WireFormat format = typedFunction.getWireFormat();
+    if (format == null) {
+      format = LazyDefaultFormatHolder.defaultFormat;
+    }
+
+    @SuppressWarnings("unchecked")
+    TypedFunctionExecutor executor =
+        new TypedFunctionExecutor(
+            argType.orElseThrow(), (TypedFunction<Object, Object>) typedFunction, format);
+    return executor;
+  }
+
+  /**
+   * Returns the {@code ReqT} of a concrete class that implements {@link TypedFunction
+   * TypedFunction<ReqT, RespT>}. Returns an empty {@link Optional} if {@code ReqT} can't be
+   * determined.
+   */
+  static Optional<Type> handlerTypeArgument(Class<? extends TypedFunction<?, ?>> functionClass) {
+    return Arrays.stream(functionClass.getMethods())
+        .filter(method -> method.getName().equals(APPLY_METHOD) && method.getParameterCount() == 1)
+        .map(method -> method.getGenericParameterTypes()[0])
+        .filter(type -> type != Object.class)
+        .findFirst();
+  }
+
+  /** Executes the user's method, can handle all HTTP type methods. */
+  @Override
+  public void service(HttpServletRequest req, HttpServletResponse res) {
+    HttpRequestImpl reqImpl = new HttpRequestImpl(req);
+    HttpResponseImpl resImpl = new HttpResponseImpl(res);
+    ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
+
+    try {
+      Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
+      handleRequest(reqImpl, resImpl);
+    } finally {
+      Thread.currentThread().setContextClassLoader(oldContextClassLoader);
+      resImpl.flush();
+    }
+  }
+
+  private void handleRequest(HttpRequest req, HttpResponse res) {
+    Object reqObj;
+    try {
+      reqObj = format.deserialize(req, argType);
+    } catch (Throwable t) {
+      logger.log(Level.SEVERE, "Failed to parse request for " + function.getClass().getName(), t);
+      res.setStatusCode(HttpServletResponse.SC_BAD_REQUEST);
+      return;
+    }
+
+    Object resObj;
+    try {
+      resObj = function.apply(reqObj);
+    } catch (Throwable t) {
+      logger.log(Level.SEVERE, "Failed to execute " + function.getClass().getName(), t);
+      res.setStatusCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      return;
+    }
+
+    try {
+      format.serialize(resObj, res);
+    } catch (Throwable t) {
+      logger.log(
+          Level.SEVERE, "Failed to serialize response for " + function.getClass().getName(), t);
+      res.setStatusCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      return;
+    }
+  }
+
+  private static class LazyDefaultFormatHolder {
+    static final WireFormat defaultFormat = new GsonWireFormat();
+  }
+
+  private static class GsonWireFormat implements TypedFunction.WireFormat {
+    private final Gson gson = new GsonBuilder().create();
+
+    @Override
+    public void serialize(Object object, HttpResponse response) throws Exception {
+      if (object == null) {
+        response.setStatusCode(HttpServletResponse.SC_NO_CONTENT);
+        return;
+      }
+      try (BufferedWriter bodyWriter = response.getWriter()) {
+        gson.toJson(object, bodyWriter);
+      }
+    }
+
+    @Override
+    public Object deserialize(HttpRequest request, Type type) throws Exception {
+      try (BufferedReader bodyReader = request.getReader()) {
+        return gson.fromJson(bodyReader, type);
+      }
+    }
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
index b455eb47..c02246f0 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
@@ -86,22 +86,32 @@ public OutputStream getOutputStream() throws IOException {
   @Override
   public synchronized BufferedWriter getWriter() throws IOException {
     if (writer == null) {
-      // Unfortunately this means that we get two intermediate objects between the
-      // object we return
-      // and the underlying Writer that response.getWriter() wraps. We could try
-      // accessing the
-      // PrintWriter.out field via reflection, but that sort of access to non-public
-      // fields of
-      // platform classes is now frowned on and may draw warnings or even fail in
-      // subsequent
-      // versions.
-      // We could instead wrap the OutputStream, but that would require us to deduce
-      // the appropriate
-      // Charset, using logic like this:
+      // Unfortunately this means that we get two intermediate objects between the object we return
+      // and the underlying Writer that response.getWriter() wraps. We could try accessing the
+      // PrintWriter.out field via reflection, but that sort of access to non-public fields of
+      // platform classes is now frowned on and may draw warnings or even fail in subsequent
+      // versions. We could instead wrap the OutputStream, but that would require us to deduce the
+      // appropriate Charset, using logic like this:
       // https://github.com/eclipse/jetty.project/blob/923ec38adf/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java#L731
       // We may end up doing that if performance is an issue.
       writer = new BufferedWriter(response.getWriter());
     }
     return writer;
   }
+
+  public void flush() {
+    try {
+      // We can't use HttpServletResponse.flushBuffer() because we wrap the
+      // PrintWriter returned by HttpServletResponse in our own BufferedWriter
+      // to match our API. So we have to flush whichever of getWriter() or
+      // getOutputStream() works.
+      try {
+        getOutputStream().flush();
+      } catch (IllegalStateException e) {
+        getWriter().flush();
+      }
+    } catch (IOException e) {
+      // Too bad, can't flush.
+    }
+  }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index d35e21ea..4936da4e 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -20,8 +20,10 @@
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterException;
 import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.TypedFunction;
 import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
 import com.google.cloud.functions.invoker.HttpFunctionExecutor;
+import com.google.cloud.functions.invoker.TypedFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
 import java.io.File;
 import java.io.IOException;
@@ -81,9 +83,10 @@ public class Invoker {
 
   static {
     if (isGcf()) {
-      // If we're running with Google Cloud Functions, we'll get better-looking logs if we arrange
-      // for them to be formatted using StackDriver's "structured logging" JSON format. Remove the
-      // JDK's standard logger and replace it with the JSON one.
+      // If we're running with Google Cloud Functions, we'll get better-looking logs
+      // if we arrange for them to be formatted using StackDriver's "structured
+      // logging" JSON format. Remove the JDK's standard logger and replace it with
+      // the JSON one.
       for (Handler handler : rootLogger.getHandlers()) {
         rootLogger.removeHandler(handler);
       }
@@ -252,11 +255,10 @@ public void startServer() throws Exception {
    * <pre>{@code
    * // Create an invoker
    * Invoker invoker = new Invoker(
-   *         8081,
-   *         "org.example.MyHttpFunction",
-   *         "http",
-   *         Thread.currentThread().getContextClassLoader()
-   * );
+   *     8081,
+   *     "org.example.MyHttpFunction",
+   *     "http",
+   *     Thread.currentThread().getContextClassLoader());
    *
    * // Start the test server
    * invoker.startTestServer();
@@ -303,6 +305,9 @@ private void startServer(boolean join) throws Exception {
         case "cloudevent":
           servlet = BackgroundFunctionExecutor.forClass(functionClass);
           break;
+        case "typed":
+          servlet = TypedFunctionExecutor.forClass(functionClass);
+          break;
         default:
           String error =
               String.format(
@@ -350,9 +355,9 @@ private Class<?> loadFunctionClass() throws ClassNotFoundException {
         if (firstException == null) {
           firstException = e;
         }
-        // This might be a nested class like com.example.Foo.Bar. That will actually appear as
-        // com.example.Foo$Bar as far as Class.forName is concerned. So we try to replace every dot
-        // from the last to the first with a $ in the hope of finding a class we can load.
+        // This might be a nested class like com.example.Foo.Bar. That will actually
+        // appear as com.example.Foo$Bar as far as Class.forName is concerned. So we try to replace
+        // every dot from the last to the first with a $ in the hope of finding a class we can load.
         int lastDot = target.lastIndexOf('.');
         if (lastDot < 0) {
           throw firstException;
@@ -366,6 +371,9 @@ private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     if (HttpFunction.class.isAssignableFrom(functionClass)) {
       return HttpFunctionExecutor.forClass(functionClass);
     }
+    if (TypedFunction.class.isAssignableFrom(functionClass)) {
+      return TypedFunctionExecutor.forClass(functionClass);
+    }
     Optional<BackgroundFunctionExecutor> maybeExecutor =
         BackgroundFunctionExecutor.maybeForClass(functionClass);
     if (maybeExecutor.isPresent()) {
@@ -432,8 +440,8 @@ private void logServerInfo() {
   }
 
   private static boolean isGcf() {
-    // This environment variable is set in the GCF environment but won't be set when invoking
-    // the Functions Framework directly. We don't use its value, just whether it is set.
+    // This environment variable is set in the GCF environment but won't be set when invoking the
+    // Functions Framework directly. We don't use its value, just whether it is set.
     return System.getenv("K_SERVICE") != null;
   }
 
@@ -509,7 +517,8 @@ private static boolean isCloudEventsApiClass(String name) {
 
     private static ClassLoader getSystemOrBootstrapClassLoader() {
       try {
-        // We're still building against the Java 8 API, so we have to use reflection for now.
+        // We're still building against the Java 8 API, so we have to use reflection for
+        // now.
         Method getPlatformClassLoader = ClassLoader.class.getMethod("getPlatformClassLoader");
         return (ClassLoader) getPlatformClassLoader.invoke(null);
       } catch (ReflectiveOperationException e) {
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
index d00b0b4f..2b7211c9 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
@@ -100,7 +100,6 @@ public void parseLegacyEventPubSubEmulator() throws IOException {
       assertThat(context.eventType()).isEqualTo("google.pubsub.topic.publish");
       assertThat(context.eventId()).isEqualTo("1");
       assertThat(context.timestamp()).isNotNull();
-      ;
 
       JsonObject data = event.getData().getAsJsonObject();
       assertThat(data.get("data").getAsString()).isEqualTo("eyJmb28iOiJiYXIifQ==");
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 335cc7de..f84ddbdd 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -383,6 +383,46 @@ public void typedBackground() throws Exception {
     }
   }
 
+  @Test
+  public void typedFunction() throws Exception {
+    URL resourceUrl = getClass().getResource("/typed_nameconcat_request.json");
+    assertThat(resourceUrl).isNotNull();
+    String originalJson = Resources.toString(resourceUrl, StandardCharsets.UTF_8);
+    testFunction(
+        SignatureType.TYPED,
+        fullTarget("Typed"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setRequestText(originalJson)
+                .setExpectedResponseText("{\"fullName\":\"JohnDoe\"}")
+                .build()));
+  }
+
+  @Test
+  public void typedVoidFunction() throws Exception {
+    testFunction(
+        SignatureType.TYPED,
+        fullTarget("TypedVoid"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder().setRequestText("{}").setExpectedResponseCode(204).build()));
+  }
+
+  @Test
+  public void typedCustomFormat() throws Exception {
+    testFunction(
+        SignatureType.TYPED,
+        fullTarget("TypedCustomFormat"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setRequestText("abc\n123\n$#@\n")
+                .setExpectedResponseText("abc123$#@")
+                .setExpectedResponseCode(200)
+                .build()));
+  }
+
   private void backgroundTest(String target) throws Exception {
     File snoopFile = snoopFile();
     String gcfRequestText = sampleLegacyEvent(snoopFile);
@@ -571,6 +611,23 @@ public void classpathOptionBackground() throws Exception {
         ImmutableList.of(TestCase.builder().setRequestText(json.toString()).build()));
   }
 
+  /** Like {@link #classpathOptionHttp} but for typed functions. */
+  @Test
+  public void classpathOptionTyped() throws Exception {
+    URL resourceUrl = getClass().getResource("/typed_nameconcat_request.json");
+    assertThat(resourceUrl).isNotNull();
+    String originalJson = Resources.toString(resourceUrl, StandardCharsets.UTF_8);
+    testFunction(
+        SignatureType.TYPED,
+        "com.example.functionjar.Typed",
+        ImmutableList.of("--classpath", functionJarString()),
+        ImmutableList.of(
+            TestCase.builder()
+                .setRequestText(originalJson)
+                .setExpectedResponseText("{\"fullName\":\"JohnDoe\"}")
+                .build()));
+  }
+
   // In these tests, we test a number of different functions that express the same functionality
   // in different ways. Each function is invoked with a complete HTTP body that looks like a real
   // event. We start with a fixed body and insert into its JSON an extra property that tells the
@@ -659,7 +716,8 @@ private void testFunction(
   private enum SignatureType {
     HTTP("http"),
     BACKGROUND("event"),
-    CLOUD_EVENT("cloudevent");
+    CLOUD_EVENT("cloudevent"),
+    TYPED("typed");
 
     private final String name;
 
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java
new file mode 100644
index 00000000..969d1dcc
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java
@@ -0,0 +1,37 @@
+package com.google.cloud.functions.invoker;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
+
+import com.google.cloud.functions.TypedFunction;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class TypedFunctionExecutorTest {
+  private static class NameConcatRequest {
+    String firstName;
+    String lastName;
+  }
+
+  private static class NameConcatResponse {
+    String fullName;
+  }
+
+  private static class NameConcatFunction
+      implements TypedFunction<NameConcatRequest, NameConcatResponse> {
+    @Override
+    public NameConcatResponse apply(NameConcatRequest arg) throws Exception {
+      NameConcatResponse resp = new NameConcatResponse();
+      resp.fullName = arg.firstName + arg.lastName;
+      return resp;
+    }
+  }
+
+  @Test
+  public void canDetermineTypeArgument() {
+    assertThat(TypedFunctionExecutor.handlerTypeArgument(NameConcatFunction.class))
+        .hasValue(NameConcatRequest.class);
+  }
+}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Typed.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Typed.java
new file mode 100644
index 00000000..af1c9356
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Typed.java
@@ -0,0 +1,25 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.TypedFunction;
+
+public class Typed implements TypedFunction<NameConcatRequest, NameConcatResponse> {
+
+  @Override
+  public NameConcatResponse apply(NameConcatRequest arg) throws Exception {
+    return new NameConcatResponse().setFullName(arg.firstName + arg.lastName);
+  }
+}
+
+class NameConcatRequest {
+  String firstName;
+  String lastName;
+}
+
+class NameConcatResponse {
+  String fullName;
+
+  NameConcatResponse setFullName(String fullName) {
+    this.fullName = fullName;
+    return this;
+  }
+}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedCustomFormat.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedCustomFormat.java
new file mode 100644
index 00000000..4597f216
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedCustomFormat.java
@@ -0,0 +1,38 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import com.google.cloud.functions.TypedFunction;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+public class TypedCustomFormat implements TypedFunction<List<String>, String> {
+
+  @Override
+  public String apply(List<String> arg) throws Exception {
+    return String.join("", arg);
+  }
+
+  @Override
+  public WireFormat getWireFormat() {
+    return new CustomFormat();
+  }
+}
+
+class CustomFormat implements TypedFunction.WireFormat {
+  @Override
+  public Object deserialize(HttpRequest request, Type type) throws Exception {
+    List<String> req = new ArrayList<>();
+    String line;
+    while ((line = request.getReader().readLine()) != null) {
+      req.add(line);
+    }
+    return req;
+  }
+
+  @Override
+  public void serialize(Object object, HttpResponse response) throws Exception {
+    response.getWriter().write((String) object);
+  }
+}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedVoid.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedVoid.java
new file mode 100644
index 00000000..8e0cd00a
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TypedVoid.java
@@ -0,0 +1,12 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.TypedFunction;
+
+public class TypedVoid implements TypedFunction<Request, Void> {
+  @Override
+  public Void apply(Request arg) throws Exception {
+    return null;
+  }
+}
+
+class Request {}
diff --git a/invoker/core/src/test/resources/typed_nameconcat_request.json b/invoker/core/src/test/resources/typed_nameconcat_request.json
new file mode 100644
index 00000000..f6b4d425
--- /dev/null
+++ b/invoker/core/src/test/resources/typed_nameconcat_request.json
@@ -0,0 +1,4 @@
+{
+  "firstName": "John",
+  "lastName": "Doe"
+}
\ No newline at end of file
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 7c2b515e..498db704 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d6571a6d..72a0126a 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.2-SNAPSHOT</version>
+    <version>1.2.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.2-SNAPSHOT</version>
+  <version>1.2.3-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.
@@ -19,6 +19,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
+      <version>1.0.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <!-- We don't actually use this; we just check that its classes can be
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Typed.java b/invoker/testfunction/src/test/java/com/example/functionjar/Typed.java
new file mode 100644
index 00000000..fe4560bf
--- /dev/null
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Typed.java
@@ -0,0 +1,25 @@
+package com.example.functionjar;
+
+import com.google.cloud.functions.TypedFunction;
+
+public class Typed implements TypedFunction<NameConcatRequest, NameConcatResponse> {
+
+  @Override
+  public NameConcatResponse apply(NameConcatRequest arg) throws Exception {
+    return new NameConcatResponse().setFullName(arg.firstName + arg.lastName);
+  }
+}
+
+class NameConcatRequest {
+  String firstName;
+  String lastName;
+}
+
+class NameConcatResponse {
+  String fullName;
+
+  NameConcatResponse setFullName(String fullName) {
+    this.fullName = fullName;
+    return this;
+  }
+}

From 97f1a42f5b963bf9279b83c6d20c8f04f68e8757 Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Wed, 24 May 2023 14:45:38 -0700
Subject: [PATCH 149/308] chore: fix buildpack integration tests (#198)

---
 invoker/conformance/buildpack_pom.xml |  4 ++--
 invoker/conformance/prerun.sh         | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/invoker/conformance/buildpack_pom.xml b/invoker/conformance/buildpack_pom.xml
index 40fa9e78..cd769638 100644
--- a/invoker/conformance/buildpack_pom.xml
+++ b/invoker/conformance/buildpack_pom.xml
@@ -26,12 +26,12 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>0.0.0-SNAPSHOT</version>
+      <version>FRAMEWORK-API-VERSION</version>
     </dependency>
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>0.0.0-SNAPSHOT</version>
+      <version>INVOKER-VERSION</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/conformance/prerun.sh b/invoker/conformance/prerun.sh
index 669d5f49..d5614357 100755
--- a/invoker/conformance/prerun.sh
+++ b/invoker/conformance/prerun.sh
@@ -27,13 +27,26 @@ mkdir /tmp/tests
 
 cp -r $REPO_ROOT/invoker/conformance /tmp/tests
 
-cd $REPO_ROOT/invoker
-mvn versions:set -DnewVersion=0.0.0-SNAPSHOT -DprocessAllModules=true
+function get_mvn_version() {
+  mvn -q \
+    -Dexec.executable=echo \
+    -Dexec.args='${project.version}' \
+    --non-recursive \
+    exec:exec
+}
+
+# Must first install a local version of the API package
+cd $REPO_ROOT/functions-framework-api 
 mvn install -Dmaven.repo.local=/tmp/tests/conformance/artifacts
+FRAMEWORK_API_VERSION=$(get_mvn_version)
 
-cd $REPO_ROOT/functions-framework-api 
-mvn versions:set -DnewVersion=0.0.0-SNAPSHOT -DprocessAllModules=true
+# Build invoker packages against the latest API package
+cd $REPO_ROOT/invoker
 mvn install -Dmaven.repo.local=/tmp/tests/conformance/artifacts
+INVOKER_VERSION=$(get_mvn_version)
 
 rm /tmp/tests/conformance/pom.xml
 mv /tmp/tests/conformance/buildpack_pom.xml /tmp/tests/conformance/pom.xml
+
+sed -i "s/FRAMEWORK-API-VERSION/${FRAMEWORK_API_VERSION}/g" /tmp/tests/conformance/pom.xml
+sed -i "s/INVOKER-VERSION/${INVOKER_VERSION}/g" /tmp/tests/conformance/pom.xml

From 1bef3bd0d1a61832fa6df2abadcade6a5442eaf7 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 30 May 2023 17:15:51 -0700
Subject: [PATCH 150/308] chore: add security scorecard to readme (#200)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 9edaee1e..9b117033 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,7 @@
 [![Java Unit CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/unit.yaml)
 [![Java Lint CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/lint.yaml)
 [![Java Conformance CI](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/conformance.yaml/badge.svg)](https://github.com/GoogleCloudPlatform/functions-framework-java/actions/workflows/conformance.yaml)
+![Security Scorecard](https://api.securityscorecards.dev/projects/github.com/GoogleCloudPlatform/functions-framework-java/badge)
 
 An open source FaaS (Function as a service) framework for writing portable
 Java functions -- brought to you by the Google Cloud Functions team.

From 4679f1e5400ac53dd84a67aa95762096908395b2 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 30 May 2023 17:31:29 -0700
Subject: [PATCH 151/308] chore: apply recommended harden runner egress
 policies (#199)

---
 .github/workflows/codeql.yml       | 12 ++++++++++--
 .github/workflows/conformance.yaml | 10 +++++++++-
 .github/workflows/lint.yaml        |  7 +++++--
 .github/workflows/scorecard.yml    | 24 +++++++++++++++++++-----
 .github/workflows/unit.yaml        |  7 +++++--
 5 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 3d013efd..f7210bbe 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -30,8 +30,16 @@ jobs:
     - name: Harden Runner
       uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
-        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
-
+        disable-sudo: true
+        egress-policy: block
+        allowed-endpoints: >
+          api.github.com:443
+          github.com:443
+          objects.githubusercontent.com:443
+          proxy.golang.org:443
+          repo.maven.apache.org:443
+          storage.googleapis.com:443
+          
     - name: Checkout repository
       uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 77bf6860..446029c3 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -22,7 +22,15 @@ jobs:
     - name: Harden Runner
       uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
-        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
+        disable-sudo: true
+        egress-policy: block
+        allowed-endpoints: >
+          api.github.com:443
+          github.com:443
+          objects.githubusercontent.com:443
+          proxy.golang.org:443
+          repo.maven.apache.org:443
+          storage.googleapis.com:443
 
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 8ece5d60..bfb7350d 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -15,8 +15,11 @@ jobs:
     - name: Harden Runner
       uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
-        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
-
+        disable-sudo: true
+        egress-policy: block
+        allowed-endpoints: >
+          github.com:443
+          repo.maven.apache.org:443
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK
       uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f87e3f7f..846ee862 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -9,6 +9,7 @@ on:
     - cron: '0 */12 * * *'
   push:
     branches: [ "master" ]
+  workflow_dispatch:
 
 # Declare default permissions as read only.
 permissions: read-all
@@ -24,11 +25,24 @@ jobs:
       id-token: write
 
     steps:
-      - name: Harden Runner
-        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
-        with:
-          egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
-
+    - name: Harden Runner
+      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      with:
+        disable-sudo: true
+        egress-policy: block
+        allowed-endpoints: >
+          api.github.com:443
+          api.osv.dev:443
+          api.securityscorecards.dev:443
+          auth.docker.io:443
+          bestpractices.coreinfrastructure.org:443
+          fulcio.sigstore.dev:443
+          github.com:443
+          index.docker.io:443
+          oss-fuzz-build-logs.storage.googleapis.com:443
+          sigstore-tuf-root.storage.googleapis.com:443
+          rekor.sigstore.dev:443
+          
       - name: "Checkout code"
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
         with:
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 6f4dc3d0..763456d0 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -20,8 +20,11 @@ jobs:
     - name: Harden Runner
       uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
       with:
-        egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
-
+        disable-sudo: true
+        egress-policy: block
+        allowed-endpoints: >
+          github.com:443
+          repo.maven.apache.org:443
     - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0

From 0102c8f543280ff5ba5727508f87083a9f54ef74 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 30 May 2023 17:50:17 -0700
Subject: [PATCH 152/308] fix: bump org.eclipse.jetty dependency to 9.4.51
 (#201)

---
 invoker/core/pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index dde36f33..e71bcf20 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -103,7 +105,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.49.v20220914</version>
+      <version>9.4.51.v20230217</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>

From 03ff7710b3af206fea96d03ea5800119b1e5eba7 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Wed, 31 May 2023 12:28:14 -0700
Subject: [PATCH 153/308] chore: fix scorecard gh action (#202)

---
 .github/workflows/scorecard.yml | 34 ++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 846ee862..c1224195 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -25,23 +25,23 @@ jobs:
       id-token: write
 
     steps:
-    - name: Harden Runner
-      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
-      with:
-        disable-sudo: true
-        egress-policy: block
-        allowed-endpoints: >
-          api.github.com:443
-          api.osv.dev:443
-          api.securityscorecards.dev:443
-          auth.docker.io:443
-          bestpractices.coreinfrastructure.org:443
-          fulcio.sigstore.dev:443
-          github.com:443
-          index.docker.io:443
-          oss-fuzz-build-logs.storage.googleapis.com:443
-          sigstore-tuf-root.storage.googleapis.com:443
-          rekor.sigstore.dev:443
+      - name: Harden Runner
+        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        with:
+          disable-sudo: true
+          egress-policy: block
+          allowed-endpoints: >
+            api.github.com:443
+            api.osv.dev:443
+            api.securityscorecards.dev:443
+            auth.docker.io:443
+            bestpractices.coreinfrastructure.org:443
+            fulcio.sigstore.dev:443
+            github.com:443
+            index.docker.io:443
+            oss-fuzz-build-logs.storage.googleapis.com:443
+            sigstore-tuf-root.storage.googleapis.com:443
+            rekor.sigstore.dev:443
           
       - name: "Checkout code"
         uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

From 69db588ef1d3cec59678b9fec5e904c203f17007 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 31 May 2023 12:32:02 -0700
Subject: [PATCH 154/308] chore(master): release function-maven-plugin 0.11.0
 (#173)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/CHANGELOG.md    | 9 +++++++++
 function-maven-plugin/pom.xml         | 6 ++----
 3 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 function-maven-plugin/CHANGELOG.md

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 0f1a7d79..20497a94 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.0.4","invoker":"1.2.1","function-maven-plugin":"0.10.1"}
\ No newline at end of file
+{"functions-framework-api":"1.0.4","invoker":"1.2.1","function-maven-plugin":"0.11.0"}
\ No newline at end of file
diff --git a/function-maven-plugin/CHANGELOG.md b/function-maven-plugin/CHANGELOG.md
new file mode 100644
index 00000000..fc0c67b1
--- /dev/null
+++ b/function-maven-plugin/CHANGELOG.md
@@ -0,0 +1,9 @@
+# Changelog
+
+## [0.11.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.10.1...function-maven-plugin-v0.11.0) (2023-05-31)
+
+
+### Features
+
+* Add --gen2 support ([#172](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/172)) ([3b7b701](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/3b7b70152ca614e2a3b52f1a7c07d89221095a7d))
+* Define strongly typed function interface ([#186](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/186)) ([5264e35](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/5264e35b2522a789d65f0e0fd9bb5584694529eb))
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index eab73245..c83c8e8f 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -1,12 +1,10 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.10.2-SNAPSHOT</version>
+  <version>0.11.0</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From 11cf02ed2a20eaf76517fffb3b955ab8e9d559a1 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 08:56:08 -0700
Subject: [PATCH 155/308] chore(master): release functions-framework-api 1.1.0
 (#153)

* chore(master): release functions-framework-api 1.1.0

* update other core and testfunction to depend on new version of function-framework-api

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: janell-chen <122311137+janell-chen@users.noreply.github.com>
Co-authored-by: Gareth George <garethgeorge@google.com>
---
 .github/.release-please-manifest.json |  2 +-
 functions-framework-api/CHANGELOG.md  | 13 +++++++++++++
 functions-framework-api/pom.xml       |  6 ++----
 invoker/core/pom.xml                  |  2 +-
 invoker/testfunction/pom.xml          |  2 +-
 5 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 functions-framework-api/CHANGELOG.md

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 20497a94..d6b11bf6 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.0.4","invoker":"1.2.1","function-maven-plugin":"0.11.0"}
\ No newline at end of file
+{"functions-framework-api":"1.1.0","invoker":"1.2.1","function-maven-plugin":"0.11.0"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
new file mode 100644
index 00000000..1ab28e74
--- /dev/null
+++ b/functions-framework-api/CHANGELOG.md
@@ -0,0 +1,13 @@
+# Changelog
+
+## [1.1.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.0.4...functions-framework-api-v1.1.0) (2023-05-31)
+
+
+### Features
+
+* Define strongly typed function interface ([#186](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/186)) ([5264e35](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/5264e35b2522a789d65f0e0fd9bb5584694529eb))
+
+
+### Bug Fixes
+
+* remove warnings from mvn install ([#66](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/66)) ([270f4ec](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/270f4ec7936239eff9c00b8d3ff0f09a8615b9c9))
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 3bdeffa7..cb0779a3 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -13,9 +13,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
@@ -26,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.0.6-SNAPSHOT</version>
+  <version>1.1.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index e71bcf20..8cd6254e 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.0.6-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 72a0126a..85a0d6a6 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.0.6-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <!-- We don't actually use this; we just check that its classes can be

From 727f7a3461544f8b86f6038646dda893e1101b08 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 10:14:51 -0700
Subject: [PATCH 156/308] chore(master): release java-function-invoker 1.3.0
 (#197)

* chore(master): release java-function-invoker 1.3.0

* Update function-maven-plugin to depend on latest version of invoker package

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Gareth George <garethgeorge@google.com>
---
 .github/.release-please-manifest.json |  2 +-
 function-maven-plugin/pom.xml         |  2 +-
 invoker/CHANGELOG.md                  | 12 ++++++++++++
 invoker/conformance/pom.xml           |  4 ++--
 invoker/core/pom.xml                  | 10 ++++------
 invoker/pom.xml                       |  6 ++----
 invoker/testfunction/pom.xml          |  4 ++--
 7 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index d6b11bf6..b3d335ae 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.0","invoker":"1.2.1","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.0","invoker":"1.3.0","function-maven-plugin":"0.11.0"}
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index c83c8e8f..c9cbcc00 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.3.0</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index f8106cf7..2646cd1b 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.3.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.2.1...java-function-invoker-v1.3.0) (2023-06-01)
+
+
+### Features
+
+* Define strongly typed function interface ([#186](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/186)) ([5264e35](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/5264e35b2522a789d65f0e0fd9bb5584694529eb))
+
+
+### Bug Fixes
+
+* bump org.eclipse.jetty dependency to 9.4.51 ([#201](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/201)) ([0102c8f](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/0102c8f543280ff5ba5727508f87083a9f54ef74))
+
 ## [1.2.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.2.0...java-function-invoker-v1.2.1) (2023-03-02)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 354b3568..4383418b 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.3.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.3.0</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 8cd6254e..f88d7484 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -1,17 +1,15 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.3.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.3.0</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -117,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.2.3-SNAPSHOT</version>
+      <version>1.3.0</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 498db704..8170888d 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.sonatype.oss</groupId>
@@ -10,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.3.0</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 85a0d6a6..c32cb9f2 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.2.3-SNAPSHOT</version>
+    <version>1.3.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.2.3-SNAPSHOT</version>
+  <version>1.3.0</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From da03c6967f05f6bc68d2b03e1510a737b97138cb Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 10:30:34 -0700
Subject: [PATCH 157/308] chore(master): release functions-framework-api
 1.1.1-SNAPSHOT (#206)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index cb0779a3..f112d3c3 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.0</version>
+  <version>1.1.1-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 44d21b40f4404c0d3461ee2e5cf6281cde6a492d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 11:50:07 -0700
Subject: [PATCH 158/308] chore(master): release java-function-invoker
 1.3.1-SNAPSHOT (#207)

* chore(master): release java-function-invoker 1.3.1-SNAPSHOT

* Update function-maven-plugin to depend on latest versiion of invoker package

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Gareth George <garethgeorge@google.com>
---
 function-maven-plugin/pom.xml | 2 +-
 invoker/conformance/pom.xml   | 4 ++--
 invoker/core/pom.xml          | 6 +++---
 invoker/pom.xml               | 2 +-
 invoker/testfunction/pom.xml  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index c9cbcc00..649e38dd 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 4383418b..1c0d59a8 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.0</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index f88d7484..6a8e67ef 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 8170888d..3caf294a 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index c32cb9f2..3112b846 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.0</version>
+  <version>1.3.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From a7ab60e702100364bb812d91f7b7451a51ebea07 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 1 Jun 2023 13:22:34 -0700
Subject: [PATCH 159/308] chore(master): release function-maven-plugin
 0.11.1-SNAPSHOT (#203)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 649e38dd..40ad0bfe 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.11.0</version>
+  <version>0.11.1-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From e2fc7418210c3df630bdc7cca608f0995e491140 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 7 Jun 2023 19:19:18 +0200
Subject: [PATCH 160/308] chore(deps): update all non-major dependencies (#204)

---
 .github/workflows/codeql.yml    | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 function-maven-plugin/pom.xml   | 4 ++--
 functions-framework-api/pom.xml | 4 ++--
 invoker/core/pom.xml            | 4 ++--
 invoker/pom.xml                 | 4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f7210bbe..f68b594b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -45,7 +45,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
+      uses: github/codeql-action/init@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -65,6 +65,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
+      uses: github/codeql-action/analyze@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c1224195..3ab2cbec 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@29b1f65c5e92e24fe6b6647da1eaabe529cec70f # v2.3.3
+        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
         with:
           sarif_file: results.sarif
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 40ad0bfe..d6b8e5a1 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -57,7 +57,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -105,7 +105,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
+            <version>3.3.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index f112d3c3..ceb34856 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.0</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
+            <version>3.3.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 6a8e67ef..2308f93b 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -139,13 +139,13 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.1.3</version>
+      <version>1.1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3caf294a..6009e322 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.0.4</version>
+        <version>1.1.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -67,7 +67,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
+            <version>3.3.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>

From fc0e9df4a2a5159bebefbfc9953cbe95debc2ab0 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 9 Jun 2023 19:45:23 +0200
Subject: [PATCH 161/308] chore(deps): update dependency
 com.google.escapevelocity:escapevelocity to v1 (#205)

---
 invoker/testfunction/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 3112b846..fa29218b 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -26,7 +26,7 @@
            loaded from the function. -->
       <groupId>com.google.escapevelocity</groupId>
       <artifactId>escapevelocity</artifactId>
-      <version>0.9.1</version>
+      <version>1.1</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>

From e30ace5d45dd598a3865e1b9b72e816b9b1a0fb4 Mon Sep 17 00:00:00 2001
From: janell-chen <122311137+janell-chen@users.noreply.github.com>
Date: Mon, 12 Jun 2023 21:33:32 -0700
Subject: [PATCH 162/308] chore(deps): upgrade maven version to fix integ test
 (#211)

---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index ceb34856..24ac5a35 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.6.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -203,4 +203,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

From b3045ad380cd23e37f5edec0d758031438bcb568 Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Tue, 27 Jun 2023 11:04:49 -0700
Subject: [PATCH 163/308] fix: typed declaration works correctly with http
 trigger (#212)

* Configure typed function conformance test

* fix: typed function signature should be compatible with 'http' signature type

* apply google-java-format fixes
---
 .github/workflows/conformance.yaml            | 29 ++++++++++++++-----
 invoker/conformance/pom.xml                   |  3 +-
 .../conformance/TypedConformanceFunction.java | 26 +++++++++++++++++
 .../functions/invoker/runner/Invoker.java     |  6 +++-
 4 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 invoker/conformance/src/main/java/com/google/cloud/functions/conformance/TypedConformanceFunction.java

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 446029c3..b9404cfc 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -51,19 +51,32 @@ jobs:
     - name: Build invoker with Maven
       run: (cd invoker/ && mvn install)
 
+    - name: Build invoker Maven Plugin
+      run: (cd function-maven-plugin/ && mvn install)
+
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
         startDelay: 10
 
+    - name: Run Typed conformance tests
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      with:
+        version: 'v1.8.2'
+        functionType: 'http'
+        declarativeType: 'typed'
+        useBuildpacks: false
+        cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.TypedConformanceFunction'"
+        startDelay: 10
+
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'legacyevent'
         useBuildpacks: false
         validateMapping: true
@@ -71,9 +84,9 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true
@@ -81,9 +94,9 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1975792fb34ebbfa058d690666186d669d3a5977 # v1.8.0
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
       with:
-        version: 'v1.6.0'
+        version: 'v1.8.2'
         functionType: 'http'
         useBuildpacks: false
         validateConcurrency: true
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 1c0d59a8..8296836b 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -28,6 +28,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
+      <version>1.1.1-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -52,7 +53,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.10.1</version>
+          <version>0.11.1-SNAPSHOT</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/TypedConformanceFunction.java b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/TypedConformanceFunction.java
new file mode 100644
index 00000000..7b57c6ae
--- /dev/null
+++ b/invoker/conformance/src/main/java/com/google/cloud/functions/conformance/TypedConformanceFunction.java
@@ -0,0 +1,26 @@
+package com.google.cloud.functions.conformance;
+
+import com.google.cloud.functions.TypedFunction;
+import com.google.gson.annotations.SerializedName;
+
+public class TypedConformanceFunction
+    implements TypedFunction<ConformanceRequest, ConformanceResponse> {
+  @Override
+  public ConformanceResponse apply(ConformanceRequest req) throws Exception {
+    return new ConformanceResponse(req);
+  }
+}
+
+class ConformanceRequest {
+  @SerializedName("message")
+  public String message;
+}
+
+class ConformanceResponse {
+  @SerializedName("payload")
+  public ConformanceRequest payload = null;
+
+  ConformanceResponse(ConformanceRequest payload) {
+    this.payload = payload;
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 4936da4e..ebc70718 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -299,7 +299,11 @@ private void startServer(boolean join) throws Exception {
     } else {
       switch (functionSignatureType) {
         case "http":
-          servlet = HttpFunctionExecutor.forClass(functionClass);
+          if (TypedFunction.class.isAssignableFrom(functionClass)) {
+            servlet = TypedFunctionExecutor.forClass(functionClass);
+          } else {
+            servlet = HttpFunctionExecutor.forClass(functionClass);
+          }
           break;
         case "event":
         case "cloudevent":

From 4e19904e4c4dddda6f4ded8d732e1394a10aee3b Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Fri, 7 Jul 2023 16:13:57 -0700
Subject: [PATCH 164/308] ci: fix function-maven-plugin release (#217)

Developer and license information was missing from the pom and is required to publish to the Maven
central repo.
---
 function-maven-plugin/pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index d6b8e5a1..87ac3459 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -1,6 +1,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>9</version>
+  </parent>
+
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
@@ -17,6 +23,14 @@
     <tag>HEAD</tag>
   </scm>
 
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
   <properties>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
@@ -157,4 +171,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

From 9970a4d35557d8489c33bf6d3600d8e4ad0dcbe4 Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Mon, 17 Jul 2023 15:40:17 -0700
Subject: [PATCH 165/308] ci: rename master branch to main (#219)

---
 .github/workflows/buildpack-integration-test.yml              | 2 +-
 .github/workflows/codeql.yml                                  | 4 ++--
 .github/workflows/conformance.yaml                            | 2 +-
 .github/workflows/lint.yaml                                   | 2 +-
 .github/workflows/scorecard.yml                               | 2 +-
 .github/workflows/unit.yaml                                   | 2 +-
 .../java/com/google/cloud/functions/BackgroundFunction.java   | 2 +-
 .../com/google/cloud/functions/RawBackgroundFunction.java     | 2 +-
 invoker/pom.xml                                               | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 35e9b6c7..6a7c3677 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -3,7 +3,7 @@ name: Buildpack Integration Test
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 
 # Declare default permissions as read only.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index f68b594b..afdbcc5c 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -2,10 +2,10 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ "master" ]
+    branches: [ "main" ]
 
 permissions:
   contents: read
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index b9404cfc..b8d86b87 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -2,7 +2,7 @@ name: Java Conformance CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 
 # Declare default permissions as read only.
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index bfb7350d..7992931a 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -2,7 +2,7 @@ name: Java Lint CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
   workflow_dispatch:
 permissions:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 3ab2cbec..03f47547 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -8,7 +8,7 @@ on:
   schedule:
     - cron: '0 */12 * * *'
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   workflow_dispatch:
 
 # Declare default permissions as read only.
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 763456d0..c4751a83 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -2,7 +2,7 @@ name: Java Unit CI
 on:
   push:
     branches:
-    - master
+    - main
   pull_request:
 permissions:
   contents: read
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
index 5052b7b6..5dc0a97e 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/BackgroundFunction.java
@@ -18,7 +18,7 @@
  * Represents a Cloud Function that is activated by an event and parsed into a user-supplied class.
  * The payload of the event is a JSON object, which is deserialized into a user-defined class as
  * described for <a
- * href="https://github.com/google/gson/blob/master/UserGuide.md#TOC-Object-Examples">Gson</a>.
+ * href="https://github.com/google/gson/blob/main/UserGuide.md#TOC-Object-Examples">Gson</a>.
  *
  * <p>Here is an example of an implementation that accesses the {@code messageId} property from a
  * payload that matches a user-defined {@code PubSubMessage} class:
diff --git a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
index e27624ed..5f9706ba 100644
--- a/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
+++ b/functions-framework-api/src/main/java/com/google/cloud/functions/RawBackgroundFunction.java
@@ -17,7 +17,7 @@
 /**
  * Represents a Cloud Function that is activated by an event. The payload of the event is a JSON
  * object, which can be parsed using a JSON package such as <a
- * href="https://github.com/google/gson/blob/master/UserGuide.md">GSON</a>.
+ * href="https://github.com/google/gson/blob/main/UserGuide.md">GSON</a>.
  *
  * <p>Here is an example of an implementation that parses the JSON payload using Gson, to access its
  * {@code messageId} property:
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 6009e322..73ba5d34 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -15,7 +15,7 @@
     Parent POM for the GCF Java Invoker. The project is structured like this so
     that we can have modules that build jar files for use in tests.
   </description>
-  <url>https://github.com/GoogleCloudPlatform/functions-framework-java/tree/master/invoker</url>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java/tree/main/invoker</url>
 
   <scm>
     <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>

From 04f04590492d4240c67cb2a8021fb0be34ee8b59 Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Thu, 20 Jul 2023 13:14:16 -0700
Subject: [PATCH 166/308] ci: retarget buildpack integration test to main
 instead of release version (#222)

---
 .github/workflows/buildpack-integration-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 6a7c3677..11d53282 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -11,7 +11,7 @@ permissions: read-all
 
 jobs:
   java11-buildpack-test:
-    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.8.0
+    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'
@@ -20,7 +20,7 @@ jobs:
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java11'
   java17-buildpack-test:
-    uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@v1.8.0
+    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'

From 03bc0325b3f232146aee531471885f5cec802230 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 25 Jul 2023 11:18:26 -0700
Subject: [PATCH 167/308] chore: run buildpack tests on pull request (#218)

---
 .github/workflows/buildpack-integration-test.yml | 10 +++++++++-
 invoker/conformance/prerun.sh                    |  7 ++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 11d53282..728f5a0f 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -4,7 +4,11 @@ on:
   push:
     branches:
       - main
+  pull_request:
   workflow_dispatch:
+  # Runs every day on 12:00 AM PST
+  schedule:
+    - cron: "0 0 * * *"
 
 # Declare default permissions as read only.
 permissions: read-all
@@ -19,6 +23,8 @@ jobs:
       cloudevent-builder-target: 'com.google.cloud.functions.conformance.CloudEventsConformanceFunction'
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java11'
+      builder-runtime-version: '11'
+      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
   java17-buildpack-test:
     uses: GoogleCloudPlatform/functions-framework-conformance/.github/workflows/buildpack-integration-test.yml@main
     with:
@@ -27,4 +33,6 @@ jobs:
       cloudevent-builder-source: '/tmp/tests/conformance'
       cloudevent-builder-target: 'com.google.cloud.functions.conformance.CloudEventsConformanceFunction'
       prerun: 'invoker/conformance/prerun.sh'
-      builder-runtime: 'java17'
\ No newline at end of file
+      builder-runtime: 'java17'
+      builder-runtime-version: '17'
+      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
\ No newline at end of file
diff --git a/invoker/conformance/prerun.sh b/invoker/conformance/prerun.sh
index d5614357..504e3aa8 100755
--- a/invoker/conformance/prerun.sh
+++ b/invoker/conformance/prerun.sh
@@ -14,11 +14,10 @@
 # - Copy the conformance tests folder into temp
 # - Build java-function-invoker with version 0.0.0-SNAPSHOT into artifacts
 #  folder
-# - Build functions-framework-api with version 0.0.0-SNAPSHOT into artifacts 
+# - Build functions-framework-api with version 0.0.0-SNAPSHOT into artifacts
 # folder
 # - Ensure that we use the buildpack_pom.xml file by renaming it to pom.xml
 
-
 set -e
 REPO_ROOT=$(git rev-parse --show-toplevel)
 
@@ -36,7 +35,7 @@ function get_mvn_version() {
 }
 
 # Must first install a local version of the API package
-cd $REPO_ROOT/functions-framework-api 
+cd $REPO_ROOT/functions-framework-api
 mvn install -Dmaven.repo.local=/tmp/tests/conformance/artifacts
 FRAMEWORK_API_VERSION=$(get_mvn_version)
 
@@ -50,3 +49,5 @@ mv /tmp/tests/conformance/buildpack_pom.xml /tmp/tests/conformance/pom.xml
 
 sed -i "s/FRAMEWORK-API-VERSION/${FRAMEWORK_API_VERSION}/g" /tmp/tests/conformance/pom.xml
 sed -i "s/INVOKER-VERSION/${INVOKER_VERSION}/g" /tmp/tests/conformance/pom.xml
+
+cat /tmp/tests/conformance/pom.xml

From f3fe2ce46fcb1885137cdf504649612e7c31dc4c Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Tue, 25 Jul 2023 15:39:15 -0700
Subject: [PATCH 168/308] fix(functions): include Implementation-Version key in
 invoker package manifest (#221)

---
 invoker/core/pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 2308f93b..bdae9e4e 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -165,6 +165,8 @@
           <archive>
             <manifest>
               <mainClass>com.google.cloud.functions.invoker.runner.Invoker</mainClass>
+              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
             </manifest>
           </archive>
         </configuration>
@@ -184,4 +186,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

From 8ff911462bd811fbb10da7f3db25eb1e5b5aaef5 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 5 Sep 2023 18:37:49 -0700
Subject: [PATCH 169/308] chore: add missing egress endpoint to codeql ACL
 (#223)

---
 .github/workflows/codeql.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index afdbcc5c..6dba3407 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -39,6 +39,7 @@ jobs:
           proxy.golang.org:443
           repo.maven.apache.org:443
           storage.googleapis.com:443
+          uploads.github.com:443
           
     - name: Checkout repository
       uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2

From 8ae7d850f5e26964b3a8b52b0494be587e946fdc Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 12 Sep 2023 19:50:01 +0200
Subject: [PATCH 170/308] chore(deps): update all non-major dependencies (#228)

Co-authored-by: Kenneth Rosario <kennethrosario@google.com>
---
 .github/workflows/codeql.yml       |  8 ++++----
 .github/workflows/conformance.yaml | 25 ++++++++++---------------
 .github/workflows/lint.yaml        | 10 +++++-----
 .github/workflows/scorecard.yml    |  8 ++++----
 .github/workflows/unit.yaml        |  6 +++---
 function-maven-plugin/pom.xml      |  6 +++---
 invoker/core/pom.xml               | 16 ++++++++--------
 7 files changed, 37 insertions(+), 42 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6dba3407..e9c002ec 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -42,11 +42,11 @@ jobs:
           uploads.github.com:443
           
     - name: Checkout repository
-      uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
+      uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
+      uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index b8d86b87..0edd3720 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -20,7 +20,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -32,18 +32,18 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@fac708d6674e30b6ba41289acaab6d4b75aa0753 # v4.0.1
+      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
-        go-version: '1.16'
+        go-version: '1.21'
 
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
@@ -55,18 +55,16 @@ jobs:
       run: (cd function-maven-plugin/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
       with:
-        version: 'v1.8.2'
         functionType: 'http'
         useBuildpacks: false
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.HttpConformanceFunction'"
         startDelay: 10
 
     - name: Run Typed conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
       with:
-        version: 'v1.8.2'
         functionType: 'http'
         declarativeType: 'typed'
         useBuildpacks: false
@@ -74,9 +72,8 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
       with:
-        version: 'v1.8.2'
         functionType: 'legacyevent'
         useBuildpacks: false
         validateMapping: true
@@ -84,9 +81,8 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
       with:
-        version: 'v1.8.2'
         functionType: 'cloudevent'
         useBuildpacks: false
         validateMapping: true
@@ -94,9 +90,8 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@2f5f319c06a3531be7f75dc5acf6bd00417ff76e # v1.8.2
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
       with:
-        version: 'v1.8.2'
         functionType: 'http'
         useBuildpacks: false
         validateConcurrency: true
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 7992931a..518c3c3d 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
       with:
         disable-sudo: true
         egress-policy: block
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 # v2 minimum required
+      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 03f47547..087d9842 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -44,12 +44,12 @@ jobs:
             rekor.sigstore.dev:443
           
       - name: "Checkout code"
-        uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
+        uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index c4751a83..d88af609 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -18,16 +18,16 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@128a63446a954579617e875aaab7d2978154e969 # v2.4.0
+      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
       with:
         disable-sudo: true
         egress-policy: block
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
+    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
+      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 87ac3459..913b9ccf 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -41,12 +41,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.2</version>
+      <version>3.9.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.2</version>
+      <version>3.9.4</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.4</version>
+      <version>1.1.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index bdae9e4e..837b4cf8 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -86,24 +86,24 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>1.10.1</version>
+      <version>1.10.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>1.10.1</version>
+      <version>1.10.4</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.51.v20230217</version>
+      <version>9.4.52.v20230823</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.51.v20230217</version>
+      <version>9.4.52.v20230823</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -139,19 +139,19 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.4</version>
+      <version>1.1.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.1.4</version>
+      <version>1.1.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.51.v20230217</version>
+      <version>9.4.52.v20230823</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -174,7 +174,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.5.0</version>
         <executions>
           <execution>
             <phase>package</phase>

From 6ece5604faf31a9375710d43d6aa530efd23e0b1 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Wed, 13 Sep 2023 10:47:58 -0700
Subject: [PATCH 171/308] chore: add egress endpoint to allow list (#233)

---
 .github/workflows/scorecard.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 087d9842..08480f05 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -42,6 +42,7 @@ jobs:
             oss-fuzz-build-logs.storage.googleapis.com:443
             sigstore-tuf-root.storage.googleapis.com:443
             rekor.sigstore.dev:443
+            www.bestpractices.dev:443
           
       - name: "Checkout code"
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

From 89b3b92f4d5efeea08256dc56a34d2f4bde57d01 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 19 Sep 2023 16:10:44 -0700
Subject: [PATCH 172/308] chore(main): release java-function-invoker 1.3.1
 (#220)

* chore(main): release java-function-invoker 1.3.1

* patch maven-plugin package manifest for release

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Gareth George <garethgeorge@google.com>
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/pom.xml         | 2 +-
 invoker/CHANGELOG.md                  | 8 ++++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index b3d335ae..c2ee81e0 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.0","invoker":"1.3.0","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.0","invoker":"1.3.1","function-maven-plugin":"0.11.0"}
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 913b9ccf..20cc5882 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 2646cd1b..2800c114 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.3.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.0...java-function-invoker-v1.3.1) (2023-09-13)
+
+
+### Bug Fixes
+
+* **functions:** include Implementation-Version key in invoker package manifest ([#221](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/221)) ([f3fe2ce](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/f3fe2ce46fcb1885137cdf504649612e7c31dc4c))
+* typed declaration works correctly with http trigger ([#212](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/212)) ([b3045ad](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/b3045ad380cd23e37f5edec0d758031438bcb568))
+
 ## [1.3.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.2.1...java-function-invoker-v1.3.0) (2023-06-01)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 8296836b..67e36ae0 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 837b4cf8..63596639 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.3.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 73ba5d34..e3159883 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index fa29218b..660e6f05 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 9f7586944034fa63d0f55e6a897d9921b6379049 Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Fri, 22 Sep 2023 11:54:31 -0700
Subject: [PATCH 173/308] Revert "chore(main): release java-function-invoker
 1.3.1 (#220)" (#236)

This reverts commit 89b3b92f4d5efeea08256dc56a34d2f4bde57d01.
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/pom.xml         | 2 +-
 invoker/CHANGELOG.md                  | 8 --------
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 7 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index c2ee81e0..b3d335ae 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.0","invoker":"1.3.1","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.0","invoker":"1.3.0","function-maven-plugin":"0.11.0"}
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 20cc5882..913b9ccf 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.3.1</version>
+      <version>1.3.1-SNAPSHOT</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 2800c114..2646cd1b 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,13 +1,5 @@
 # Changelog
 
-## [1.3.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.0...java-function-invoker-v1.3.1) (2023-09-13)
-
-
-### Bug Fixes
-
-* **functions:** include Implementation-Version key in invoker package manifest ([#221](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/221)) ([f3fe2ce](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/f3fe2ce46fcb1885137cdf504649612e7c31dc4c))
-* typed declaration works correctly with http trigger ([#212](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/212)) ([b3045ad](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/b3045ad380cd23e37f5edec0d758031438bcb568))
-
 ## [1.3.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.2.1...java-function-invoker-v1.3.0) (2023-06-01)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 67e36ae0..8296836b 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.1</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 63596639..837b4cf8 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.1</version>
+      <version>1.3.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index e3159883..73ba5d34 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 660e6f05..fa29218b 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From bc1ca57738ade76cff8544c3e0dd0bcbd160ae72 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Mon, 25 Sep 2023 11:38:11 -0700
Subject: [PATCH 174/308] chore: fix scorecard action acls (#238)

---
 .github/workflows/scorecard.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 08480f05..dc3c7c0b 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -31,18 +31,17 @@ jobs:
           disable-sudo: true
           egress-policy: block
           allowed-endpoints: >
-            api.github.com:443
             api.osv.dev:443
             api.securityscorecards.dev:443
             auth.docker.io:443
             bestpractices.coreinfrastructure.org:443
-            fulcio.sigstore.dev:443
             github.com:443
             index.docker.io:443
             oss-fuzz-build-logs.storage.googleapis.com:443
             sigstore-tuf-root.storage.googleapis.com:443
-            rekor.sigstore.dev:443
             www.bestpractices.dev:443
+            *.sigstore.dev:443
+            *.github.com:443
           
       - name: "Checkout code"
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0

From 5795b1261d39845f36142b97cb05360cb202a4df Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Sep 2023 20:43:51 +0200
Subject: [PATCH 175/308] chore(deps): update dependency
 javax.servlet:javax.servlet-api to v4 (#229)

---
 invoker/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 837b4cf8..9d809a6a 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -49,7 +49,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <version>4.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>

From 7df8be83040252bbeeba0bae09cd8dca4e58eb24 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 25 Sep 2023 20:47:54 +0200
Subject: [PATCH 176/308] chore(deps): update dependency
 org.apache.maven.plugins:maven-release-plugin to v3 (#230)

---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 24ac5a35..14a940c3 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
+        <version>3.0.1</version>
         <executions>
           <execution>
             <id>default</id>

From 6dfc3c74d7bbc40fdb02568a7ddf6b352260cd3a Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Tue, 26 Sep 2023 13:50:43 -0700
Subject: [PATCH 177/308] Reapply "chore(main): release java-function-invoker
 1.3.1 (#220)" (#236) (#237)

This reverts commit 9f7586944034fa63d0f55e6a897d9921b6379049.
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/pom.xml         | 2 +-
 invoker/CHANGELOG.md                  | 8 ++++++++
 invoker/conformance/pom.xml           | 6 +++---
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index b3d335ae..c2ee81e0 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.0","invoker":"1.3.0","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.0","invoker":"1.3.1","function-maven-plugin":"0.11.0"}
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 913b9ccf..20cc5882 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.3.1</version>
     </dependency>
 
     <dependency>
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 2646cd1b..2800c114 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.3.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.0...java-function-invoker-v1.3.1) (2023-09-13)
+
+
+### Bug Fixes
+
+* **functions:** include Implementation-Version key in invoker package manifest ([#221](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/221)) ([f3fe2ce](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/f3fe2ce46fcb1885137cdf504649612e7c31dc4c))
+* typed declaration works correctly with http trigger ([#212](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/212)) ([b3045ad](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/b3045ad380cd23e37f5edec0d758031438bcb568))
+
 ## [1.3.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.2.1...java-function-invoker-v1.3.0) (2023-06-01)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 8296836b..43894042 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
 
   <name>GCF Confromance Tests</name>
   <description>
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.1.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 9d809a6a..f5f4dced 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.1-SNAPSHOT</version>
+      <version>1.3.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 73ba5d34..e3159883 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index fa29218b..660e6f05 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.3.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.3.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 9f7155b77574ec980ecf9e6dffbd2ee0398db8a7 Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Thu, 28 Sep 2023 10:25:47 -0700
Subject: [PATCH 178/308] fix: set Thread Context ClassLoader correctly when
 invoking handler constructor (#239)

---
 .../invoker/HttpFunctionExecutor.java         |  4 +++
 .../invoker/HttpFunctionExecutorTest.java     | 36 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionExecutorTest.java

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 21115666..401e22a2 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -48,12 +48,16 @@ public static HttpFunctionExecutor forClass(Class<?> functionClass) {
               + HttpFunction.class.getName());
     }
     Class<? extends HttpFunction> httpFunctionClass = functionClass.asSubclass(HttpFunction.class);
+    ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
+      Thread.currentThread().setContextClassLoader(httpFunctionClass.getClassLoader());
       HttpFunction httpFunction = httpFunctionClass.getConstructor().newInstance();
       return new HttpFunctionExecutor(httpFunction);
     } catch (ReflectiveOperationException e) {
       throw new RuntimeException(
           "Could not construct an instance of " + functionClass.getName() + ": " + e, e);
+    } finally {
+      Thread.currentThread().setContextClassLoader(oldContextLoader);
     }
   }
 
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionExecutorTest.java
new file mode 100644
index 00000000..080e3851
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionExecutorTest.java
@@ -0,0 +1,36 @@
+package com.google.cloud.functions.invoker;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class HttpFunctionExecutorTest {
+  private static ClassLoader customClassLoader =
+      new ClassLoader(ClassLoader.getSystemClassLoader()) {};
+
+  public static class ClassLoaderVerifier implements HttpFunction {
+    public ClassLoaderVerifier() {
+      assertThat(Thread.currentThread().getContextClassLoader())
+          .isNotSameInstanceAs(customClassLoader);
+    }
+
+    @Override
+    public void service(HttpRequest request, HttpResponse response) throws Exception {
+      throw new UnsupportedOperationException("Not implemented");
+    }
+  }
+
+  @Test
+  public void usesCorrectClassLoaderOverride() {
+    ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+    Thread.currentThread().setContextClassLoader(customClassLoader);
+    HttpFunctionExecutor.forClass(ClassLoaderVerifier.class);
+    Thread.currentThread().setContextClassLoader(oldClassLoader);
+  }
+}

From fca867667db593699193da01b69a4cca7ca48fc8 Mon Sep 17 00:00:00 2001
From: Alberto <alsoba13@gmail.com>
Date: Fri, 29 Sep 2023 00:35:39 +0200
Subject: [PATCH 179/308] fix: avoid executing function when /favicon.ico or
 /robots.txt is called (#226)

---
 .../java/com/google/cloud/functions/invoker/runner/Invoker.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index ebc70718..892d6038 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -474,6 +474,7 @@ public void handle(
         throws IOException, ServletException {
       if (NOT_FOUND_PATHS.contains(request.getRequestURI())) {
         response.sendError(HttpStatus.NOT_FOUND_404, "Not Found");
+        return;
       }
       super.handle(target, baseRequest, request, response);
     }

From bef9b6de039945aec71ba0999db3367eab20e4ab Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 28 Sep 2023 15:42:01 -0700
Subject: [PATCH 180/308] chore(main): release java-function-invoker
 1.3.2-SNAPSHOT (#234)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 43894042..56dfcf68 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.1</version>
+    <version>1.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.2-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index f5f4dced..0ffdd993 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.1</version>
+      <version>1.3.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index e3159883..71b2f643 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 660e6f05..856674a4 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.1</version>
+    <version>1.3.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.1</version>
+  <version>1.3.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From b89ba197384a5790c8b4c9a1af70f808dd382914 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 19 Oct 2023 20:18:12 +0200
Subject: [PATCH 181/308] chore(deps): update all non-major dependencies (#242)

---
 .github/workflows/codeql.yml       | 6 +++---
 .github/workflows/conformance.yaml | 4 ++--
 .github/workflows/lint.yaml        | 6 +++---
 .github/workflows/scorecard.yml    | 6 +++---
 .github/workflows/unit.yaml        | 4 ++--
 function-maven-plugin/pom.xml      | 8 ++++----
 functions-framework-api/pom.xml    | 2 +-
 invoker/core/pom.xml               | 8 ++++----
 invoker/pom.xml                    | 2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e9c002ec..a7a71ab5 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
+      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+      uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+      uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 0edd3720..80704601 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -20,7 +20,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
+      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -35,7 +35,7 @@ jobs:
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 518c3c3d..bc964f52 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
+      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -22,7 +22,7 @@ jobs:
           repo.maven.apache.org:443
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
+        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index dc3c7c0b..ef772cc0 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
+        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
         with:
           disable-sudo: true
           egress-policy: block
@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
+        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2.21.5
+        uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index d88af609..987c4e4f 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@8ca2b8b2ece13480cda6dacd3511b49857a23c09 # v2.5.1
+      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -27,7 +27,7 @@ jobs:
           repo.maven.apache.org:443
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@cd89f46ac9d01407894225f350157564c9c7cee2 # v3.12.0
+      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 20cc5882..c4bd7c6c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -41,12 +41,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.4</version>
+      <version>3.9.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.4</version>
+      <version>3.9.5</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.4.4</version>
+      <version>2.5.0</version>
       <type>jar</type>
     </dependency>
 
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.5.0</version>
+            <version>3.6.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 14a940c3..53dba4d1 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+    <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0ffdd993..baf0543f 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -98,12 +98,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.52.v20230823</version>
+      <version>9.4.53.v20231009</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.52.v20230823</version>
+      <version>9.4.53.v20231009</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.52.v20230823</version>
+      <version>9.4.53.v20231009</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -174,7 +174,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.0</version>
+        <version>3.5.1</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 71b2f643..68a80e46 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.5.0</version>
+            <version>3.6.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>

From e4445930ec3031dc1eff8d2fa872953e553ea517 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 19 Oct 2023 20:19:18 +0200
Subject: [PATCH 182/308] chore(deps): update actions/checkout action to v4
 (#243)

---
 .github/workflows/codeql.yml       | 2 +-
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/scorecard.yml    | 2 +-
 .github/workflows/unit.yaml        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a7a71ab5..d5bb2684 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -42,7 +42,7 @@ jobs:
           uploads.github.com:443
           
     - name: Checkout repository
-      uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 80704601..b53b1c73 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -32,7 +32,7 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index bc964f52..fd5f6262 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -20,7 +20,7 @@ jobs:
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:
@@ -42,7 +42,7 @@ jobs:
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 # v2 minimum required
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index ef772cc0..1fabef33 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -44,7 +44,7 @@ jobs:
             *.github.com:443
           
       - name: "Checkout code"
-        uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 987c4e4f..7a7f63a6 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -25,7 +25,7 @@ jobs:
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
+    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
       with:

From 0f35dea72744f1e60332f2ea18e5cc2535a1b594 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 1 Nov 2023 07:23:42 +0100
Subject: [PATCH 183/308] chore(deps): update all non-major dependencies (#247)

---
 .github/workflows/codeql.yml    | 4 ++--
 .github/workflows/scorecard.yml | 4 ++--
 function-maven-plugin/pom.xml   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d5bb2684..d6b2d934 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+      uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+      uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1fabef33..c8626a6c 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -49,7 +49,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@483ef80eb98fb506c348f7d62e28055e49fe2398 # v2.3.0
+        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0116bc2df50751f9724a2e35ef1f24d22f90e4e1 # v2.22.3
+        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
         with:
           sarif_file: results.sarif
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index c4bd7c6c..fff56345 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.9.0</version>
+      <version>3.10.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.9.0</version>
+        <version>3.10.1</version>
         <executions>
           <execution>
             <id>help-goal</id>

From 4c454f40aa5d1266821ee9d9d313a41c4225dd69 Mon Sep 17 00:00:00 2001
From: Gareth <garethgeorge@google.com>
Date: Tue, 7 Nov 2023 11:48:14 -0800
Subject: [PATCH 184/308] chore: add test coverage for Java 21 (#227)

* chore: add test coverage for Java 21

* allowlist api.adoptium.net:443

---------

Co-authored-by: Kenneth Rosario <kennethrosario@google.com>
---
 .github/workflows/buildpack-integration-test.yml             | 2 +-
 .github/workflows/conformance.yaml                           | 4 +---
 .github/workflows/unit.yaml                                  | 5 ++++-
 .../com/google/cloud/functions/invoker/IntegrationTest.java  | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 728f5a0f..2c320a6e 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -35,4 +35,4 @@ jobs:
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java17'
       builder-runtime-version: '17'
-      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
\ No newline at end of file
+      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index b53b1c73..f997ebd9 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -14,9 +14,7 @@ jobs:
     strategy:
       matrix:
         java: [
-          11.x
-          # 12.x,
-          # 13.x
+          11.x,
         ]
     steps:
     - name: Harden Runner
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 7a7f63a6..54f15429 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -14,7 +14,8 @@ jobs:
       matrix:
         java: [
           11.x,
-          17.x
+          17.x,
+          21-ea
         ]
     steps:
     - name: Harden Runner
@@ -25,6 +26,8 @@ jobs:
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
+          api.adoptium.net:443
+          *.githubusercontent.com:443
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index f84ddbdd..3f3de837 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -363,6 +363,10 @@ private static int getJavaVersion() {
       if (dot != -1) {
         version = version.substring(0, dot);
       }
+      int dash = version.indexOf("-");
+      if (dash != -1) {
+        version = version.substring(0, dash);
+      }
     }
     return Integer.parseInt(version);
   }

From 9518d96d44a3eb227080f76696d9335bb0935006 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Tue, 7 Nov 2023 11:59:43 -0800
Subject: [PATCH 185/308] chore: Update blunderbuss.yml (#252)

---
 .github/blunderbuss.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 4234009b..45d57ef1 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,9 +1,9 @@
 assign_prs:
   - janell-chen
   - HKWinterhalter
-  - garethgeorge
+  - kenneth-rosario
 
 assign_issues:
   - janell-chen
   - HKWinterhalter
-  - garethgeorge
+  - kenneth-rosario

From c704548cc693310137ddcc552c25e27f2762eaf3 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Tue, 2 Jan 2024 12:02:06 -0800
Subject: [PATCH 186/308] Update README.md (#257)

fix package and class name for examples
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 9b117033..e4c543a4 100644
--- a/README.md
+++ b/README.md
@@ -161,7 +161,7 @@ You can configure the plugin in `pom.xml`:
   <artifactId>function-maven-plugin</artifactId>
   <version>0.10.1</version>
   <configuration>
-    <functionTarget>com.example.function.Echo</functionTarget>
+    <functionTarget>com.example.HelloWorld</functionTarget>
   </configuration>
 </plugin>
 ```
@@ -178,7 +178,7 @@ You can alternatively configure the plugin with properties on the command line:
 
 ```sh
   mvn com.google.cloud.functions:function-maven-plugin:0.10.1:run \
-      -Drun.functionTarget=com.example.function.Echo
+      -Drun.functionTarget=com.example.HelloWorld
 ```
 
 ### Running the Functions Framework directly

From fd73d6dfb6f7aef5e0ce7a667c8623ac0854f0b9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Tue, 9 Jan 2024 16:50:44 +0100
Subject: [PATCH 187/308] chore(deps): update actions/setup-java action to v4
 (#256)

Co-authored-by: Kenneth Rosario <kennethrosario@google.com>
---
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 2 +-
 .github/workflows/unit.yaml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index f997ebd9..d559b3da 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index fd5f6262..dea46927 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -22,7 +22,7 @@ jobs:
           repo.maven.apache.org:443
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         java-version: 11.x
         distribution: temurin
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 54f15429..19184d88 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -30,7 +30,7 @@ jobs:
           *.githubusercontent.com:443
     - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 # v3.13.0
+      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin

From 9756755c319ea9b921e1300998caf2173591d147 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Thu, 18 Jan 2024 23:57:32 +0100
Subject: [PATCH 188/308] chore(deps): update dependency com.google.guava:guava
 to v32 [security] (#253)

Co-authored-by: Kenneth Rosario <kennethrosario@google.com>
---
 invoker/testfunction/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 856674a4..ade019aa 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>29.0-jre</version>
+      <version>32.0.0-android</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>

From b8b35b5534a5dbea9e9d61fc8055441861d7696b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 19 Jan 2024 00:01:43 +0100
Subject: [PATCH 189/308] chore(deps): update all non-major dependencies (#255)

---
 .github/workflows/codeql.yml       |  6 +++---
 .github/workflows/conformance.yaml |  2 +-
 .github/workflows/lint.yaml        |  4 ++--
 .github/workflows/scorecard.yml    |  4 ++--
 .github/workflows/unit.yaml        |  2 +-
 function-maven-plugin/pom.xml      | 14 +++++++-------
 functions-framework-api/pom.xml    |  4 ++--
 invoker/core/pom.xml               |  4 ++--
 invoker/pom.xml                    |  2 +-
 invoker/testfunction/pom.xml       |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d6b2d934..6476579b 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+      uses: github/codeql-action/init@4759df8df70c5ebe7042c3029bbace20eee13edd # v2.23.1
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+      uses: github/codeql-action/analyze@4759df8df70c5ebe7042c3029bbace20eee13edd # v2.23.1
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index d559b3da..76965b70 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index dea46927..448eb910 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c8626a6c..f9c7efce 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2.22.5
+        uses: github/codeql-action/upload-sarif@4759df8df70c5ebe7042c3029bbace20eee13edd # v2.23.1
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 19184d88..d8c12f2a 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@1b05615854632b887b69ae1be8cbefe72d3ae423 # v2.6.0
+      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index fff56345..b37754e6 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -41,17 +41,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.5</version>
+      <version>3.9.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.5</version>
+      <version>3.9.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.10.1</version>
+      <version>3.11.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.5.0</version>
+      <version>2.6.0</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.5</version>
+      <version>1.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.10.1</version>
+        <version>3.11.0</version>
         <executions>
           <execution>
             <id>help-goal</id>
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.0</version>
+            <version>3.6.3</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 53dba4d1..01e9d22d 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -28,8 +28,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.6.0</maven-javadoc-plugin.version>
+    <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
+    <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index baf0543f..febfd39c 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -139,13 +139,13 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.1.5</version>
+      <version>1.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.1.5</version>
+      <version>1.2.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 68a80e46..b9b94e60 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.0</version>
+            <version>3.6.3</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index ade019aa..a19349ce 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.0.0-android</version>
+      <version>32.1.3-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>

From 7757265759327c64c9e8a817c2f668906645991c Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 19 Jan 2024 00:09:15 +0100
Subject: [PATCH 190/308] chore(deps): update actions/setup-go action to v5
 (#258)

Co-authored-by: HKWinterhalter <HansWinterhalter@gmail.com>
---
 .github/workflows/conformance.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 76965b70..b946eeeb 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -39,7 +39,7 @@ jobs:
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
+      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
       with:
         go-version: '1.21'
 

From f2d4f89c980a69e3c3bb4005c68ac6acff713702 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 19 Jan 2024 00:16:45 +0100
Subject: [PATCH 191/308] chore(deps): update github/codeql-action action to v3
 (#259)

Co-authored-by: HKWinterhalter <HansWinterhalter@gmail.com>
---
 .github/workflows/codeql.yml    | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 6476579b..d09610e0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@4759df8df70c5ebe7042c3029bbace20eee13edd # v2.23.1
+      uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@4759df8df70c5ebe7042c3029bbace20eee13edd # v2.23.1
+      uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index f9c7efce..d0d20ff2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@4759df8df70c5ebe7042c3029bbace20eee13edd # v2.23.1
+        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
         with:
           sarif_file: results.sarif

From a9b2a2c69376e987f7034d32ce8401f923948b12 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 19 Jan 2024 00:21:11 +0100
Subject: [PATCH 192/308] chore(deps): update dependency
 org.mockito:mockito-core to v5 (#250)

Co-authored-by: HKWinterhalter <HansWinterhalter@gmail.com>
---
 invoker/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index febfd39c..c1501eb6 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>3.12.4</version>
+      <version>5.7.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From a290d09a1178cb85d8de0061386ba9bcbf1dc9b5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 5 Feb 2024 15:09:48 +0100
Subject: [PATCH 193/308] chore(deps): update all non-major dependencies (#264)

---
 .github/workflows/codeql.yml       | 6 +++---
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/scorecard.yml    | 4 ++--
 .github/workflows/unit.yaml        | 2 +-
 function-maven-plugin/pom.xml      | 4 ++--
 invoker/core/pom.xml               | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index d09610e0..9b2d50ba 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+      uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+      uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index b946eeeb..a38ab081 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 448eb910..47fdb814 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index d0d20ff2..36390246 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           disable-sudo: true
           egress-policy: block
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0b21cf2492b6b02c465a3e5d7c473717ad7721ba # v3.23.1
+        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index d8c12f2a..7e1e91d1 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index b37754e6..e8874a93 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.6.0</version>
+      <version>2.8.0</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index c1501eb6..dbf10306 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.7.0</version>
+      <version>5.10.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -139,13 +139,13 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.2.0</version>
+      <version>1.4.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

From 6e4fb6881529aa9ebd113329a2e0fd271ffa8167 Mon Sep 17 00:00:00 2001
From: Kenneth Rosario <kennethrosario@google.com>
Date: Mon, 1 Apr 2024 22:31:47 -0700
Subject: [PATCH 194/308] chore: Update blunderbuss.yml (#269)

---
 .github/blunderbuss.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 45d57ef1..cafaa0ce 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,9 +1,7 @@
 assign_prs:
   - janell-chen
   - HKWinterhalter
-  - kenneth-rosario
 
 assign_issues:
   - janell-chen
   - HKWinterhalter
-  - kenneth-rosario

From f99decfad7eb050dfbab57a916d9cb57f34b0ad2 Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Sun, 2 Jun 2024 23:59:10 -0700
Subject: [PATCH 195/308] chore: Update blunderbuss.yml (#273)

* Update blunderbuss.yml

* chore: Update blunderbuss.yml

* chore: Update blunderbuss.yml

Remove assignees - to be replaced with other mechanism

* Update blunderbuss.yml
---
 .github/blunderbuss.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index cafaa0ce..8b137891 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,7 +1 @@
-assign_prs:
-  - janell-chen
-  - HKWinterhalter
 
-assign_issues:
-  - janell-chen
-  - HKWinterhalter

From 5a66df34ab06a75c277bab874f23042117f59756 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 01:25:01 +0200
Subject: [PATCH 196/308] chore(deps): update dependency
 io.cloudevents:cloudevents-json-jackson to v3 (#271)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/conformance/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 56dfcf68..964f3bf9 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>2.5.0</version>
+      <version>3.0.0</version>
     </dependency>
   </dependencies>
 

From 0415a6b123d0e5f1aa5dadc366c1c222b87bd4bb Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 02:10:24 +0200
Subject: [PATCH 197/308] chore(deps): update dependency
 io.cloudevents:cloudevents-api to v3 (#268)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 01e9d22d..183a6184 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>2.5.0</version>
+      <version>3.0.0</version>
     </dependency>
   </dependencies>
 

From a2665683e1ec3df4ae078f60e7fa418ce4d09dd9 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 02:24:13 +0200
Subject: [PATCH 198/308] chore(deps): update dependency com.google.guava:guava
 to v33 (#266)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/testfunction/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index a19349ce..6958ad2d 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.3-jre</version>
+      <version>33.2.1-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>

From e095e1d114d0641c8468cf37469be0125387821f Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 02:27:53 +0200
Subject: [PATCH 199/308] chore(deps): update dependency
 io.cloudevents:cloudevents-core to v3 (#270)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/conformance/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 964f3bf9..054af20e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
-      <version>2.5.0</version>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>

From 3fd0521d4999c17ea45ba6ae47a8cea29d9b6ad8 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 02:38:13 +0200
Subject: [PATCH 200/308] chore(deps): update cloudevents.sdk.version to v3
 (#267)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index dbf10306..9a879c0c 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -22,7 +22,7 @@
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <cloudevents.sdk.version>2.5.0</cloudevents.sdk.version>
+    <cloudevents.sdk.version>3.0.0</cloudevents.sdk.version>
   </properties>
 
   <licenses>

From 8d44947c7524cca045906aa444bc3eb48bbbff85 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 02:58:19 +0200
Subject: [PATCH 201/308] chore(deps): update all non-major dependencies (#265)

* chore(deps): update all non-major dependencies

* remove all references to truth8

---------

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Co-authored-by: Jeremy Fehr <jfehr@google.com>
---
 .github/workflows/codeql.yml                  |  8 +++----
 .github/workflows/conformance.yaml            |  8 +++----
 .github/workflows/lint.yaml                   | 10 ++++-----
 .github/workflows/scorecard.yml               |  8 +++----
 .github/workflows/unit.yaml                   |  6 ++---
 function-maven-plugin/pom.xml                 | 18 +++++++--------
 functions-framework-api/pom.xml               | 12 +++++-----
 invoker/conformance/pom.xml                   |  2 +-
 invoker/core/pom.xml                          | 22 +++++++++----------
 .../BackgroundFunctionExecutorTest.java       |  1 -
 .../invoker/TypedFunctionExecutorTest.java    |  1 -
 .../functions/invoker/http/HttpTest.java      |  1 -
 .../functions/invoker/runner/InvokerTest.java |  1 -
 invoker/pom.xml                               |  8 +++----
 invoker/testfunction/pom.xml                  |  6 ++---
 15 files changed, 54 insertions(+), 58 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 9b2d50ba..a974e193 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -42,11 +42,11 @@ jobs:
           uploads.github.com:443
           
     - name: Checkout repository
-      uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+      uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+      uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index a38ab081..c914263e 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -30,16 +30,16 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
+      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
       with:
         go-version: '1.21'
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 47fdb814..a712703e 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
       with:
         disable-sudo: true
         egress-policy: block
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 # v2 minimum required
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 36390246..728eb127 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -44,12 +44,12 @@ jobs:
             *.github.com:443
           
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
+        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -61,6 +61,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e8893c57a1f3a2b659b6b55564fdfdbbd2982911 # v3.24.0
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 7e1e91d1..64821a08 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
+      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -28,9 +28,9 @@ jobs:
           repo.maven.apache.org:443
           api.adoptium.net:443
           *.githubusercontent.com:443
-    - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
+      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index e8874a93..ac6c3552 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -41,17 +41,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.6</version>
+      <version>3.9.8</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.6</version>
+      <version>3.9.8</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.11.0</version>
+      <version>3.13.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.1</version>
         <executions>
           <execution>
             <id>help-goal</id>
@@ -119,7 +119,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.3</version>
+            <version>3.7.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -145,7 +145,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.4</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -159,7 +159,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
+            <version>1.7.0</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>sonatype-nexus-snapshots</serverId>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 183a6184..b9fec533 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -28,8 +28,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.12.1</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
+    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
+    <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.3.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <id>default</id>
@@ -177,7 +177,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.4</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -191,7 +191,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
+            <version>1.7.0</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>sonatype-nexus-snapshots</serverId>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 054af20e..a4c6820e 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 9a879c0c..7351b402 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>com.ryanharter.auto.value</groupId>
@@ -86,24 +86,24 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>1.10.4</version>
+      <version>1.11.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>1.10.4</version>
+      <version>1.11.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.10.0</version>
+      <version>5.12.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -139,19 +139,19 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.53.v20231009</version>
+      <version>9.4.54.v20240208</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -160,7 +160,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifest>
@@ -174,7 +174,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.6.0</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
index 2b7211c9..87b9bd31 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutorTest.java
@@ -2,7 +2,6 @@
 
 import static com.google.cloud.functions.invoker.BackgroundFunctionExecutor.backgroundFunctionTypeArgument;
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
 
 import com.google.cloud.functions.BackgroundFunction;
 import com.google.cloud.functions.Context;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java
index 969d1dcc..668d60c8 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/TypedFunctionExecutorTest.java
@@ -1,7 +1,6 @@
 package com.google.cloud.functions.invoker;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
 
 import com.google.cloud.functions.TypedFunction;
 import org.junit.Test;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
index e52ec62a..e0ca4675 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
@@ -15,7 +15,6 @@
 package com.google.cloud.functions.invoker.http;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth8.assertThat;
 import static org.junit.Assert.fail;
 
 import com.google.cloud.functions.HttpRequest;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
index b3569e4e..c1a7ca29 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
@@ -2,7 +2,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
-import static com.google.common.truth.Truth8.assertThat;
 import static java.util.stream.Collectors.joining;
 
 import java.io.ByteArrayOutputStream;
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b9b94e60..f23ff693 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -67,7 +67,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.0</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.6.3</version>
+            <version>3.7.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -93,7 +93,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.1.0</version>
+            <version>3.2.4</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -107,7 +107,7 @@
           <plugin>
             <groupId>org.sonatype.plugins</groupId>
             <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.13</version>
+            <version>1.7.0</version>
             <extensions>true</extensions>
             <configuration>
               <serverId>sonatype-nexus-snapshots</serverId>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 6958ad2d..7160841b 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.10.1</version>
+      <version>2.11.0</version>
     </dependency>
   </dependencies>
 
@@ -44,7 +44,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>3.4.2</version>
         <configuration>
           <archive>
             <manifest>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.1.2</version>
         <configuration>
           <skip>true</skip>
         </configuration>

From c3a3161204707e0952e0de9df53044bcf42d893b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 21 Jun 2024 03:08:21 +0200
Subject: [PATCH 202/308] chore(deps): update
 googlecloudplatform/functions-framework-conformance digest to 1041a97 (#263)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 .github/workflows/conformance.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index c914263e..b58ae762 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -53,7 +53,7 @@ jobs:
       run: (cd function-maven-plugin/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
       with:
         functionType: 'http'
         useBuildpacks: false
@@ -61,7 +61,7 @@ jobs:
         startDelay: 10
 
     - name: Run Typed conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
       with:
         functionType: 'http'
         declarativeType: 'typed'
@@ -70,7 +70,7 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
       with:
         functionType: 'legacyevent'
         useBuildpacks: false
@@ -79,7 +79,7 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
@@ -88,7 +88,7 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@72a4f36b10f1c6435ab1a86a9ea24bda464cc262 # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
       with:
         functionType: 'http'
         useBuildpacks: false

From 2e823c62876b3b26b1e9704b47cf852e2e32e2e0 Mon Sep 17 00:00:00 2001
From: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Date: Thu, 27 Jun 2024 08:49:26 -0700
Subject: [PATCH 203/308] fix: update scorecard.yml (#276)

---
 .github/workflows/scorecard.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 728eb127..74ce67bb 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -32,6 +32,7 @@ jobs:
           egress-policy: block
           allowed-endpoints: >
             api.osv.dev:443
+            api.scorecard.dev:443
             api.securityscorecards.dev:443
             auth.docker.io:443
             bestpractices.coreinfrastructure.org:443

From 7e4ca5d15d5b200787b999f82da6d6cd1cbd4b7e Mon Sep 17 00:00:00 2001
From: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Date: Thu, 27 Jun 2024 11:02:37 -0700
Subject: [PATCH 204/308] fix: release 1.1.1 (#277)

Release-As: 1.1.1
---
 functions-framework-api/CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index 1ab28e74..469c198b 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -11,3 +11,4 @@
 ### Bug Fixes
 
 * remove warnings from mvn install ([#66](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/66)) ([270f4ec](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/270f4ec7936239eff9c00b8d3ff0f09a8615b9c9))
+

From cb4d76dd384d076f66c10fa5fdb151e556369cd7 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 11:30:18 -0700
Subject: [PATCH 205/308] chore(main): release functions-framework-api 1.1.1
 (#278)

* chore(main): release functions-framework-api 1.1.1

* Update CHANGELOG.md

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 functions-framework-api/CHANGELOG.md  | 8 +++++++-
 functions-framework-api/pom.xml       | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index c2ee81e0..efcd0568 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.0","invoker":"1.3.1","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.1","invoker":"1.3.1","function-maven-plugin":"0.11.0"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index 469c198b..e999fd1d 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.1.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.0...functions-framework-api-v1.1.1) (2024-06-27)
+
+
+### Bug Fixes
+
+* release 1.1.1; this updates transitive dependencies on jackson ([#277](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/277)) ([7e4ca5d](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/7e4ca5d15d5b200787b999f82da6d6cd1cbd4b7e))
+
 ## [1.1.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.0.4...functions-framework-api-v1.1.0) (2023-05-31)
 
 
@@ -11,4 +18,3 @@
 ### Bug Fixes
 
 * remove warnings from mvn install ([#66](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/66)) ([270f4ec](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/270f4ec7936239eff9c00b8d3ff0f09a8615b9c9))
-
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index b9fec533..576df30c 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.1</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From dc9bc1f03c90a60e8007bc4f61f78ade61d97817 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 13:52:52 -0700
Subject: [PATCH 206/308] chore(main): release functions-framework-api
 1.1.2-SNAPSHOT (#279)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 576df30c..7c08e00f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.1</version>
+  <version>1.1.2-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 9e91f57b12d73c655e3d7e226d21d54ccec32b73 Mon Sep 17 00:00:00 2001
From: janell-chen <122311137+janell-chen@users.noreply.github.com>
Date: Mon, 8 Jul 2024 11:01:21 -0700
Subject: [PATCH 207/308] fix: server times out when specified by
 CLOUD_RUN_TIMEOUT_SECONDS (#275)

* fix: server times out when specified by CLOUD_RUN_TIMEOUT_SECONDS
---
 .../functions/invoker/http/TimeoutFilter.java | 71 +++++++++++++++++++
 .../functions/invoker/runner/Invoker.java     | 17 +++++
 .../functions/invoker/IntegrationTest.java    | 71 +++++++++++++++----
 .../invoker/testfunctions/TimeoutHttp.java    | 18 +++++
 4 files changed, 165 insertions(+), 12 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TimeoutHttp.java

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java
new file mode 100644
index 00000000..e0577f9b
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java
@@ -0,0 +1,71 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker.http;
+
+import java.io.IOException;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.logging.Logger;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletResponse;
+
+public class TimeoutFilter implements Filter {
+
+  private static final Logger logger = Logger.getLogger(TimeoutFilter.class.getName());
+  private final int timeoutMs;
+
+  public TimeoutFilter(int timeoutSeconds) {
+    this.timeoutMs = timeoutSeconds * 1000; // Convert seconds to milliseconds
+  }
+
+  @Override
+  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+      throws IOException, ServletException {
+    Timer timer = new Timer(true);
+    TimerTask timeoutTask =
+        new TimerTask() {
+          @Override
+          public void run() {
+            if (response instanceof HttpServletResponse) {
+              try {
+                ((HttpServletResponse) response)
+                    .sendError(HttpServletResponse.SC_REQUEST_TIMEOUT, "Request timed out");
+              } catch (IOException e) {
+                logger.warning("Error while sending HTTP response: " + e.toString());
+              }
+            } else {
+              try {
+                response.getWriter().write("Request timed out");
+              } catch (IOException e) {
+                logger.warning("Error while writing response: " + e.toString());
+              }
+            }
+          }
+        };
+
+    timer.schedule(timeoutTask, timeoutMs);
+
+    try {
+      chain.doFilter(request, response);
+      timeoutTask.cancel();
+    } finally {
+      timer.purge();
+    }
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 892d6038..da5e72ec 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -25,6 +25,7 @@
 import com.google.cloud.functions.invoker.HttpFunctionExecutor;
 import com.google.cloud.functions.invoker.TypedFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
+import com.google.cloud.functions.invoker.http.TimeoutFilter;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -38,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -48,6 +50,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
+import javax.servlet.DispatcherType;
 import javax.servlet.MultipartConfigElement;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
@@ -59,6 +62,7 @@
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.server.handler.HandlerWrapper;
+import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
@@ -324,6 +328,7 @@ private void startServer(boolean join) throws Exception {
     ServletHolder servletHolder = new ServletHolder(servlet);
     servletHolder.getRegistration().setMultipartConfig(new MultipartConfigElement(""));
     servletContextHandler.addServlet(servletHolder, "/*");
+    servletContextHandler = addTimerFilterForRequestTimeout(servletContextHandler);
 
     server.start();
     logServerInfo();
@@ -393,6 +398,18 @@ private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     throw new RuntimeException(error);
   }
 
+  private ServletContextHandler addTimerFilterForRequestTimeout(
+      ServletContextHandler servletContextHandler) {
+    String timeoutSeconds = System.getenv("CLOUD_RUN_TIMEOUT_SECONDS");
+    if (timeoutSeconds == null) {
+      return servletContextHandler;
+    }
+    int seconds = Integer.parseInt(timeoutSeconds);
+    FilterHolder holder = new FilterHolder(new TimeoutFilter(seconds));
+    servletContextHandler.addFilter(holder, "/*", EnumSet.of(DispatcherType.REQUEST));
+    return servletContextHandler;
+  }
+
   static URL[] classpathToUrls(String classpath) {
     String[] components = classpath.split(File.pathSeparator);
     List<URL> urls = new ArrayList<>();
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 3f3de837..82197547 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -51,6 +51,7 @@
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -252,6 +253,34 @@ public void helloWorld() throws Exception {
             ROBOTS_TXT_TEST_CASE));
   }
 
+  @Test
+  public void timeoutHttpSuccess() throws Exception {
+    testFunction(
+        SignatureType.HTTP,
+        fullTarget("TimeoutHttp"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setExpectedResponseText("finished\n")
+                .setExpectedResponseText(Optional.empty())
+                .build()),
+        ImmutableMap.of("CLOUD_RUN_TIMEOUT_SECONDS", "3"));
+  }
+
+  @Test
+  public void timeoutHttpTimesOut() throws Exception {
+    testFunction(
+        SignatureType.HTTP,
+        fullTarget("TimeoutHttp"),
+        ImmutableList.of(),
+        ImmutableList.of(
+            TestCase.builder()
+                .setExpectedResponseCode(408)
+                .setExpectedResponseText(Optional.empty())
+                .build()),
+        ImmutableMap.of("CLOUD_RUN_TIMEOUT_SECONDS", "1"));
+  }
+
   @Test
   public void exceptionHttp() throws Exception {
     String exceptionExpectedOutput =
@@ -290,7 +319,8 @@ public void exceptionBackground() throws Exception {
                 .setRequestText(gcfRequestText)
                 .setExpectedResponseCode(500)
                 .setExpectedOutput(exceptionExpectedOutput)
-                .build()));
+                .build()),
+        Collections.emptyMap());
   }
 
   @Test
@@ -400,7 +430,8 @@ public void typedFunction() throws Exception {
             TestCase.builder()
                 .setRequestText(originalJson)
                 .setExpectedResponseText("{\"fullName\":\"JohnDoe\"}")
-                .build()));
+                .build()),
+        Collections.emptyMap());
   }
 
   @Test
@@ -410,7 +441,8 @@ public void typedVoidFunction() throws Exception {
         fullTarget("TypedVoid"),
         ImmutableList.of(),
         ImmutableList.of(
-            TestCase.builder().setRequestText("{}").setExpectedResponseCode(204).build()));
+            TestCase.builder().setRequestText("{}").setExpectedResponseCode(204).build()),
+        Collections.emptyMap());
   }
 
   @Test
@@ -424,7 +456,8 @@ public void typedCustomFormat() throws Exception {
                 .setRequestText("abc\n123\n$#@\n")
                 .setExpectedResponseText("abc123$#@")
                 .setExpectedResponseCode(200)
-                .build()));
+                .build()),
+        Collections.emptyMap());
   }
 
   private void backgroundTest(String target) throws Exception {
@@ -595,7 +628,8 @@ public void classpathOptionHttp() throws Exception {
         SignatureType.HTTP,
         "com.example.functionjar.Foreground",
         ImmutableList.of("--classpath", functionJarString()),
-        ImmutableList.of(testCase));
+        ImmutableList.of(testCase),
+        Collections.emptyMap());
   }
 
   /** Like {@link #classpathOptionHttp} but for background functions. */
@@ -612,7 +646,8 @@ public void classpathOptionBackground() throws Exception {
         SignatureType.BACKGROUND,
         "com.example.functionjar.Background",
         ImmutableList.of("--classpath", functionJarString()),
-        ImmutableList.of(TestCase.builder().setRequestText(json.toString()).build()));
+        ImmutableList.of(TestCase.builder().setRequestText(json.toString()).build()),
+        Collections.emptyMap());
   }
 
   /** Like {@link #classpathOptionHttp} but for typed functions. */
@@ -629,7 +664,8 @@ public void classpathOptionTyped() throws Exception {
             TestCase.builder()
                 .setRequestText(originalJson)
                 .setExpectedResponseText("{\"fullName\":\"JohnDoe\"}")
-                .build()));
+                .build()),
+        Collections.emptyMap());
   }
 
   // In these tests, we test a number of different functions that express the same functionality
@@ -643,7 +679,12 @@ private void backgroundTest(
     for (TestCase testCase : testCases) {
       File snoopFile = testCase.snoopFile().get();
       snoopFile.delete();
-      testFunction(signatureType, functionTarget, ImmutableList.of(), ImmutableList.of(testCase));
+      testFunction(
+          signatureType,
+          functionTarget,
+          ImmutableList.of(),
+          ImmutableList.of(testCase),
+          Collections.emptyMap());
       String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
       Gson gson = new Gson();
       JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
@@ -667,16 +708,18 @@ private void checkSnoopFile(TestCase testCase) throws IOException {
   }
 
   private void testHttpFunction(String target, List<TestCase> testCases) throws Exception {
-    testFunction(SignatureType.HTTP, target, ImmutableList.of(), testCases);
+    testFunction(SignatureType.HTTP, target, ImmutableList.of(), testCases, Collections.emptyMap());
   }
 
   private void testFunction(
       SignatureType signatureType,
       String target,
       ImmutableList<String> extraArgs,
-      List<TestCase> testCases)
+      List<TestCase> testCases,
+      Map<String, String> environmentVariables)
       throws Exception {
-    ServerProcess serverProcess = startServer(signatureType, target, extraArgs);
+    ServerProcess serverProcess =
+        startServer(signatureType, target, extraArgs, environmentVariables);
     try {
       HttpClient httpClient = new HttpClient();
       httpClient.start();
@@ -772,7 +815,10 @@ public void close() {
   }
 
   private ServerProcess startServer(
-      SignatureType signatureType, String target, ImmutableList<String> extraArgs)
+      SignatureType signatureType,
+      String target,
+      ImmutableList<String> extraArgs,
+      Map<String, String> environmentVariables)
       throws IOException, InterruptedException {
     File javaHome = new File(System.getProperty("java.home"));
     assertThat(javaHome.exists()).isTrue();
@@ -798,6 +844,7 @@ private ServerProcess startServer(
             "FUNCTION_TARGET",
             target);
     processBuilder.environment().putAll(environment);
+    processBuilder.environment().putAll(environmentVariables);
     Process serverProcess = processBuilder.start();
     CountDownLatch ready = new CountDownLatch(1);
     StringBuilder output = new StringBuilder();
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TimeoutHttp.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TimeoutHttp.java
new file mode 100644
index 00000000..c73e52d2
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/TimeoutHttp.java
@@ -0,0 +1,18 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+
+public class TimeoutHttp implements HttpFunction {
+
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws Exception {
+    try {
+      Thread.sleep(2000);
+    } catch (InterruptedException e) {
+      response.getWriter().close();
+    }
+    response.getWriter().write("finished\n");
+  }
+}

From b7a5d05f4ee362508a546c906bfa1a3c44d93d7f Mon Sep 17 00:00:00 2001
From: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Date: Wed, 18 Sep 2024 09:00:38 -0700
Subject: [PATCH 208/308] chore: Update blunderbuss.yml (#286)

---
 .github/blunderbuss.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 8b137891..2dfa51ed 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1 +1,10 @@
+assign_prs:
+  - HKwinterhalter
+  - dixuswe
+  - janell-chen
 
+assign_issues:
+  - HKwinterhalter
+  - dixuswe
+  - janell-chen
+  

From 023ceff31315e324a38a1782e5d7fcae6b00131d Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 28 Sep 2024 01:10:22 +0200
Subject: [PATCH 209/308] chore(deps): update dependency
 io.cloudevents:cloudevents-json-jackson to v4 (#285)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/conformance/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index a4c6820e..4ff8fa05 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -43,7 +43,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-json-jackson</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.1</version>
     </dependency>
   </dependencies>
 

From fe6da26cd9af4ceb0efab92609fcae5921720525 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 28 Sep 2024 01:10:32 +0200
Subject: [PATCH 210/308] chore(deps): update cloudevents.sdk.version to v4
 (#282)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/core/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 7351b402..64e2fe24 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -22,7 +22,7 @@
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
-    <cloudevents.sdk.version>3.0.0</cloudevents.sdk.version>
+    <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
   </properties>
 
   <licenses>

From fd33779cc8633a3d09ecee99ca20a624f0efc676 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 28 Sep 2024 01:10:42 +0200
Subject: [PATCH 211/308] chore(deps): update dependency
 io.cloudevents:cloudevents-core to v4 (#284)

Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 invoker/conformance/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 4ff8fa05..d94dbf8a 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -38,7 +38,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.1</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>

From 744996348029857d7054753b83a62f172e8fa5e5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 28 Sep 2024 01:11:10 +0200
Subject: [PATCH 212/308] chore(deps): update all non-major dependencies (#280)

---
 .github/workflows/codeql.yml       |  8 ++++----
 .github/workflows/conformance.yaml |  8 ++++----
 .github/workflows/lint.yaml        | 10 +++++-----
 .github/workflows/scorecard.yml    |  8 ++++----
 .github/workflows/unit.yaml        |  6 +++---
 function-maven-plugin/pom.xml      | 16 ++++++++--------
 functions-framework-api/pom.xml    |  6 +++---
 invoker/core/pom.xml               | 12 ++++++------
 invoker/pom.xml                    |  4 ++--
 invoker/testfunction/pom.xml       |  4 ++--
 10 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a974e193..518a5853 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -42,11 +42,11 @@ jobs:
           uploads.github.com:443
           
     - name: Checkout repository
-      uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+      uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+      uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index b58ae762..1745c330 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -30,16 +30,16 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
+      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
       with:
         go-version: '1.21'
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index a712703e..7b32858c 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         disable-sudo: true
         egress-policy: block
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 # v2 minimum required
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 74ce67bb..c90435f2 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -45,12 +45,12 @@ jobs:
             *.github.com:443
           
       - name: "Checkout code"
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@dc50aa9510b46c811795eb24b2f1ba02a914e534 # v2.3.3
+        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3.25.10
+        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 64821a08..c970fd3e 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@17d0e2bd7d51742c71671bd19fa12bdc9d40a3d6 # v2.8.1
+      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -28,9 +28,9 @@ jobs:
           repo.maven.apache.org:443
           api.adoptium.net:443
           *.githubusercontent.com:443
-    - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
+      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index ac6c3552..bab9524c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -41,17 +41,17 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.8</version>
+      <version>3.9.9</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.8</version>
+      <version>3.9.9</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.13.1</version>
+      <version>3.15.0</version>
       <scope>provided</scope>
     </dependency>
 
@@ -64,14 +64,14 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.8.0</version>
+      <version>2.8.1</version>
       <type>jar</type>
     </dependency>
 
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.13.1</version>
+        <version>3.15.0</version>
         <executions>
           <execution>
             <id>help-goal</id>
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.7.0</version>
+            <version>3.10.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -145,7 +145,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.4</version>
+            <version>3.2.7</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 7c08e00f..603b7c72 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+    <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.1.1</version>
         <executions>
           <execution>
             <id>default</id>
@@ -177,7 +177,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.4</version>
+            <version>3.2.7</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 64e2fe24..4202e33c 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -98,12 +98,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.54.v20240208</version>
+      <version>9.4.56.v20240826</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.54.v20240208</version>
+      <version>9.4.56.v20240826</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.12.0</version>
+      <version>5.14.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -139,19 +139,19 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.54.v20240208</version>
+      <version>9.4.56.v20240826</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index f23ff693..c0432cf8 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.7.0</version>
+            <version>3.10.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -93,7 +93,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.4</version>
+            <version>3.2.7</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 7160841b..c90f121f 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.2.1-jre</version>
+      <version>33.3.1-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
         <configuration>
           <skip>true</skip>
         </configuration>

From 34b763ef9bc68b962876fc47be4885354a0a5ca1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 28 Sep 2024 01:14:22 +0200
Subject: [PATCH 213/308] chore(deps): update dependency
 io.cloudevents:cloudevents-api to v4 (#283)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [io.cloudevents:cloudevents-api](https://cloudevents.github.io/sdk-java/) ([source](https://redirect.github.com/cloudevents/sdk-java)) | `3.0.0` -> `4.0.1` | [![age](https://developer.mend.io/api/mc/badges/age/maven/io.cloudevents:cloudevents-api/4.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/maven/io.cloudevents:cloudevents-api/4.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/maven/io.cloudevents:cloudevents-api/3.0.0/4.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/maven/io.cloudevents:cloudevents-api/3.0.0/4.0.1?slim=true)](https://docs.renovatebot.com/merge-confidence/) |

---

> [!WARNING]
> Some dependencies could not be looked up. Check the warning logs for more information.

---

### Release Notes

<details>
<summary>cloudevents/sdk-java (io.cloudevents:cloudevents-api)</summary>

### [`v4.0.1`](https://redirect.github.com/cloudevents/sdk-java/releases/tag/v4.0.1)

[Compare Source](https://redirect.github.com/cloudevents/sdk-java/compare/v4.0.0...v4.0.1)

#### What's Changed

-   \[4.0] Make CloudEventValidatorProvider thread safe ([#&#8203;650](https://redirect.github.com/cloudevents/sdk-java/issues/650)) by [@&#8203;pierDipi](https://redirect.github.com/pierDipi) in [https://togithub.com/cloudevents/sdk-java/pull/651](https://redirect.github.com/cloudevents/sdk-java/pull/651)

**Full Changelog**: https://togithub.com/cloudevents/sdk-java/compare/v4.0.0...v4.0.1

### [`v4.0.0`](https://redirect.github.com/cloudevents/sdk-java/releases/tag/v4.0.0)

[Compare Source](https://redirect.github.com/cloudevents/sdk-java/compare/3.0.0...v4.0.0)

#### What's Changed

-   Support CloudEvents SQL v1 (CE SQL) by [@&#8203;Cali0707](https://redirect.github.com/Cali0707) in [https://togithub.com/cloudevents/sdk-java/pull/641](https://redirect.github.com/cloudevents/sdk-java/pull/641)
-   doc: update & uniformize package version by [@&#8203;BoboTiG](https://redirect.github.com/BoboTiG) in [https://togithub.com/cloudevents/sdk-java/pull/640](https://redirect.github.com/cloudevents/sdk-java/pull/640)
-   fix: invalid automatic module name by [@&#8203;Jummartinezro](https://redirect.github.com/Jummartinezro) in [https://togithub.com/cloudevents/sdk-java/pull/639](https://redirect.github.com/cloudevents/sdk-java/pull/639)
-   Bump io.vertx:vertx-core from 4.3.7 to 4.5.3 in /http/vertx by [@&#8203;dependabot](https://redirect.github.com/dependabot) in [https://togithub.com/cloudevents/sdk-java/pull/622](https://redirect.github.com/cloudevents/sdk-java/pull/622)
-   Bump nokogiri from 1.16.3 to 1.16.5 in /docs by [@&#8203;dependabot](https://redirect.github.com/dependabot) in [https://togithub.com/cloudevents/sdk-java/pull/632](https://redirect.github.com/cloudevents/sdk-java/pull/632)
-   Bump org.xmlunit:xmlunit-core from 2.9.0 to 2.10.0 in /formats/xml by [@&#8203;dependabot](https://redirect.github.com/dependabot) in [https://togithub.com/cloudevents/sdk-java/pull/631](https://redirect.github.com/cloudevents/sdk-java/pull/631)

#### New Contributors

-   [@&#8203;BoboTiG](https://redirect.github.com/BoboTiG) made their first contribution in [https://togithub.com/cloudevents/sdk-java/pull/640](https://redirect.github.com/cloudevents/sdk-java/pull/640)
-   [@&#8203;Jummartinezro](https://redirect.github.com/Jummartinezro) made their first contribution in [https://togithub.com/cloudevents/sdk-java/pull/639](https://redirect.github.com/cloudevents/sdk-java/pull/639)

**Full Changelog**: https://togithub.com/cloudevents/sdk-java/compare/3.0.0...v4.0.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on the first day of the month" (UTC), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR was generated by [Mend Renovate](https://mend.io/renovate/). View the [repository job log](https://developer.mend.io/github/GoogleCloudPlatform/functions-framework-java).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM4LjU5LjIiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbXX0=-->
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 603b7c72..3b87a18d 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.1</version>
     </dependency>
   </dependencies>
 

From f8c1d575660312101532a1f579c0492593248f37 Mon Sep 17 00:00:00 2001
From: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:18:22 -0700
Subject: [PATCH 214/308] fix: use a version of maven-source-plugin that's
 available in mavencentral (#288)

---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 3b87a18d..31d5c735 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.6.0</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>

From f82b70174513edf3e21752aa4739e3b6636e0604 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:31:42 -0700
Subject: [PATCH 215/308] chore(main): release java-function-invoker 1.3.2
 (#240)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 9 +++++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index efcd0568..3c2d06fd 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.1","invoker":"1.3.1","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.1","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 2800c114..c9661841 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [1.3.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.1...java-function-invoker-v1.3.2) (2024-09-18)
+
+
+### Bug Fixes
+
+* avoid executing function when /favicon.ico or /robots.txt is called ([#226](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/226)) ([fca8676](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/fca867667db593699193da01b69a4cca7ca48fc8))
+* server times out when specified by CLOUD_RUN_TIMEOUT_SECONDS ([#275](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/275)) ([9e91f57](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/9e91f57b12d73c655e3d7e226d21d54ccec32b73))
+* set Thread Context ClassLoader correctly when invoking handler constructor ([#239](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/239)) ([9f7155b](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/9f7155b77574ec980ecf9e6dffbd2ee0398db8a7))
+
 ## [1.3.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.0...java-function-invoker-v1.3.1) (2023-09-13)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index d94dbf8a..d4f41397 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.2</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 4202e33c..b2de93e5 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.2</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.2-SNAPSHOT</version>
+      <version>1.3.2</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index c0432cf8..6b61101a 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.2</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index c90f121f..152d8f94 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.2-SNAPSHOT</version>
+    <version>1.3.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.2-SNAPSHOT</version>
+  <version>1.3.2</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From ec709f645c92a48a4db887b3b3ccd6d1354c7b4b Mon Sep 17 00:00:00 2001
From: Jeremy Fehr <117788025+jrmfg@users.noreply.github.com>
Date: Fri, 27 Sep 2024 16:47:44 -0700
Subject: [PATCH 216/308] fix: update readme with newer versions (and release
 1.1.2) (#289)

---
 README.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index e4c543a4..4b4da494 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ that supports Maven to create the Maven project. Add this dependency in the
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.0.4</version>
+      <version>1.1.2</version>
       <scope>provided</scope>
     </dependency>
 ```
@@ -51,7 +51,7 @@ Framework dependency in your `build.gradle` project file as follows:
 
 ```groovy
     dependencies {
-        implementation 'com.google.cloud.functions:functions-framework-api:1.0.4'
+        implementation 'com.google.cloud.functions:functions-framework-api:1.1.2'
     }
 
 ```
@@ -188,7 +188,7 @@ Copy the Functions Framework jar to a local location like this:
 
 ```sh
 mvn dependency:copy \
-    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.1.1' \
+    -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.3.2' \
     -DoutputDirectory=.
 ```
 
@@ -196,7 +196,7 @@ In this example we use the current directory `.` but you can specify any other
 directory to copy to. Then run your function:
 
 ```sh
-java -jar java-function-invoker-1.1.1 \
+java -jar java-function-invoker-1.3.2 \
     --classpath myfunction.jar \
     --target com.example.HelloWorld
 ```
@@ -215,8 +215,8 @@ configurations {
 }
 
 dependencies {
-    implementation 'com.google.cloud.functions:functions-framework-api:1.0.4'
-    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.1.1'
+    implementation 'com.google.cloud.functions:functions-framework-api:1.1.2'
+    invoker 'com.google.cloud.functions.invoker:java-function-invoker:1.3.2'
 }
 
 tasks.register("runFunction", JavaExec) {
@@ -289,7 +289,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
 and its dependencies. For example:
 
 ```
-java -jar java-function-invoker-1.1.1 \
+java -jar java-function-invoker-1.3.2 \
     --classpath 'myfunction.jar:/some/directory:/some/library/*' \
     --target com.example.HelloWorld
 ```

From 478e5834d93d595f5650bf46909ad86945d20578 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:02:26 -0700
Subject: [PATCH 217/308] chore(main): release functions-framework-api 1.1.2
 (#290)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 functions-framework-api/CHANGELOG.md  | 7 +++++++
 functions-framework-api/pom.xml       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 3c2d06fd..85061204 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.1","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.2","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index e999fd1d..7b57f5b6 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.1.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.1...functions-framework-api-v1.1.2) (2024-09-27)
+
+
+### Bug Fixes
+
+* use a version of maven-source-plugin that's available in mavencentral ([#288](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/288)) ([f8c1d57](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/f8c1d575660312101532a1f579c0492593248f37))
+
 ## [1.1.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.0...functions-framework-api-v1.1.1) (2024-06-27)
 
 
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 31d5c735..bd040f3f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
+  <version>1.1.2</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From b199dcb587c390ef00ff40be60d4d2f45a88c222 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:03:23 -0700
Subject: [PATCH 218/308] chore(main): release java-function-invoker
 1.3.3-SNAPSHOT (#291)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index d4f41397..f2ffd4ec 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.2</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index b2de93e5..ab455d4a 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.2</version>
+      <version>1.3.3-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 6b61101a..ff2966e1 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 152d8f94..2713b478 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.2</version>
+    <version>1.3.3-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.2</version>
+  <version>1.3.3-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From a39c77318cf59ab1c3b358d07e4e8697594664ec Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 27 Sep 2024 17:09:28 -0700
Subject: [PATCH 219/308] chore(main): release functions-framework-api
 1.1.3-SNAPSHOT (#292)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index bd040f3f..a4804766 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.2</version>
+  <version>1.1.3-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From a8a8cad4d9d0a5f7ed71349b2fc36945c3ea0a0a Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Fri, 4 Oct 2024 13:20:27 -0700
Subject: [PATCH 220/308] fix: update Maven version on Kokoro cluster to fix
 release pipeline (#294)

* update Maven version on Kokoro cluster to fix release pipeline

* fix: update Maven version on Kokoro cluster to fix release pipeline
---
 .kokoro/release.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 0a599f31..6bbb8455 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -3,6 +3,16 @@
 # Stop execution when any command fails.
 set -e
 
+# update the Maven version to 3.6.3
+pushd /usr/local
+wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz
+tar -xvzf apache-maven-3.6.3-bin.tar.gz apache-maven-3.6.3
+rm -f /usr/local/apache-maven
+ln -s /usr/local/apache-maven-3.6.3 /usr/local/apache-maven
+rm apache-maven-3.6.3-bin.tar.gz
+popd
+
+
 # Get secrets from keystore and set and environment variables.
 setup_environment_secrets() {
   export GPG_TTY=$(tty)

From 346714a6162adc72fc0f2ae6a2337198742b2197 Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Fri, 4 Oct 2024 15:25:02 -0700
Subject: [PATCH 221/308] fix: update maven-source-plugin version (#295)

* update Maven version on Kokoro cluster to fix release pipeline

* fix: update Maven version on Kokoro cluster to fix release pipeline

* fix: update the dependecy version
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index a4804766..f6a0026c 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
+            <version>3.6.0</version>
             <executions>
               <execution>
                 <id>attach-sources</id>

From 8f1fd84ca4cc43b2e93b66fe160f78a868b55ffe Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:08:19 -0700
Subject: [PATCH 222/308] fix: revert maven-source-plugin to 3.2.1 (#297)

* update Maven version on Kokoro cluster to fix release pipeline

* fix: update Maven version on Kokoro cluster to fix release pipeline

* fix: update the dependecy version

* fix: revert maven-javadoc-plugin to 3.2.1
---
 functions-framework-api/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index f6a0026c..b7f60a7c 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.6.0</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>

From f909f73652c338493162a92371255f3f8267fa21 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:31:52 -0700
Subject: [PATCH 223/308] chore(main): release functions-framework-api 1.1.3
 (#296)

* chore(main): release functions-framework-api 1.1.3

* Update CHANGELOG.md

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: dixuswe <152918466+dixuswe@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 functions-framework-api/CHANGELOG.md  | 7 +++++++
 functions-framework-api/pom.xml       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 85061204..e6849dfb 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.2","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.3","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index 7b57f5b6..497626cf 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.1.3](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.2...functions-framework-api-v1.1.3) (2024-10-05)
+
+
+### Bug Fixes
+
+* revert maven-source-plugin to 3.2.1 ([#297](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/297)) ([8f1fd84](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/8f1fd84ca4cc43b2e93b66fe160f78a868b55ffe))
+
 ## [1.1.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.1...functions-framework-api-v1.1.2) (2024-09-27)
 
 
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index b7f60a7c..43b48830 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.3-SNAPSHOT</version>
+  <version>1.1.3</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 066c29e3030a6ff6efa50d2f288bba44e6366738 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 4 Oct 2024 17:38:23 -0700
Subject: [PATCH 224/308] chore(main): release functions-framework-api
 1.1.4-SNAPSHOT (#298)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 43b48830..dd25d18d 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.3</version>
+  <version>1.1.4-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From c622da956f44be5148cc2aec171a61e4b0f27f1e Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Tue, 19 Nov 2024 15:03:50 -0800
Subject: [PATCH 225/308] fix: update builder image url to correct project
 repository (#299)

* fix: update builder image url to correct project repository

the gcr.io/gae-runtimes project is no longer supported, which is causing integration tests to fail in this repo. serverless-runtimes should be used instead.
---
 .github/workflows/buildpack-integration-test.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 2c320a6e..41182ce3 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -24,7 +24,7 @@ jobs:
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java11'
       builder-runtime-version: '11'
-      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
+      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
     with:
@@ -35,4 +35,4 @@ jobs:
       prerun: 'invoker/conformance/prerun.sh'
       builder-runtime: 'java17'
       builder-runtime-version: '17'
-      builder-url: gcr.io/gae-runtimes/buildpacks/google-gae-22/java/builder:latest
+      builder-url: gcr.io/serverless-runtimes/google-22-full/builder/java:latest

From ab539e82c6394c64f2dfd1e35e2870cc3dbcb67e Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 20 Nov 2024 00:13:36 +0100
Subject: [PATCH 226/308] chore(deps): update all non-major dependencies (#293)

Co-authored-by: HKWinterhalter <HansWinterhalter@gmail.com>
---
 .github/workflows/codeql.yml       |  8 ++++----
 .github/workflows/conformance.yaml |  8 ++++----
 .github/workflows/lint.yaml        | 10 +++++-----
 .github/workflows/scorecard.yml    |  6 +++---
 .github/workflows/unit.yaml        |  6 +++---
 function-maven-plugin/pom.xml      |  6 +++---
 functions-framework-api/pom.xml    |  6 +++---
 invoker/core/pom.xml               |  2 +-
 invoker/pom.xml                    |  2 +-
 9 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 518a5853..ec4e95c0 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
       with:
         disable-sudo: true
         egress-policy: block
@@ -42,11 +42,11 @@ jobs:
           uploads.github.com:443
           
     - name: Checkout repository
-      uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+      uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+      uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 1745c330..2391a71f 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
       with:
         disable-sudo: true
         egress-policy: block
@@ -30,16 +30,16 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
+      uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
       with:
         go-version: '1.21'
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 7b32858c..0ed43ead 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
       with:
         disable-sudo: true
         egress-policy: block
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,11 +38,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0 # v2 minimum required
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # v2 minimum required
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index c90435f2..5d49971e 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
         with:
           disable-sudo: true
           egress-policy: block
@@ -45,7 +45,7 @@ jobs:
             *.github.com:443
           
       - name: "Checkout code"
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
 
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@461ef6c76dfe95d5c364de2f431ddbd31a417628 # v3.26.9
+        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index c970fd3e..1767bb9f 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@91182cccc01eb5e619899d80e4e971d6181294a7 # v2.10.1
+      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
       with:
         disable-sudo: true
         egress-policy: block
@@ -28,9 +28,9 @@ jobs:
           repo.maven.apache.org:443
           api.adoptium.net:443
           *.githubusercontent.com:443
-    - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.4.0
+      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index bab9524c..c78f0265 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -51,7 +51,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.15.0</version>
+      <version>3.15.1</version>
       <scope>provided</scope>
     </dependency>
 
@@ -87,7 +87,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.15.0</version>
+        <version>3.15.1</version>
         <executions>
           <execution>
             <id>help-goal</id>
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.10.0</version>
+            <version>3.11.1</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index dd25d18d..2b937978 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -29,7 +29,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
+    <maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>3.3.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
+            <version>3.3.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index ab455d4a..40837faa 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.14.0</version>
+      <version>5.14.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index ff2966e1..8d3182ae 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.10.0</version>
+            <version>3.11.1</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>

From d93ccf318b096d093c7095442260b3bfec45f8e0 Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Thu, 21 Nov 2024 15:45:59 -0800
Subject: [PATCH 227/308] fix: update lint to use JDK 17 so
 axel-op/googlejavaformat-action works (#301)

* fix: update lint to use JDK 17 so axel-op/googlejavaformat-action works
---
 .github/workflows/lint.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 0ed43ead..d1fb2a4b 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
-        java-version: 11.x
+        java-version: 17.x
         distribution: temurin
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)

From 09caeca002e74a92dbfce575b4bdd19da6bcab45 Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Thu, 21 Nov 2024 16:15:48 -0800
Subject: [PATCH 228/308] =?UTF-8?q?fix:=20update=20lint=20formatting=20to?=
 =?UTF-8?q?=20use=20JDK=2017=20so=20axel-op/googlejavaformat=E2=80=A6=20(#?=
 =?UTF-8?q?302)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: update lint formatting to use JDK 17 so axel-op/googlejavaformat-action works
---
 .github/workflows/lint.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index d1fb2a4b..59372931 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
       with:
-        java-version: 17.x
+        java-version: 11.x
         distribution: temurin
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
@@ -43,6 +43,11 @@ jobs:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # v2 minimum required
+      - name: Set up JDK
+        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+        with:
+          java-version: 17.x
+          distribution: temurin
       - name: Run formatter
         id: formatter
         uses: axel-op/googlejavaformat-action@dbff853fb823671ec5781365233bf86543b13215 # v3

From bcce78ed4959e6ec965ee42bc7840a775529b2f0 Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Thu, 21 Nov 2024 16:55:16 -0800
Subject: [PATCH 229/308] fix: update release pipeline to use maven token
 instead of user:password (#300)

---
 .kokoro/release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 6bbb8455..66ef1e6d 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -16,8 +16,8 @@ popd
 # Get secrets from keystore and set and environment variables.
 setup_environment_secrets() {
   export GPG_TTY=$(tty)
-  export SONATYPE_USERNAME=functions-framework-release-bot
-  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password)
+  export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f1 -d':')
+  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f2 -d':')
   export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
 
   # Add the key ring files to $GNUPGHOME to verify the GPG credentials.

From 2db9a2bec6ba93e7954e68c2301c5fc2fcc032d8 Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Fri, 22 Nov 2024 10:37:21 -0800
Subject: [PATCH 230/308] fix: revert maven-source-plugin to 3.2.1 (#303)

* fix: update release pipeline to use maven token instead of user:password

* fix:revert maven-source-plugin to 3.2.1
---
 function-maven-plugin/pom.xml   | 2 +-
 functions-framework-api/pom.xml | 2 +-
 invoker/pom.xml                 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index c78f0265..a48f544c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -119,7 +119,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 2b937978..51d6a67a 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -151,7 +151,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 8d3182ae..28992926 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -67,7 +67,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.1</version>
+            <version>3.2.1</version>
             <executions>
               <execution>
                 <id>attach-sources</id>
@@ -119,4 +119,4 @@
       </build>
     </profile>
   </profiles>
-</project>
\ No newline at end of file
+</project>

From 54180ada60ef776e1f720ff12cdf7a2978a8952e Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Fri, 22 Nov 2024 11:06:26 -0800
Subject: [PATCH 231/308] fix: print username for maven repo publish and revert
 maven-source-plugin to 3.2.1 (#307)

* fix: update release pipeline to use maven token instead of user:password

* fix:revert maven-source-plugin to 3.2.1

* fix: print username for maven repo publish and revert
maven-source-plugin to 3.2.1
---
 .kokoro/release.sh              | 1 +
 functions-framework-api/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 66ef1e6d..929f8ed1 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -19,6 +19,7 @@ setup_environment_secrets() {
   export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f1 -d':')
   export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f2 -d':')
   export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
+  echo $SONATYPE_USERNAME
 
   # Add the key ring files to $GNUPGHOME to verify the GPG credentials.
   export GNUPGHOME=/tmp/gpg
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 51d6a67a..8e792243 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -73,7 +73,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>

From 6d2fc846d78de346bafacbaa38587ba8bfc81e7b Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Fri, 22 Nov 2024 11:35:31 -0800
Subject: [PATCH 232/308] fix: remove print maven repo username (#308)

* fix: update release pipeline to use maven token instead of user:password

* fix:revert maven-source-plugin to 3.2.1

* fix: print username for maven repo publish and revert
maven-source-plugin to 3.2.1

* fix: remove print maven repo username

---------

Co-authored-by: HKWinterhalter <HansWinterhalter@gmail.com>
---
 .kokoro/release.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 929f8ed1..66ef1e6d 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -19,7 +19,6 @@ setup_environment_secrets() {
   export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f1 -d':')
   export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f2 -d':')
   export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
-  echo $SONATYPE_USERNAME
 
   # Add the key ring files to $GNUPGHOME to verify the GPG credentials.
   export GNUPGHOME=/tmp/gpg

From 150676451da73a9c697af21a3c914a6a32914043 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 15:39:09 -0800
Subject: [PATCH 233/308] chore(main): release functions-framework-api 1.1.4
 (#304)

* chore(main): release functions-framework-api 1.1.4

* Update CHANGELOG.md

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: dixuswe <152918466+dixuswe@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 functions-framework-api/CHANGELOG.md  | 7 +++++++
 functions-framework-api/pom.xml       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index e6849dfb..6f51842e 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.3","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.4","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index 497626cf..b97246fe 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.1.4](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.3...functions-framework-api-v1.1.4) (2024-11-22)
+
+
+### Bug Fixes
+
+* revert maven-source-plugin to 3.2.1 ([#303](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/303)) ([2db9a2b](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/2db9a2bec6ba93e7954e68c2301c5fc2fcc032d8))
+
 ## [1.1.3](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.2...functions-framework-api-v1.1.3) (2024-10-05)
 
 
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 8e792243..7bc776c4 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.4-SNAPSHOT</version>
+  <version>1.1.4</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From 32217a10fca464676c8dcc06f4453770debed8bc Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@gmail.com>
Date: Wed, 27 Nov 2024 12:44:19 -0500
Subject: [PATCH 234/308] ci: release-trigger.yml to specify multiScmName
 (#311)

This adjusts the release configuration to the recent infrastructure upgrade.
---
 .github/release-trigger.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/release-trigger.yml b/.github/release-trigger.yml
index 7fe36225..a97dad2f 100644
--- a/.github/release-trigger.yml
+++ b/.github/release-trigger.yml
@@ -1 +1,2 @@
-enabled: true
\ No newline at end of file
+enabled: true
+multiScmName: functions-framework-java

From 3fc0251ca1c0c00282f1bfc36ae4db962f481565 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 10:21:37 -0800
Subject: [PATCH 235/308] chore(main): release java-function-invoker 1.3.3
 (#306)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 6f51842e..421fba65 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.3.2","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.4","invoker":"1.3.3","function-maven-plugin":"0.11.0"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index c9661841..2ac0970a 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.3.3](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.2...java-function-invoker-v1.3.3) (2024-11-27)
+
+
+### Bug Fixes
+
+* revert maven-source-plugin to 3.2.1 ([#303](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/303)) ([2db9a2b](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/2db9a2bec6ba93e7954e68c2301c5fc2fcc032d8))
+
 ## [1.3.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.1...java-function-invoker-v1.3.2) (2024-09-18)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index f2ffd4ec..c3c41d4a 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.3</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 40837faa..3e231706 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.3</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.3-SNAPSHOT</version>
+      <version>1.3.3</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 28992926..80eebd42 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.3</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 2713b478..17d99019 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.3-SNAPSHOT</version>
+    <version>1.3.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.3-SNAPSHOT</version>
+  <version>1.3.3</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 7444fef44b860c416ad0e8f51773c58826a18bec Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Wed, 27 Nov 2024 13:56:51 -0800
Subject: [PATCH 236/308] fix: prevent maven-source-plugin from being
 automatically upgraded (#309)

---
 .github/renovate.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/renovate.json b/.github/renovate.json
index 7287767f..03752847 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,6 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["group:allNonMajor", "schedule:monthly"],
+  "ignoreDeps": ["org.apache.maven.plugins:maven-source-plugin"]
   "packageRules": [
     {
       "description": "Create a PR whenever there is a new major version",

From f2e3740eaea5c1e1a61d18619adfee429ce949c8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 27 Nov 2024 14:20:31 -0800
Subject: [PATCH 237/308] chore(main): release function-maven-plugin 0.11.1
 (#305)

* chore(main): release function-maven-plugin 0.11.1

* Remove SNAPSHOT from version in conformance pom.xml

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: dixuswe <152918466+dixuswe@users.noreply.github.com>
Co-authored-by: HKWinterhalter <HansWinterhalter@gmail.com>
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/CHANGELOG.md    | 7 +++++++
 function-maven-plugin/pom.xml         | 2 +-
 invoker/conformance/pom.xml           | 4 ++--
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 421fba65..ee718aed 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.3.3","function-maven-plugin":"0.11.0"}
+{"functions-framework-api":"1.1.4","invoker":"1.3.3","function-maven-plugin":"0.11.1"}
diff --git a/function-maven-plugin/CHANGELOG.md b/function-maven-plugin/CHANGELOG.md
index fc0c67b1..f1fbe49a 100644
--- a/function-maven-plugin/CHANGELOG.md
+++ b/function-maven-plugin/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.11.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.11.0...function-maven-plugin-v0.11.1) (2024-11-27)
+
+
+### Bug Fixes
+
+* revert maven-source-plugin to 3.2.1 ([#303](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/303)) ([2db9a2b](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/2db9a2bec6ba93e7954e68c2301c5fc2fcc032d8))
+
 ## [0.11.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.10.1...function-maven-plugin-v0.11.0) (2023-05-31)
 
 
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index a48f544c..aee89999 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.11.1-SNAPSHOT</version>
+  <version>0.11.1</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index c3c41d4a..9efbc40a 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -53,9 +53,9 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.11.1-SNAPSHOT</version>
+          <version>0.11.1</version>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
-</project>
\ No newline at end of file
+</project>

From d31b502fc019777a308ad694987c54fd6f6eb0a1 Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Mon, 2 Dec 2024 08:54:47 -0800
Subject: [PATCH 238/308] Fix: Update release-please-config to properly version
 bump functions-maven-plugin for invoker/conformance/pom.xml (#315)

* Update release-please-config.json

* fix: Update release-please-config to properly version bump functions-maven-plugin for invoker/conformance/pom.xml
---
 .github/release-please-config.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/release-please-config.json b/.github/release-please-config.json
index afc739a2..05f7dc1c 100644
--- a/.github/release-please-config.json
+++ b/.github/release-please-config.json
@@ -46,6 +46,11 @@
                     "path": "conformance/pom.xml",
                     "xpath": "//*[local-name()='artifactId' and text()='conformance']/parent::*/*[local-name()='version']"
                 },
+                {
+                    "type": "xml",
+                    "path": "conformance/pom.xml",
+                    "xpath": "//*[local-name()='artifactId' and text()='function-maven-plugin']/parent::*/*[local-name()='version']" 
+                },
                 {
                     "type": "xml",
                     "path": "testfunction/pom.xml",
@@ -70,4 +75,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}

From eaa846b66cffa5e29245090bf45912fdd42cad4a Mon Sep 17 00:00:00 2001
From: James Ma <jama.22@gmail.com>
Date: Tue, 3 Dec 2024 09:15:37 -0800
Subject: [PATCH 239/308] Update README.md (#316)

---
 README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 4b4da494..850b806c 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,13 @@
 ![Security Scorecard](https://api.securityscorecards.dev/projects/github.com/GoogleCloudPlatform/functions-framework-java/badge)
 
 An open source FaaS (Function as a service) framework for writing portable
-Java functions -- brought to you by the Google Cloud Functions team.
+Java functions.
 
 The Functions Framework lets you write lightweight functions that run in many
 different environments, including:
 
-*   [Google Cloud Functions](https://cloud.google.com/functions/)
+*   [Google Cloud Run functions](https://cloud.google.com/functions/)
 *   Your local development machine
-*   [Cloud Run](https://cloud.google.com/run/) and [Cloud Run for Anthos](https://cloud.google.com/anthos/run/)
 *   [Knative](https://github.com/knative/)-based environments
 
 ## Installation

From bb3d014eef2abef765740029bc31ab2c93c3a86f Mon Sep 17 00:00:00 2001
From: dixuswe <152918466+dixuswe@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:29:49 -0800
Subject: [PATCH 240/308] fix: renovate.json format (#317)

---
 .github/renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/renovate.json b/.github/renovate.json
index 03752847..2e79135d 100644
--- a/.github/renovate.json
+++ b/.github/renovate.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": ["group:allNonMajor", "schedule:monthly"],
-  "ignoreDeps": ["org.apache.maven.plugins:maven-source-plugin"]
+  "ignoreDeps": ["org.apache.maven.plugins:maven-source-plugin"],
   "packageRules": [
     {
       "description": "Create a PR whenever there is a new major version",

From 36a156688de9a272c4467a65c82460b8bd621eca Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 18 Dec 2024 10:59:45 -0800
Subject: [PATCH 241/308] chore(main): release functions-framework-api
 1.1.5-SNAPSHOT (#310)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 7bc776c4..7fbdce19 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.4</version>
+  <version>1.1.5-SNAPSHOT</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From d6fc4a4155c5c56426334e1112f902edbc39d88f Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 14:16:33 -0800
Subject: [PATCH 242/308] chore(main): release java-function-invoker
 1.3.4-SNAPSHOT (#312)

* chore(main): release java-function-invoker 1.3.4-SNAPSHOT

* Update pom.xml

We should not bump the version for maven plugin

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Maeve <167252720+maemayve@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 9efbc40a..2f2b8aae 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.3</version>
+    <version>1.3.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.4-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 3e231706..a63cff27 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.4-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.3</version>
+      <version>1.3.4-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 80eebd42..705aab2d 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 17d99019..27e6e595 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.3</version>
+    <version>1.3.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.3</version>
+  <version>1.3.4-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 5ef53174b6cdbc644336121bc19bab6c4b90892d Mon Sep 17 00:00:00 2001
From: Maeve <167252720+maemayve@users.noreply.github.com>
Date: Wed, 12 Feb 2025 14:26:11 -0800
Subject: [PATCH 243/308] feat: Add execution id logging to uniquely identify
 request logs (#319)

Adds an execution id for each http. When the LOG_EXECUTION_ID env var is set, the execution id is added as a new field to the json logs.
---
 .gitignore                                    |  1 +
 .../invoker/BackgroundFunctionExecutor.java   | 14 ++++-
 .../invoker/HttpFunctionExecutor.java         |  4 ++
 .../invoker/gcf/ExecutionIdUtil.java          | 63 +++++++++++++++++++
 .../functions/invoker/gcf/JsonLogHandler.java | 25 ++++++++
 .../functions/invoker/IntegrationTest.java    | 49 +++++++++++++--
 6 files changed, 150 insertions(+), 6 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java

diff --git a/.gitignore b/.gitignore
index cb8a3b7e..4cd4e4f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 
 # Maven
 target/
+dependency-reduced-pom.xml
 
 # Gradle
 .gradle
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 98b9bc8a..a35f2225 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -21,6 +21,7 @@
 import com.google.cloud.functions.CloudEventsFunction;
 import com.google.cloud.functions.Context;
 import com.google.cloud.functions.RawBackgroundFunction;
+import com.google.cloud.functions.invoker.gcf.ExecutionIdUtil;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.TypeAdapter;
@@ -51,6 +52,7 @@ public final class BackgroundFunctionExecutor extends HttpServlet {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final FunctionExecutor<?> functionExecutor;
+  private final ExecutionIdUtil executionIdUtil = new ExecutionIdUtil();
 
   private BackgroundFunctionExecutor(FunctionExecutor<?> functionExecutor) {
     this.functionExecutor = functionExecutor;
@@ -323,6 +325,7 @@ void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
   public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
     String contentType = req.getContentType();
     try {
+      executionIdUtil.storeExecutionId(req);
       if ((contentType != null && contentType.startsWith("application/cloudevents+json"))
           || req.getHeader("ce-specversion") != null) {
         serviceCloudEvent(req);
@@ -333,6 +336,8 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
     } catch (Throwable t) {
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
       logger.log(Level.SEVERE, "Failed to execute " + functionExecutor.functionName(), t);
+    } finally {
+      executionIdUtil.removeExecutionId();
     }
   }
 
@@ -359,7 +364,14 @@ private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exce
     // ServiceLoader.load
     // will throw ServiceConfigurationError. At this point we're still running with the default
     // context ClassLoader, which is the system ClassLoader that has loaded the code here.
-    runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent(data -> data)));
+    try {
+      executionIdUtil.storeExecutionId(req);
+      runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent(data -> data)));
+    } catch (Throwable t) {
+      logger.log(Level.SEVERE, "Failed to execute " + executor.functionName(), t);
+    } finally {
+      executionIdUtil.removeExecutionId();
+    }
     // The data->data is a workaround for a bug fixed since Milestone 4 of the SDK, in
     // https://github.com/cloudevents/sdk-java/pull/259.
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 401e22a2..01f07e74 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -15,6 +15,7 @@
 package com.google.cloud.functions.invoker;
 
 import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.invoker.gcf.ExecutionIdUtil;
 import com.google.cloud.functions.invoker.http.HttpRequestImpl;
 import com.google.cloud.functions.invoker.http.HttpResponseImpl;
 import java.util.logging.Level;
@@ -28,6 +29,7 @@ public class HttpFunctionExecutor extends HttpServlet {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final HttpFunction function;
+  private final ExecutionIdUtil executionIdUtil = new ExecutionIdUtil();
 
   private HttpFunctionExecutor(HttpFunction function) {
     this.function = function;
@@ -68,6 +70,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
     HttpResponseImpl respImpl = new HttpResponseImpl(res);
     ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
+      executionIdUtil.storeExecutionId(req);
       Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
       function.service(reqImpl, respImpl);
     } catch (Throwable t) {
@@ -75,6 +78,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
       res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
     } finally {
       Thread.currentThread().setContextClassLoader(oldContextLoader);
+      executionIdUtil.removeExecutionId();
       respImpl.flush();
     }
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java
new file mode 100644
index 00000000..7987317d
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java
@@ -0,0 +1,63 @@
+package com.google.cloud.functions.invoker.gcf;
+
+import java.util.Base64;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.logging.Handler;
+import java.util.logging.Logger;
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * A helper class that either fetches a unique execution id from request HTTP headers or generates a
+ * random id.
+ */
+public final class ExecutionIdUtil {
+  private static final Logger rootLogger = Logger.getLogger("");
+  private static final int EXECUTION_ID_LENGTH = 12;
+  private static final String EXECUTION_ID_HTTP_HEADER = "HTTP_FUNCTION_EXECUTION_ID";
+  private static final String LOG_EXECUTION_ID_ENV_NAME = "LOG_EXECUTION_ID";
+
+  private final Random random = ThreadLocalRandom.current();
+
+  /**
+   * Add mapping to root logger from current thread id to execution id. This mapping will be used to
+   * append the execution id to log lines.
+   */
+  public void storeExecutionId(HttpServletRequest request) {
+    if (!executionIdLoggingEnabled()) {
+      return;
+    }
+    for (Handler handler : rootLogger.getHandlers()) {
+      if (handler instanceof JsonLogHandler) {
+        String id = getOrGenerateExecutionId(request);
+        ((JsonLogHandler) handler).addExecutionId(Thread.currentThread().getId(), id);
+      }
+    }
+  }
+
+  /** Remove mapping from curent thread to request execution id */
+  public void removeExecutionId() {
+    if (!executionIdLoggingEnabled()) {
+      return;
+    }
+    for (Handler handler : rootLogger.getHandlers()) {
+      if (handler instanceof JsonLogHandler) {
+        ((JsonLogHandler) handler).removeExecutionId(Thread.currentThread().getId());
+      }
+    }
+  }
+
+  private String getOrGenerateExecutionId(HttpServletRequest request) {
+    String executionId = request.getHeader(EXECUTION_ID_HTTP_HEADER);
+    if (executionId == null) {
+      byte[] array = new byte[EXECUTION_ID_LENGTH];
+      random.nextBytes(array);
+      executionId = Base64.getEncoder().encodeToString(array);
+    }
+    return executionId;
+  }
+
+  private boolean executionIdLoggingEnabled() {
+    return Boolean.parseBoolean(System.getenv().getOrDefault(LOG_EXECUTION_ID_ENV_NAME, "false"));
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
index 9c94b92a..b21f78a1 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
@@ -5,6 +5,8 @@
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
@@ -24,6 +26,14 @@ public final class JsonLogHandler extends Handler {
 
   private final PrintStream out;
   private final boolean closePrintStreamOnClose;
+  // This map is used to track execution id for currently running Jetty requests. Mapping thread
+  // id to request works because of an implementation detail of Jetty thread pool handling.
+  // Jetty worker threads completely handle a request before beginning work on a new request.
+  // NOTE: Store thread id as a string to avoid comparison failures between int and long.
+  //
+  // Jetty Documentation (https://jetty.org/docs/jetty/10/programming-guide/arch/threads.html)
+  private static final ConcurrentMap<String, String> executionIdByThreadMap =
+      new ConcurrentHashMap<>();
 
   public JsonLogHandler(PrintStream out, boolean closePrintStreamOnClose) {
     this.out = out;
@@ -38,6 +48,7 @@ public void publish(LogRecord record) {
     StringBuilder json = new StringBuilder("{");
     appendSeverity(json, record);
     appendSourceLocation(json, record);
+    appendExecutionId(json, record);
     appendMessage(json, record); // must be last, see appendMessage
     json.append("}");
     // We must output the log all at once (should only call println once per call to publish)
@@ -96,6 +107,12 @@ private static void appendSourceLocation(StringBuilder json, LogRecord record) {
     json.append(SOURCE_LOCATION_KEY).append("{").append(String.join(", ", entries)).append("}, ");
   }
 
+  private void appendExecutionId(StringBuilder json, LogRecord record) {
+    json.append("\"execution_id\": \"")
+        .append(executionIdByThreadMap.get(Integer.toString(record.getThreadID())))
+        .append("\", ");
+  }
+
   private static String escapeString(String s) {
     return s.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r");
   }
@@ -117,4 +134,12 @@ public void close() throws SecurityException {
       out.close();
     }
   }
+
+  public void addExecutionId(long threadId, String executionId) {
+    executionIdByThreadMap.put(Long.toString(threadId), executionId);
+  }
+
+  public void removeExecutionId(long threadId) {
+    executionIdByThreadMap.remove(Long.toString(threadId));
+  }
 }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 82197547..37d35ebd 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -28,6 +28,8 @@
 import com.google.common.truth.Expect;
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.gson.stream.JsonReader;
 import io.cloudevents.CloudEvent;
 import io.cloudevents.core.builder.CloudEventBuilder;
 import io.cloudevents.core.format.EventFormat;
@@ -39,6 +41,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.io.UncheckedIOException;
 import java.net.ServerSocket;
 import java.net.URI;
@@ -89,6 +92,8 @@ public class IntegrationTest {
   @Rule public final TestName testName = new TestName();
 
   private static final String SERVER_READY_STRING = "Started ServerConnector";
+  private static final String EXECUTION_ID_HTTP_HEADER = "HTTP_FUNCTION_EXECUTION_ID";
+  private static final String EXECUTION_ID = "1234abcd";
 
   private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
 
@@ -286,7 +291,10 @@ public void exceptionHttp() throws Exception {
     String exceptionExpectedOutput =
         "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
             + " \"com/google/cloud/functions/invoker/HttpFunctionExecutor.java\", \"method\":"
-            + " \"service\"}, \"message\": \"Failed to execute"
+            + " \"service\"}, \"execution_id\": \""
+            + EXECUTION_ID
+            + "\","
+            + " \"message\": \"Failed to execute"
             + " com.google.cloud.functions.invoker.testfunctions.ExceptionHttp\\n"
             + "java.lang.RuntimeException: exception thrown for test";
     testHttpFunction(
@@ -294,6 +302,7 @@ public void exceptionHttp() throws Exception {
         ImmutableList.of(
             TestCase.builder()
                 .setExpectedResponseCode(500)
+                .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
                 .setExpectedOutput(exceptionExpectedOutput)
                 .build()));
   }
@@ -303,7 +312,10 @@ public void exceptionBackground() throws Exception {
     String exceptionExpectedOutput =
         "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
             + " \"com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java\", \"method\":"
-            + " \"service\"}, \"message\": \"Failed to execute"
+            + " \"service\"}, \"execution_id\": \""
+            + EXECUTION_ID
+            + "\", "
+            + "\"message\": \"Failed to execute"
             + " com.google.cloud.functions.invoker.testfunctions.ExceptionBackground\\n"
             + "java.lang.RuntimeException: exception thrown for test";
 
@@ -317,6 +329,7 @@ public void exceptionBackground() throws Exception {
         ImmutableList.of(
             TestCase.builder()
                 .setRequestText(gcfRequestText)
+                .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
                 .setExpectedResponseCode(500)
                 .setExpectedOutput(exceptionExpectedOutput)
                 .build()),
@@ -359,13 +372,21 @@ public void stackDriverLogging() throws Exception {
             + "\"logging.googleapis.com/sourceLocation\": "
             + "{\"file\": \"com/google/cloud/functions/invoker/testfunctions/Log.java\","
             + " \"method\": \"service\"},"
+            + " \"execution_id\": \""
+            + EXECUTION_ID
+            + "\","
             + " \"message\": \"blim\"}";
     TestCase simpleTestCase =
-        TestCase.builder().setUrl("/?message=blim").setExpectedOutput(simpleExpectedOutput).build();
+        TestCase.builder()
+            .setUrl("/?message=blim")
+            .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
+            .setExpectedOutput(simpleExpectedOutput)
+            .build();
     String quotingExpectedOutput = "\"message\": \"foo\\nbar\\\"";
     TestCase quotingTestCase =
         TestCase.builder()
             .setUrl("/?message=" + URLEncoder.encode("foo\nbar\"", "UTF-8"))
+            .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
             .setExpectedOutput(quotingExpectedOutput)
             .build();
     String exceptionExpectedOutput =
@@ -373,11 +394,15 @@ public void stackDriverLogging() throws Exception {
             + "\"logging.googleapis.com/sourceLocation\": "
             + "{\"file\": \"com/google/cloud/functions/invoker/testfunctions/Log.java\", "
             + "\"method\": \"service\"}, "
+            + "\"execution_id\": \""
+            + EXECUTION_ID
+            + "\", "
             + "\"message\": \"oops\\njava.lang.Exception: disaster\\n"
             + "	at com.google.cloud.functions.invoker.testfunctions.Log.service(Log.java:";
     TestCase exceptionTestCase =
         TestCase.builder()
             .setUrl("/?message=oops&level=severe&exception=disaster")
+            .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
             .setExpectedOutput(exceptionExpectedOutput)
             .build();
     testHttpFunction(
@@ -753,7 +778,11 @@ private void testFunction(
     for (TestCase testCase : testCases) {
       testCase
           .expectedOutput()
-          .ifPresent(output -> expect.that(serverProcess.output()).contains(output));
+          .ifPresent(
+              (output) -> {
+                expect.that(serverProcess.output()).contains(output);
+                parseLogJson(serverProcess.output());
+              });
     }
     // Wait for the output monitor task to terminate. If it threw an exception, we will get an
     // ExecutionException here.
@@ -842,7 +871,9 @@ private ServerProcess startServer(
             "FUNCTION_SIGNATURE_TYPE",
             signatureType.toString(),
             "FUNCTION_TARGET",
-            target);
+            target,
+            "LOG_EXECUTION_ID",
+            "true");
     processBuilder.environment().putAll(environment);
     processBuilder.environment().putAll(environmentVariables);
     Process serverProcess = processBuilder.start();
@@ -879,4 +910,12 @@ private void monitorOutput(
       throw new UncheckedIOException(e);
     }
   }
+
+  // Attempt to parse Json object, throws on parse failure
+  private void parseLogJson(String json) throws RuntimeException {
+    System.out.println("trying to parse the following object ");
+    System.out.println(json);
+    JsonReader reader = new JsonReader(new StringReader(json));
+    JsonParser.parseReader(reader);
+  }
 }

From d17cc6305b7232129dec48281cca51588ec9dedf Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 12 Feb 2025 15:15:56 -0800
Subject: [PATCH 244/308] chore(main): release java-function-invoker 1.4.0
 (#320)

* chore(main): release java-function-invoker 1.4.0

* Update pom.xml

bot incorrectly bumped function-maven-plugin version

---------

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Maeve <167252720+maemayve@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index ee718aed..d17a5bf0 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.3.3","function-maven-plugin":"0.11.1"}
+{"functions-framework-api":"1.1.4","invoker":"1.4.0","function-maven-plugin":"0.11.1"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 2ac0970a..628267db 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.3...java-function-invoker-v1.4.0) (2025-02-12)
+
+
+### Features
+
+* Add execution id logging to uniquely identify request logs ([#319](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/319)) ([5ef5317](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/5ef53174b6cdbc644336121bc19bab6c4b90892d))
+
 ## [1.3.3](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.2...java-function-invoker-v1.3.3) (2024-11-27)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 2f2b8aae..929b9408 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.3.4-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.3.4-SNAPSHOT</version>
+  <version>1.4.0</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index a63cff27..35ec377e 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.4-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.3.4-SNAPSHOT</version>
+  <version>1.4.0</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.3.4-SNAPSHOT</version>
+      <version>1.4.0</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 705aab2d..7c5c4484 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.3.4-SNAPSHOT</version>
+  <version>1.4.0</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 27e6e595..e8642676 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.3.4-SNAPSHOT</version>
+    <version>1.4.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.3.4-SNAPSHOT</version>
+  <version>1.4.0</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From e8a3dd2f4eca2d7f0980607795db4edc6b32d1a8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 13 Feb 2025 10:02:26 -0800
Subject: [PATCH 245/308] chore(main): release function-maven-plugin
 0.11.2-SNAPSHOT (#314)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index aee89999..11d3baae 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.11.1</version>
+  <version>0.11.2-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From 8c7f6d8b8a9587516b68499d6ee2715e6ca0aacd Mon Sep 17 00:00:00 2001
From: Maeve <167252720+maemayve@users.noreply.github.com>
Date: Tue, 18 Feb 2025 09:18:28 -0800
Subject: [PATCH 246/308] fix: remove maven-plugin from release-please-config
 for invoker/conformance/pom.xml (#322)

Previous change d31b502 incorrectly added an extra file to the invoker
release which is causing automation breakages when the invoker release
PRs are created.

Move config to the right package.
---
 .github/release-please-config.json | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/release-please-config.json b/.github/release-please-config.json
index 05f7dc1c..cfe9f42a 100644
--- a/.github/release-please-config.json
+++ b/.github/release-please-config.json
@@ -46,11 +46,6 @@
                     "path": "conformance/pom.xml",
                     "xpath": "//*[local-name()='artifactId' and text()='conformance']/parent::*/*[local-name()='version']"
                 },
-                {
-                    "type": "xml",
-                    "path": "conformance/pom.xml",
-                    "xpath": "//*[local-name()='artifactId' and text()='function-maven-plugin']/parent::*/*[local-name()='version']" 
-                },
                 {
                     "type": "xml",
                     "path": "testfunction/pom.xml",

From d6f71867195bc674e7814f05132c33a02916148e Mon Sep 17 00:00:00 2001
From: Maeve <167252720+maemayve@users.noreply.github.com>
Date: Wed, 19 Feb 2025 16:19:21 -0800
Subject: [PATCH 247/308] chore: Update blunderbuss.yml (#323)

Add mayv to issue and pr handling
---
 .github/blunderbuss.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index 2dfa51ed..dcd61b31 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -2,9 +2,11 @@ assign_prs:
   - HKwinterhalter
   - dixuswe
   - janell-chen
+  - mayv
 
 assign_issues:
   - HKwinterhalter
   - dixuswe
   - janell-chen
+  - mayv
   

From 9899a67a9a8cb6ebb27a92cccb740e7e23d48578 Mon Sep 17 00:00:00 2001
From: Maeve <167252720+maemayve@users.noreply.github.com>
Date: Thu, 6 Mar 2025 16:45:04 -0800
Subject: [PATCH 248/308] fix: correct Cloud Event retry functionality (#326)

* fix: Correct exception handling for CloudEvents

A previous change resulted broke exception handling for cloud events so
that an exception from the function would not result in a failure
response code. Correct error handling for CloudEvents and add a test to
cover this case to avoid future breakages.

* fix: Do not add execution_id field if logging is disabled

Fix logger to not add field if logging is disabled.
---
 .../invoker/BackgroundFunctionExecutor.java   |  9 +----
 .../functions/invoker/gcf/JsonLogHandler.java | 13 +++++--
 .../functions/invoker/IntegrationTest.java    | 37 +++++++++++++++++++
 3 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index a35f2225..331c9586 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -364,14 +364,7 @@ private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exce
     // ServiceLoader.load
     // will throw ServiceConfigurationError. At this point we're still running with the default
     // context ClassLoader, which is the system ClassLoader that has loaded the code here.
-    try {
-      executionIdUtil.storeExecutionId(req);
-      runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent(data -> data)));
-    } catch (Throwable t) {
-      logger.log(Level.SEVERE, "Failed to execute " + executor.functionName(), t);
-    } finally {
-      executionIdUtil.removeExecutionId();
-    }
+    runWithContextClassLoader(() -> executor.serviceCloudEvent(reader.toEvent(data -> data)));
     // The data->data is a workaround for a bug fixed since Milestone 4 of the SDK, in
     // https://github.com/cloudevents/sdk-java/pull/259.
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
index b21f78a1..51aad21a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
@@ -17,6 +17,7 @@
  */
 public final class JsonLogHandler extends Handler {
   private static final String SOURCE_LOCATION_KEY = "\"logging.googleapis.com/sourceLocation\": ";
+  private static final String LOG_EXECUTION_ID_ENV_NAME = "LOG_EXECUTION_ID";
 
   private static final String DEBUG = "DEBUG";
   private static final String INFO = "INFO";
@@ -108,9 +109,11 @@ private static void appendSourceLocation(StringBuilder json, LogRecord record) {
   }
 
   private void appendExecutionId(StringBuilder json, LogRecord record) {
-    json.append("\"execution_id\": \"")
-        .append(executionIdByThreadMap.get(Integer.toString(record.getThreadID())))
-        .append("\", ");
+    if (executionIdLoggingEnabled()) {
+      json.append("\"execution_id\": \"")
+          .append(executionIdByThreadMap.get(Integer.toString(record.getThreadID())))
+          .append("\", ");
+    }
   }
 
   private static String escapeString(String s) {
@@ -142,4 +145,8 @@ public void addExecutionId(long threadId, String executionId) {
   public void removeExecutionId(long threadId) {
     executionIdByThreadMap.remove(Long.toString(threadId));
   }
+
+  private boolean executionIdLoggingEnabled() {
+    return Boolean.parseBoolean(System.getenv().getOrDefault(LOG_EXECUTION_ID_ENV_NAME, "false"));
+  }
 }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 37d35ebd..2f1d8bc8 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -577,6 +577,43 @@ public void nativeCloudEvent() throws Exception {
         ImmutableList.of(cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
   }
 
+  /** Tests a CloudEvent being handled by a CloudEvent handler throws exception */
+  @Test
+  public void nativeCloudEventException() throws Exception {
+    String exceptionExpectedOutput =
+        "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
+            + " \"com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java\", \"method\":"
+            + " \"service\"}, \"execution_id\": \""
+            + EXECUTION_ID
+            + "\", "
+            + "\"message\": \"Failed to execute"
+            + " com.google.cloud.functions.invoker.testfunctions.ExceptionBackground\\n"
+            + "java.lang.RuntimeException: exception thrown for test";
+    File snoopFile = snoopFile();
+    CloudEvent cloudEvent = sampleCloudEvent(snoopFile);
+    EventFormat jsonFormat =
+        EventFormatProvider.getInstance().resolveFormat(JsonFormat.CONTENT_TYPE);
+    String cloudEventJson = new String(jsonFormat.serialize(cloudEvent), UTF_8);
+
+    // A CloudEvent using the "structured content mode", where both the metadata and the payload
+    // are in the body of the HTTP request.
+    TestCase cloudEventsStructuredTestCase =
+        TestCase.builder()
+            .setRequestText(cloudEventJson)
+            .setHttpContentType("application/cloudevents+json; charset=utf-8")
+            .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
+            .setExpectedResponseCode(500)
+            .setExpectedOutput(exceptionExpectedOutput)
+            .build();
+
+    testFunction(
+        SignatureType.CLOUD_EVENT,
+        fullTarget("ExceptionBackground"),
+        ImmutableList.of(),
+        ImmutableList.of(cloudEventsStructuredTestCase),
+        Collections.emptyMap());
+  }
+
   @Test
   public void nested() throws Exception {
     String testText = "sic transit gloria mundi";

From 185d15f77c4a165ec01950ae11960024b0f27151 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 7 Mar 2025 18:00:24 +0100
Subject: [PATCH 249/308] chore(deps): update all non-major dependencies (#318)

Co-authored-by: Maeve <167252720+maemayve@users.noreply.github.com>
---
 .github/workflows/codeql.yml       |  6 +++---
 .github/workflows/conformance.yaml |  6 +++---
 .github/workflows/lint.yaml        |  8 ++++----
 .github/workflows/scorecard.yml    |  6 +++---
 .github/workflows/unit.yaml        |  4 ++--
 function-maven-plugin/pom.xml      |  6 +++---
 functions-framework-api/pom.xml    |  4 ++--
 invoker/conformance/pom.xml        |  4 ++--
 invoker/core/pom.xml               | 14 +++++++-------
 invoker/pom.xml                    |  4 ++--
 invoker/testfunction/pom.xml       |  8 ++++----
 11 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index ec4e95c0..c28404fd 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -46,7 +46,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+      uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -66,6 +66,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+      uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 2391a71f..82e50d85 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -33,13 +33,13 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # v5.1.0
+      uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
       with:
         go-version: '1.21'
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 59372931..ab57ead9 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -22,7 +22,7 @@ jobs:
           repo.maven.apache.org:443
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,13 +38,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # v2 minimum required
       - name: Set up JDK
-        uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
           java-version: 17.x
           distribution: temurin
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 5d49971e..752afbf3 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
         with:
           disable-sudo: true
           egress-policy: block
@@ -50,7 +50,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@62b2cac7ed8198b15735ed49ab1e5cf35480ba46 # v2.4.0
+        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
         with:
           results_file: results.sarif
           results_format: sarif
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
+        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 1767bb9f..01522215 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
+      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -30,7 +30,7 @@ jobs:
           *.githubusercontent.com:443
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
+      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 11d3baae..76de071a 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -58,13 +58,13 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.8.1</version>
+      <version>2.8.3</version>
       <type>jar</type>
     </dependency>
 
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.11.1</version>
+            <version>3.11.2</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 7fbdce19..438f2898 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -28,8 +28,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.13.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.11.1</maven-javadoc-plugin.version>
+    <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
+    <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 929b9408..b7d60325 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -28,12 +28,12 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.4</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.11.0</version>
+      <version>2.12.1</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 35ec377e..b7f41622 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.4</version>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.11.0</version>
+      <version>2.12.1</version>
     </dependency>
     <dependency>
       <groupId>com.ryanharter.auto.value</groupId>
@@ -98,12 +98,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.56.v20240826</version>
+      <version>9.4.57.v20241219</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.56.v20240826</version>
+      <version>9.4.57.v20241219</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.14.2</version>
+      <version>5.16.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -134,7 +134,7 @@
     <dependency>
       <groupId>com.google.re2j</groupId>
       <artifactId>re2j</artifactId>
-      <version>1.7</version>
+      <version>1.8</version>
     </dependency>
     <dependency>
       <groupId>com.google.truth</groupId>
@@ -151,7 +151,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.56.v20240826</version>
+      <version>9.4.57.v20241219</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 7c5c4484..4151e994 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.1.0</version>
+        <version>1.1.4</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.11.1</version>
+            <version>3.11.2</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index e8642676..44c4f110 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -19,7 +19,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.0</version>
+      <version>1.1.4</version>
     </dependency>
     <dependency>
       <!-- We don't actually use this; we just check that its classes can be
@@ -31,12 +31,12 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.3.1-jre</version>
+      <version>33.4.0-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.11.0</version>
+      <version>2.12.1</version>
     </dependency>
   </dependencies>
 
@@ -86,7 +86,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <configuration>
           <skip>true</skip>
         </configuration>

From c3572eccda63cc94684ead835cca379735f97d29 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 10:35:46 -0800
Subject: [PATCH 250/308] chore(main): release java-function-invoker
 1.4.1-SNAPSHOT (#321)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index b7d60325..c5410df5 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.0</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index b7f41622..95d55b22 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 4151e994..97eafe3b 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 44c4f110..f98213d5 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.0</version>
+    <version>1.4.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.0</version>
+  <version>1.4.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 05c419b135772cf5aee2b93277ade4bb90ec382a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 7 Mar 2025 12:49:53 -0800
Subject: [PATCH 251/308] chore(main): release java-function-invoker 1.4.1
 (#327)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index d17a5bf0..e86b66fc 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.4.0","function-maven-plugin":"0.11.1"}
+{"functions-framework-api":"1.1.4","invoker":"1.4.1","function-maven-plugin":"0.11.1"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 628267db..9fb244aa 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.0...java-function-invoker-v1.4.1) (2025-03-07)
+
+
+### Bug Fixes
+
+* correct Cloud Event retry functionality ([#326](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/326)) ([9899a67](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/9899a67a9a8cb6ebb27a92cccb740e7e23d48578))
+
 ## [1.4.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.3.3...java-function-invoker-v1.4.0) (2025-02-12)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index c5410df5..61ef6c47 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 95d55b22..dc17c779 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.1-SNAPSHOT</version>
+      <version>1.4.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 97eafe3b..f5a92d6e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index f98213d5..00f65f19 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From cd6caeda00262b2558815ae22cfc726c0638122a Mon Sep 17 00:00:00 2001
From: HKWinterhalter <HansWinterhalter@gmail.com>
Date: Mon, 17 Mar 2025 14:58:32 -0700
Subject: [PATCH 252/308] chore: remove all assignees from blunderbuss.yml
 (#329)

---
 .github/blunderbuss.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
index dcd61b31..8b137891 100644
--- a/.github/blunderbuss.yml
+++ b/.github/blunderbuss.yml
@@ -1,12 +1 @@
-assign_prs:
-  - HKwinterhalter
-  - dixuswe
-  - janell-chen
-  - mayv
 
-assign_issues:
-  - HKwinterhalter
-  - dixuswe
-  - janell-chen
-  - mayv
-  

From d979b7dc86b348721546a81b454868ef2ca51852 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Fri, 3 Oct 2025 18:22:44 -0700
Subject: [PATCH 253/308] chore: update java version for java formatter (#336)

---
 .github/workflows/lint.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index ab57ead9..bda7755d 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -46,7 +46,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
-          java-version: 17.x
+          java-version: 21.x
           distribution: temurin
       - name: Run formatter
         id: formatter

From 49f60f86dfa883f80a316a1fd09177edf1cb1b46 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 4 Oct 2025 02:29:37 +0100
Subject: [PATCH 254/308] chore(deps): update actions/setup-go action to v6
 (#335)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/conformance.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 82e50d85..81fe0f31 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -39,7 +39,7 @@ jobs:
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
+      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
         go-version: '1.21'
 

From 15be91d8d6503a45e32eaf501cbdae195a814562 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Sat, 4 Oct 2025 02:34:37 +0100
Subject: [PATCH 255/308] chore(deps): update actions/checkout action to v5
 (#334)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/codeql.yml       | 2 +-
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/scorecard.yml    | 2 +-
 .github/workflows/unit.yaml        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c28404fd..5ff23715 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -42,7 +42,7 @@ jobs:
           uploads.github.com:443
           
     - name: Checkout repository
-      uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 81fe0f31..33d05f71 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -30,7 +30,7 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index bda7755d..6f445acf 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -20,7 +20,7 @@ jobs:
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:
@@ -42,7 +42,7 @@ jobs:
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 # v2 minimum required
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # v2 minimum required
       - name: Set up JDK
         uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
         with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 752afbf3..11679d87 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -45,7 +45,7 @@ jobs:
             *.github.com:443
           
       - name: "Checkout code"
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 01522215..6781915c 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -28,7 +28,7 @@ jobs:
           repo.maven.apache.org:443
           api.adoptium.net:443
           *.githubusercontent.com:443
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
       with:

From 1d42e96b97bd3b14123d2e60b093a06502dbc3d2 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 6 Oct 2025 10:26:51 -0700
Subject: [PATCH 256/308] chore: add release-assets.githubusercontent.com to
 allowed sites for harden runner (#337)

---
 .github/workflows/codeql.yml    | 9 ++++-----
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5ff23715..134120d7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -14,7 +14,7 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
-    
+
     permissions:
       actions: read
       contents: read
@@ -22,7 +22,7 @@ jobs:
 
     strategy:
       fail-fast: false
-      matrix: 
+      matrix:
         # Autobuild each of these seperate maven projects
         working-directory: ['invoker', 'functions-framework-api', 'function-maven-plugin']
 
@@ -37,10 +37,11 @@ jobs:
           github.com:443
           objects.githubusercontent.com:443
           proxy.golang.org:443
+          release-assets.githubusercontent.com:443
           repo.maven.apache.org:443
           storage.googleapis.com:443
           uploads.github.com:443
-          
+
     - name: Checkout repository
       uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
@@ -57,8 +58,6 @@ jobs:
         # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
         # queries: security-extended,security-and-quality
 
-
-    
     - name: Build
       run: |
         (cd functions-framework-api/ && mvn install)
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 11679d87..80ffb070 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -43,7 +43,7 @@ jobs:
             www.bestpractices.dev:443
             *.sigstore.dev:443
             *.github.com:443
-          
+
       - name: "Checkout code"
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:

From 177f1d92e41f6db3596dffb19e66dcf941e02819 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 6 Oct 2025 11:14:00 -0700
Subject: [PATCH 257/308] chore: add release-assets.githubusercontent.com to
 allowed sites for harden runner (#338)

* chore: add release-assets.githubusercontent.com to allowed sites for harden runner

* chore: add release-assets.githubusercontent.com to allowed sites for harden runner
---
 .github/workflows/conformance.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 33d05f71..21745f56 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -27,6 +27,7 @@ jobs:
           github.com:443
           objects.githubusercontent.com:443
           proxy.golang.org:443
+          release-assets.githubusercontent.com:443
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
@@ -94,4 +95,4 @@ jobs:
         useBuildpacks: false
         validateConcurrency: true
         cmd: "'mvn -f invoker/conformance/pom.xml function:run -Drun.functionTarget=com.google.cloud.functions.conformance.ConcurrentHttpConformanceFunction'"
-        startDelay: 10
\ No newline at end of file
+        startDelay: 10

From 88e3f96fdc7edc854a032807120b6268a36e63be Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 6 Oct 2025 19:22:00 +0100
Subject: [PATCH 258/308] chore(deps): update all non-major dependencies (#331)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/codeql.yml       |  6 +++---
 .github/workflows/conformance.yaml |  6 +++---
 .github/workflows/lint.yaml        |  8 ++++----
 .github/workflows/scorecard.yml    |  6 +++---
 .github/workflows/unit.yaml        |  4 ++--
 function-maven-plugin/pom.xml      | 12 ++++++------
 functions-framework-api/pom.xml    |  6 +++---
 invoker/conformance/pom.xml        |  2 +-
 invoker/core/pom.xml               | 16 ++++++++--------
 invoker/pom.xml                    |  4 ++--
 invoker/testfunction/pom.xml       |  4 ++--
 11 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 134120d7..32d7e54e 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -65,6 +65,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+      uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 21745f56..88e5d8d9 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -34,7 +34,7 @@ jobs:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
@@ -42,7 +42,7 @@ jobs:
     - name: Setup Go
       uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
       with:
-        go-version: '1.21'
+        go-version: '1.25'
 
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 6f445acf..6cc5a37b 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -22,7 +22,7 @@ jobs:
           repo.maven.apache.org:443
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: 11.x
         distribution: temurin
@@ -38,13 +38,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # v2 minimum required
       - name: Set up JDK
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         with:
           java-version: 21.x
           distribution: temurin
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 80ffb070..a6b8e986 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -50,7 +50,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
         with:
           results_file: results.sarif
           results_format: sarif
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@b56ba49b26e50535fa1e7f7db0f4f7b4bf65d80d # v3.28.10
+        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 6781915c..2826605a 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -30,7 +30,7 @@ jobs:
           *.githubusercontent.com:443
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 76de071a..4ddebd00 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -41,12 +41,12 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.9</version>
+      <version>3.9.11</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.9</version>
+      <version>3.9.11</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.4.0</version>
+      <version>1.4.1</version>
     </dependency>
 
     <dependency>
@@ -71,7 +71,7 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.4</version>
+      <version>1.4.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -132,7 +132,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.11.2</version>
+            <version>3.12.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -145,7 +145,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.7</version>
+            <version>3.2.8</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 438f2898..3d6226c7 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -28,8 +28,8 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
-    <maven-javadoc-plugin.version>3.11.2</maven-javadoc-plugin.version>
+    <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+    <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
 
@@ -177,7 +177,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.7</version>
+            <version>3.2.8</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 61ef6c47..9b008ae9 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.12.1</version>
+      <version>2.13.2</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index dc17c779..45d9ceda 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -69,7 +69,7 @@
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.12.1</version>
+      <version>2.13.2</version>
     </dependency>
     <dependency>
       <groupId>com.ryanharter.auto.value</groupId>
@@ -98,12 +98,12 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
-      <version>9.4.57.v20241219</version>
+      <version>9.4.58.v20250814</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
-      <version>9.4.57.v20241219</version>
+      <version>9.4.58.v20250814</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -122,7 +122,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.16.0</version>
+      <version>5.20.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -139,19 +139,19 @@
     <dependency>
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
-      <version>1.4.4</version>
+      <version>1.4.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.truth.extensions</groupId>
       <artifactId>truth-java8-extension</artifactId>
-      <version>1.4.4</version>
+      <version>1.4.5</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.57.v20241219</version>
+      <version>9.4.58.v20250814</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -174,7 +174,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.0</version>
+        <version>3.6.1</version>
         <executions>
           <execution>
             <phase>package</phase>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index f5a92d6e..c7db44cb 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -80,7 +80,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.11.2</version>
+            <version>3.12.0</version>
             <executions>
               <execution>
                 <id>attach-javadocs</id>
@@ -93,7 +93,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.2.7</version>
+            <version>3.2.8</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 00f65f19..b6a18a5f 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -31,12 +31,12 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.4.0-jre</version>
+      <version>33.5.0-jre</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
-      <version>2.12.1</version>
+      <version>2.13.2</version>
     </dependency>
   </dependencies>
 

From b2f7ed083338e24681214745b002d34ecce32a6b Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Mon, 6 Oct 2025 21:23:24 +0100
Subject: [PATCH 259/308] chore(deps): update
 googlecloudplatform/functions-framework-conformance digest to 6ae50bd (#325)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/conformance.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 88e5d8d9..9b03a3c6 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -54,7 +54,7 @@ jobs:
       run: (cd function-maven-plugin/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
       with:
         functionType: 'http'
         useBuildpacks: false
@@ -62,7 +62,7 @@ jobs:
         startDelay: 10
 
     - name: Run Typed conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
       with:
         functionType: 'http'
         declarativeType: 'typed'
@@ -71,7 +71,7 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
       with:
         functionType: 'legacyevent'
         useBuildpacks: false
@@ -80,7 +80,7 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
@@ -89,7 +89,7 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@1041a97e93a463d9efb17dda821f3ddc0bf0024f # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
       with:
         functionType: 'http'
         useBuildpacks: false

From e4d8e677043bac5f0310f4a6744bf9caa36410f0 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 13:47:11 -0700
Subject: [PATCH 260/308] chore(main): release java-function-invoker
 1.4.2-SNAPSHOT (#328)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 9b008ae9..f882d4ad 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 45d9ceda..28eaf73d 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.1</version>
+      <version>1.4.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index c7db44cb..0800eb37 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index b6a18a5f..78df65aa 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.1</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 420327967b96b4aa66c0edd6753a9d6db781478d Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Tue, 7 Oct 2025 15:27:48 -0700
Subject: [PATCH 261/308] fix: add autovalue plugin config to
 invoker/core/pom.xml to fix local development (#339)

---
 invoker/core/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 28eaf73d..06dccab1 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -158,6 +158,24 @@
 
   <build>
     <plugins>
+     <plugin>
+       <artifactId>maven-compiler-plugin</artifactId>
+       <version>3.14.1</version>
+      <configuration>
+        <annotationProcessorPaths>
+          <path>
+            <groupId>com.google.auto.value</groupId>
+            <artifactId>auto-value</artifactId>
+            <version>1.11.0</version>
+          </path>
+          <path>
+            <groupId>com.ryanharter.auto.value</groupId>
+            <artifactId>auto-value-gson</artifactId>
+            <version>1.3.1</version>
+          </path>
+        </annotationProcessorPaths>
+      </configuration>
+     </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <version>3.4.2</version>

From e152e0d697c1a3f4a90a6480347b4ddf0b73f3e3 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Tue, 7 Oct 2025 17:58:00 -0700
Subject: [PATCH 262/308] fix: several minor fixes (#341)

* fix: several minor fixes

Changed a couple of maven plugins's scope to provided as recommended by
Maven.

Fixed #117: during first deploy unless the allowUnauthenticated property
was set to true, the gcloud command was waiting on a prompt that was not
visible and could not be interacted with. This change removes the
allowUnauthenticated property's default value and relies on gcloud's
behavior which will default this value to false if prompting is turned
off with '--quiet'. If the allowUnauthenticated is explicitly set, it
will correctly append the --[no-]allow-unauthenticated flag to the
command.

If the gcloud command fails, the plugin will not report a successful
build.

* fix formatting
---
 function-maven-plugin/pom.xml                 |  2 ++
 .../functions/plugin/DeployFunction.java      | 19 +++++++++++++------
 .../functions/plugin/DeployFunctionTest.java  |  3 ++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 4ddebd00..a7e8764c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -42,11 +42,13 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
       <version>3.9.11</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
       <version>3.9.11</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
diff --git a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index 35dab3f8..d0067ded 100644
--- a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -63,9 +63,8 @@ public class DeployFunction extends CloudSdkMojo {
    */
   @Parameter(
       alias = "deploy.allowunauthenticated",
-      property = "function.deploy.allowunauthenticated",
-      defaultValue = "false")
-  boolean allowUnauthenticated;
+      property = "function.deploy.allowunauthenticated")
+  Boolean allowUnauthenticated;
 
   /**
    * Name of a Google Cloud Function (as defined in source code) that will be executed. Defaults to
@@ -314,8 +313,12 @@ public List<String> getCommands() {
     if (triggerEvent != null) {
       commands.add("--trigger-event=" + triggerEvent);
     }
-    if (allowUnauthenticated) {
-      commands.add("--allow-unauthenticated");
+    if (allowUnauthenticated != null) {
+      if (allowUnauthenticated) {
+        commands.add("--allow-unauthenticated");
+      } else {
+        commands.add("--no-allow-unauthenticated");
+      }
     }
     if (functionTarget != null) {
       commands.add("--entry-point=" + functionTarget);
@@ -371,6 +374,8 @@ public List<String> getCommands() {
     if (projectId != null) {
       commands.add("--project=" + projectId);
     }
+
+    commands.add("--quiet");
     return Collections.unmodifiableList(commands);
   }
 
@@ -382,7 +387,9 @@ public void execute() throws MojoExecutionException {
       System.out.println("Executing Cloud SDK command: gcloud " + String.join(" ", params));
       gcloud.runCommand(params);
     } catch (CloudSdkNotFoundException | IOException | ProcessHandlerException ex) {
-      Logger.getLogger(DeployFunction.class.getName()).log(Level.SEVERE, null, ex);
+      Logger.getLogger(DeployFunction.class.getName())
+          .log(Level.SEVERE, "Function deployment failed", ex);
+      throw new MojoExecutionException("Function deployment failed", ex);
     }
   }
 }
diff --git a/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
index e5a2913d..2b441d4e 100644
--- a/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
+++ b/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
@@ -53,7 +53,8 @@ public void testDeployFunctionCommandLine() {
             "--env-vars-file=myfile",
             "--set-build-env-vars=env1=a,env2=b",
             "--build-env-vars-file=myfile2",
-            "--runtime=java11");
+            "--runtime=java11",
+            "--quiet");
     assertThat(mojo.getCommands()).isEqualTo(expected);
   }
 }

From 043f647ef10cb8993441106be12ae495f86d7972 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:48:06 -0700
Subject: [PATCH 263/308] chore: update relese process (#343)

---
 .kokoro/release.sh            | 45 ++++++++++++++++++++++++-----------
 function-maven-plugin/pom.xml | 25 ++++++++++++++-----
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 66ef1e6d..7a7e067e 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -3,21 +3,19 @@
 # Stop execution when any command fails.
 set -e
 
-# update the Maven version to 3.6.3
+# update the Maven version to 3.9.11
 pushd /usr/local
-wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.tar.gz
-tar -xvzf apache-maven-3.6.3-bin.tar.gz apache-maven-3.6.3
+wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.tar.gz
+tar -xvzf apache-maven-3.9.11-bin.tar.gz apache-maven-3.9.11
 rm -f /usr/local/apache-maven
-ln -s /usr/local/apache-maven-3.6.3 /usr/local/apache-maven
-rm apache-maven-3.6.3-bin.tar.gz
+ln -s /usr/local/apache-maven-3.9.11 /usr/local/apache-maven
+rm apache-maven-3.9.11-bin.tar.gz
 popd
 
 
 # Get secrets from keystore and set and environment variables.
 setup_environment_secrets() {
   export GPG_TTY=$(tty)
-  export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f1 -d':')
-  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password | cut -f2 -d':')
   export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
 
   # Add the key ring files to $GNUPGHOME to verify the GPG credentials.
@@ -26,6 +24,29 @@ setup_environment_secrets() {
   mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GNUPGHOME/pubring.gpg
   mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GNUPGHOME/secring.gpg
   gpg -k
+
+  echo "KOKORO_GFILE_DIR: ${KOKORO_GFILE_DIR}"
+  SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
+  echo "Creating folder for secrets: ${SECRET_LOCATION} (if not exists)"
+  mkdir -p "${SECRET_LOCATION}"
+  echo "Content of ${SECRET_LOCATION}:"
+  ls -alt "${SECRET_LOCATION}"
+  echo "------"
+
+  export SECRET_MANAGER_PROJECT_ID="serverless-runtimes"
+  export CENTRAL_REPO_USER="sonatype-central-repo-user"
+  export CENTRAL_REPO_TOKEN="sonatype-central-repo-token"
+  SECRET_MANAGER_KEYS="${CENTRAL_REPO_USER} ${CENTRAL_REPO_TOKEN}"
+  echo "SECRET_MANAGER_PROJECT_ID: ${SECRET_MANAGER_PROJECT_ID}, SECRET_MANAGER_KEYS: ${SECRET_MANAGER_KEYS}"
+
+  for key in $(echo "${SECRET_MANAGER_KEYS}" | sed "s/,/ /g")
+  do
+    gcloud secrets versions access latest \
+        --project "${SECRET_MANAGER_PROJECT_ID}" \
+        --secret "${key}" \
+        --out-file "${SECRET_LOCATION}/${key}"
+    echo "Created ${SECRET_LOCATION}/${key}"
+  done
 }
 
 create_settings_xml_file() {
@@ -42,14 +63,10 @@ create_settings_xml_file() {
   </profiles>
   <servers>
     <server>
-      <id>sonatype-nexus-staging</id>
-      <username>${SONATYPE_USERNAME}</username>
-      <password>${SONATYPE_PASSWORD}</password>
+      <id>sonatype-central-portal</id>
+      <username>$(cat "${SECRET_LOCATION}/${CENTRAL_REPO_USER}")</username>
+      <password>$(cat "${SECRET_LOCATION}/${CENTRAL_REPO_TOKEN}")</password>
     </server>
-    <server>
-      <id>sonatype-nexus-snapshots</id>
-      <username>${SONATYPE_USERNAME}</username>
-      <password>${SONATYPE_PASSWORD}</password>
     </server>
   </servers>
 </settings>" > $1
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index a7e8764c..a1678bd6 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -23,6 +23,21 @@
     <tag>HEAD</tag>
   </scm>
 
+  <developers>
+    <developer>
+      <name>Andras Kerekes</name>
+      <email>akerekes@google.com</email>
+      <organization>Google LLC</organization>
+      <organizationUrl>http://www.google.com</organizationUrl>
+    </developer>
+    <developer>
+      <name>Di Xu</name>
+      <email>dixuswe@google.com</email>
+      <organization>Google LLC</organization>
+      <organizationUrl>http://www.google.com</organizationUrl>
+    </developer>
+  </developers>
+
   <licenses>
     <license>
       <name>Apache License, Version 2.0</name>
@@ -159,14 +174,12 @@
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.7.0</version>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
+            <version>0.9.0</version>
             <extensions>true</extensions>
             <configuration>
-              <serverId>sonatype-nexus-snapshots</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+              <publishingServerId>sonatype-central-portal</publishingServerId>
             </configuration>
           </plugin>
         </plugins>

From 5f847d3daf2367526445815e0952e0fdcf2f22af Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:59:43 -0700
Subject: [PATCH 264/308] chore: update release process (#344)

---
 .kokoro/release.cfg |  8 ++++++++
 .kokoro/release.sh  | 27 ++-------------------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/.kokoro/release.cfg b/.kokoro/release.cfg
index f2ee4665..08d0ac9f 100644
--- a/.kokoro/release.cfg
+++ b/.kokoro/release.cfg
@@ -6,6 +6,14 @@ before_action {
       keystore_config_id: 75669
       keyname: "functions-framework-java-release-bot-sonatype-password"
     }
+    keystore_resource {
+      keystore_config_id: 75669
+      keyname: "functions-framework-release-sonatype-central-portal-username"
+    }
+    keystore_resource {
+      keystore_config_id: 75669
+      keyname: "functions-framework-release-sonatype-central-portal-password"
+    }
     keystore_resource {
       keystore_config_id: 70247
       keyname: "maven-gpg-pubkeyring"
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 7a7e067e..1aa8d455 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -24,29 +24,6 @@ setup_environment_secrets() {
   mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GNUPGHOME/pubring.gpg
   mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GNUPGHOME/secring.gpg
   gpg -k
-
-  echo "KOKORO_GFILE_DIR: ${KOKORO_GFILE_DIR}"
-  SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
-  echo "Creating folder for secrets: ${SECRET_LOCATION} (if not exists)"
-  mkdir -p "${SECRET_LOCATION}"
-  echo "Content of ${SECRET_LOCATION}:"
-  ls -alt "${SECRET_LOCATION}"
-  echo "------"
-
-  export SECRET_MANAGER_PROJECT_ID="serverless-runtimes"
-  export CENTRAL_REPO_USER="sonatype-central-repo-user"
-  export CENTRAL_REPO_TOKEN="sonatype-central-repo-token"
-  SECRET_MANAGER_KEYS="${CENTRAL_REPO_USER} ${CENTRAL_REPO_TOKEN}"
-  echo "SECRET_MANAGER_PROJECT_ID: ${SECRET_MANAGER_PROJECT_ID}, SECRET_MANAGER_KEYS: ${SECRET_MANAGER_KEYS}"
-
-  for key in $(echo "${SECRET_MANAGER_KEYS}" | sed "s/,/ /g")
-  do
-    gcloud secrets versions access latest \
-        --project "${SECRET_MANAGER_PROJECT_ID}" \
-        --secret "${key}" \
-        --out-file "${SECRET_LOCATION}/${key}"
-    echo "Created ${SECRET_LOCATION}/${key}"
-  done
 }
 
 create_settings_xml_file() {
@@ -64,8 +41,8 @@ create_settings_xml_file() {
   <servers>
     <server>
       <id>sonatype-central-portal</id>
-      <username>$(cat "${SECRET_LOCATION}/${CENTRAL_REPO_USER}")</username>
-      <password>$(cat "${SECRET_LOCATION}/${CENTRAL_REPO_TOKEN}")</password>
+      <username>$(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-username")</username>
+      <password>$(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-password")</password>
     </server>
     </server>
   </servers>

From 3ce8832b498113f84e9a6607e30c885cf6f5b834 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:07:45 -0700
Subject: [PATCH 265/308] chore: fix generated release m2 settings content
 (#345)

---
 .kokoro/release.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 1aa8d455..59580d66 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -44,7 +44,6 @@ create_settings_xml_file() {
       <username>$(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-username")</username>
       <password>$(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-password")</password>
     </server>
-    </server>
   </servers>
 </settings>" > $1
 }

From 9aa60907c749fcb14efc4a5919a5ea518d14df96 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:27:33 -0700
Subject: [PATCH 266/308] chore: fix generated release m2 settings content -
 attempt2 (#346)

---
 .kokoro/release.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 59580d66..c6e1ee05 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -53,6 +53,7 @@ setup_environment_secrets
 # Pick the right package to release based on the Kokoro job name.
 cd ${KOKORO_ARTIFACTS_DIR}/github/functions-framework-java
 create_settings_xml_file "settings.xml"
+cat settings.xml
 echo "KOKORO_JOB_NAME=${KOKORO_JOB_NAME}"
 if [[ $KOKORO_JOB_NAME == *"function-maven-plugin"* ]]; then
   cd function-maven-plugin

From 1cbda1a0be06ba61d6e89b7c4c82bd9b2d152e41 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:32:30 -0700
Subject: [PATCH 267/308] chore: fix generated release m2 settings content -
 attempt3 (#347)

---
 .kokoro/release.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index c6e1ee05..ffc31a87 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -41,8 +41,8 @@ create_settings_xml_file() {
   <servers>
     <server>
       <id>sonatype-central-portal</id>
-      <username>$(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-username")</username>
-      <password>$(cat "${KOKORO_KEYSTORE_DIR}/75699_functions-framework-release-sonatype-central-portal-password")</password>
+      <username>$(cat "${KOKORO_KEYSTORE_DIR}/75669_functions-framework-release-sonatype-central-portal-username")</username>
+      <password>$(cat "${KOKORO_KEYSTORE_DIR}/75669_functions-framework-release-sonatype-central-portal-password")</password>
     </server>
   </servers>
 </settings>" > $1

From bd78f345bc99686763259b4e196b53e0ebfd8183 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:42:54 -0700
Subject: [PATCH 268/308] chore: fix snapshot repo url (#348)

---
 .kokoro/release.sh            |  1 -
 function-maven-plugin/pom.xml | 12 ------------
 2 files changed, 13 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index ffc31a87..2804846d 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -53,7 +53,6 @@ setup_environment_secrets
 # Pick the right package to release based on the Kokoro job name.
 cd ${KOKORO_ARTIFACTS_DIR}/github/functions-framework-java
 create_settings_xml_file "settings.xml"
-cat settings.xml
 echo "KOKORO_JOB_NAME=${KOKORO_JOB_NAME}"
 if [[ $KOKORO_JOB_NAME == *"function-maven-plugin"* ]]; then
   cd function-maven-plugin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index a1678bd6..ee45a444 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -116,18 +116,6 @@
       </plugin>
     </plugins>
   </build>
-  <distributionManagement>
-    <snapshotRepository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </snapshotRepository>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <name>Nexus Release Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
   <profiles>
     <profile>
       <id>sonatype-oss-release</id>

From a2eec52e3046b797e675468440bcb43572cbd7ef Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:56:09 -0700
Subject: [PATCH 269/308] chore: fix snapshot repo url (#349)

* chore: fix snapshot repo url

* chore: fix snapshot repo url
---
 function-maven-plugin/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index ee45a444..c00117ce 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -168,6 +168,7 @@
             <extensions>true</extensions>
             <configuration>
               <publishingServerId>sonatype-central-portal</publishingServerId>
+              <centralSnapshotsUrl>https://central.sonatype.com/repository/maven-snapshots/</centralSnapshotsUrl>
             </configuration>
           </plugin>
         </plugins>

From f9a70f6b082d8d5c82cc2cc1a277b4ff2ca30710 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 11:34:51 -0700
Subject: [PATCH 270/308] chore: fix release (#350)

* chore: fix snapshot repo url

* chore: fix snapshot repo url

* chore: fix release
---
 functions-framework-api/pom.xml | 38 +++++++++++++++++----------------
 invoker/pom.xml                 | 34 +++++++++++++++++++++++------
 2 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 3d6226c7..e9994047 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -41,6 +41,21 @@
     </license>
   </licenses>
 
+  <developers>
+    <developer>
+      <name>Andras Kerekes</name>
+      <email>akerekes@google.com</email>
+      <organization>Google LLC</organization>
+      <organizationUrl>http://www.google.com</organizationUrl>
+    </developer>
+    <developer>
+      <name>Di Xu</name>
+      <email>dixuswe@google.com</email>
+      <organization>Google LLC</organization>
+      <organizationUrl>http://www.google.com</organizationUrl>
+    </developer>
+  </developers>
+
   <scm>
     <connection>scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git</connection>
     <developerConnection>scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git</developerConnection>
@@ -131,18 +146,6 @@
       </plugins>
     </pluginManagement>
   </build>
-  <distributionManagement>
-    <snapshotRepository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
-    </snapshotRepository>
-    <repository>
-      <id>sonatype-nexus-staging</id>
-      <name>Nexus Release Repository</name>
-      <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-    </repository>
-  </distributionManagement>
   <profiles>
     <profile>
       <id>sonatype-oss-release</id>
@@ -189,14 +192,13 @@
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.7.0</version>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
+            <version>0.9.0</version>
             <extensions>true</extensions>
             <configuration>
-              <serverId>sonatype-nexus-snapshots</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+              <publishingServerId>sonatype-central-portal</publishingServerId>
+              <centralSnapshotsUrl>https://central.sonatype.com/repository/maven-snapshots/</centralSnapshotsUrl>
             </configuration>
           </plugin>
         </plugins>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 0800eb37..0698f631 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -24,6 +24,29 @@
     <tag>HEAD</tag>
   </scm>
 
+  <developers>
+    <developer>
+      <name>Andras Kerekes</name>
+      <email>akerekes@google.com</email>
+      <organization>Google LLC</organization>
+      <organizationUrl>http://www.google.com</organizationUrl>
+    </developer>
+    <developer>
+      <name>Di Xu</name>
+      <email>dixuswe@google.com</email>
+      <organization>Google LLC</organization>
+      <organizationUrl>http://www.google.com</organizationUrl>
+    </developer>
+  </developers>
+
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
   <modules>
     <module>core</module>
     <module>testfunction</module>
@@ -105,14 +128,13 @@
             </executions>
           </plugin>
           <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.7.0</version>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
+            <version>0.9.0</version>
             <extensions>true</extensions>
             <configuration>
-              <serverId>sonatype-nexus-snapshots</serverId>
-              <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-              <autoReleaseAfterClose>true</autoReleaseAfterClose>
+              <publishingServerId>sonatype-central-portal</publishingServerId>
+              <centralSnapshotsUrl>https://central.sonatype.com/repository/maven-snapshots/</centralSnapshotsUrl>
             </configuration>
           </plugin>
         </plugins>

From 3a568368dc1b1ce2ab173f7e9df5d6f6a25a2210 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:20:05 -0700
Subject: [PATCH 271/308] chore(main): release java-function-invoker 1.4.2
 (#340)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index e86b66fc..f6e3d0a5 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.4.1","function-maven-plugin":"0.11.1"}
+{"functions-framework-api":"1.1.4","invoker":"1.4.2","function-maven-plugin":"0.11.1"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 9fb244aa..1333434e 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.1...java-function-invoker-v1.4.2) (2025-10-20)
+
+
+### Bug Fixes
+
+* add autovalue plugin config to invoker/core/pom.xml to fix local development ([#339](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/339)) ([4203279](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/420327967b96b4aa66c0edd6753a9d6db781478d))
+
 ## [1.4.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.0...java-function-invoker-v1.4.1) (2025-03-07)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index f882d4ad..ccebd793 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.2-SNAPSHOT</version>
+  <version>1.4.2</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 06dccab1..787341d0 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.2-SNAPSHOT</version>
+  <version>1.4.2</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.2-SNAPSHOT</version>
+      <version>1.4.2</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 0698f631..cd969f0b 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.2-SNAPSHOT</version>
+  <version>1.4.2</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 78df65aa..cca7015d 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>1.4.2</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.2-SNAPSHOT</version>
+  <version>1.4.2</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From ac8dd01013d41fd8236e79252bd089d7ccc4c53e Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:57:38 -0700
Subject: [PATCH 272/308] chore: surpress mvn logging during release (#352)

---
 .kokoro/release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 2804846d..8e1b30b0 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -66,7 +66,7 @@ echo "pwd=$(pwd)"
 # Make sure `JAVA_HOME` is set and using jdk11.
 export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64
 echo "JAVA_HOME=$JAVA_HOME"
-mvn clean deploy -B \
+mvn clean deploy -B -q \
   -P sonatype-oss-release \
   --settings=../settings.xml \
   -Dgpg.executable=gpg \

From 251ef75a105b9f6400edff3d59020846e742c40b Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:09:05 -0700
Subject: [PATCH 273/308] chore(main): release java-function-invoker 1.4.3
 (#351)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index f6e3d0a5..87a47513 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.4.2","function-maven-plugin":"0.11.1"}
+{"functions-framework-api":"1.1.4","invoker":"1.4.3","function-maven-plugin":"0.11.1"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 1333434e..9502293b 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.3](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.2...java-function-invoker-v1.4.3) (2025-10-20)
+
+
+### Bug Fixes
+
+* add autovalue plugin config to invoker/core/pom.xml to fix local development ([#339](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/339)) ([4203279](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/420327967b96b4aa66c0edd6753a9d6db781478d))
+
 ## [1.4.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.1...java-function-invoker-v1.4.2) (2025-10-20)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index ccebd793..3f87d3c5 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.2</version>
+  <version>1.4.3</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 787341d0..3e73e84b 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.2</version>
+  <version>1.4.3</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.2</version>
+      <version>1.4.3</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index cd969f0b..0feb32eb 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.2</version>
+  <version>1.4.3</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index cca7015d..3b619b35 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.2</version>
+  <version>1.4.3</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 0e24d42573d104f8b73921513f6f296ada4a255c Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:31:33 -0700
Subject: [PATCH 274/308] fix: update dependency
 com.google.cloud.functions.invoker to 1.4.3 (#354)

---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index c00117ce..fb12fd9c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.4.1</version>
+      <version>1.4.3</version>
     </dependency>
 
     <dependency>

From 25d8eb70afcfa223aad6a8e52c11d0d1229e82a4 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:37:36 -0700
Subject: [PATCH 275/308] chore(main): release function-maven-plugin 0.11.2
 (#342)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/CHANGELOG.md    | 8 ++++++++
 function-maven-plugin/pom.xml         | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 87a47513..9bc86bf6 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.4.3","function-maven-plugin":"0.11.1"}
+{"functions-framework-api":"1.1.4","invoker":"1.4.3","function-maven-plugin":"0.11.2"}
diff --git a/function-maven-plugin/CHANGELOG.md b/function-maven-plugin/CHANGELOG.md
index f1fbe49a..8b636bc6 100644
--- a/function-maven-plugin/CHANGELOG.md
+++ b/function-maven-plugin/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.11.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.11.1...function-maven-plugin-v0.11.2) (2025-10-21)
+
+
+### Bug Fixes
+
+* several minor fixes ([#341](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/341)) ([e152e0d](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/e152e0d697c1a3f4a90a6480347b4ddf0b73f3e3))
+* update dependency com.google.cloud.functions.invoker to 1.4.3 ([#354](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/354)) ([0e24d42](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/0e24d42573d104f8b73921513f6f296ada4a255c))
+
 ## [0.11.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.11.0...function-maven-plugin-v0.11.1) (2024-11-27)
 
 
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index fb12fd9c..bbd0bfa6 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.11.2-SNAPSHOT</version>
+  <version>0.11.2</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From 8db1dec242d8f7d9a6e789fb08fc6be44cfa02e3 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 14:34:29 -0700
Subject: [PATCH 276/308] chore(main): release java-function-invoker
 1.4.4-SNAPSHOT (#353)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 3f87d3c5..dbb5bbc5 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.3</version>
+    <version>1.4.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.3</version>
+  <version>1.4.4-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 3e73e84b..05af393a 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.3</version>
+    <version>1.4.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.3</version>
+  <version>1.4.4-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -115,7 +115,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.3</version>
+      <version>1.4.4-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 0feb32eb..40185fcf 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.3</version>
+  <version>1.4.4-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 3b619b35..4ce12501 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.3</version>
+    <version>1.4.4-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.3</version>
+  <version>1.4.4-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From b6d37e50ddc482a7095f8203779a9f0d24505c65 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Tue, 21 Oct 2025 14:43:32 -0700
Subject: [PATCH 277/308] chore(main): release function-maven-plugin
 0.11.3-SNAPSHOT (#355)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index bbd0bfa6..a2e96114 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.11.2</version>
+  <version>0.11.3-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From c1f27d289e3b9da2ec936fb4d2197f42a2eaa983 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Wed, 22 Oct 2025 13:52:27 -0700
Subject: [PATCH 278/308] feat!: remove java11 support and expand java21 test
 coverage (#356)

---
 .github/workflows/buildpack-integration-test.yml          | 6 +++---
 .github/workflows/conformance.yaml                        | 3 ++-
 .github/workflows/lint.yaml                               | 2 +-
 .github/workflows/unit.yaml                               | 5 ++---
 .kokoro/release.sh                                        | 2 +-
 CONTRIBUTING.md                                           | 8 ++++----
 function-maven-plugin/pom.xml                             | 4 ++--
 .../com/google/cloud/functions/plugin/DeployFunction.java | 6 +++---
 .../google/cloud/functions/plugin/DeployFunctionTest.java | 2 +-
 functions-framework-api/pom.xml                           | 4 ++--
 invoker/conformance/pom.xml                               | 4 ++--
 invoker/core/pom.xml                                      | 4 ++--
 invoker/pom.xml                                           | 4 ++--
 13 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/buildpack-integration-test.yml b/.github/workflows/buildpack-integration-test.yml
index 41182ce3..c97377e7 100644
--- a/.github/workflows/buildpack-integration-test.yml
+++ b/.github/workflows/buildpack-integration-test.yml
@@ -14,7 +14,7 @@ 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'
@@ -22,8 +22,8 @@ jobs:
       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
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 9b03a3c6..074d8c14 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -14,7 +14,8 @@ jobs:
     strategy:
       matrix:
         java: [
-          11.x,
+          17.x,
+          21.x
         ]
     steps:
     - name: Harden Runner
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 6cc5a37b..3a5860de 100644
--- a/.github/workflows/lint.yaml
+++ b/.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)
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 2826605a..2ddc0a5c 100644
--- a/.github/workflows/unit.yaml
+++ b/.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)
\ No newline at end of file
+      run: (cd invoker/ && mvn test)
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 8e1b30b0..89d7ebcd 100644
--- a/.kokoro/release.sh
+++ b/.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 \
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7e4114c..5d18935a 100644
--- a/CONTRIBUTING.md
+++ b/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:
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index a2e96114..657ce775 100644
--- a/function-maven-plugin/pom.xml
+++ b/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>
diff --git a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
index d0067ded..08bff714 100644
--- a/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
+++ b/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
diff --git a/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
index 2b441d4e..6f107cff 100644
--- a/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
+++ b/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);
   }
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index e9994047..6f4ce316 100644
--- a/functions-framework-api/pom.xml
+++ b/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>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index dbb5bbc5..11a51c29 100644
--- a/invoker/conformance/pom.xml
+++ b/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>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 05af393a..8108c526 100644
--- a/invoker/core/pom.xml
+++ b/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>
 
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 40185fcf..c52aba99 100644
--- a/invoker/pom.xml
+++ b/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>

From 2297f3eb74a461bc226a60c69bf48d33debae73f Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:57:52 -0700
Subject: [PATCH 279/308] chore: fix kokoro java17 setup (#360)

---
 .kokoro/release.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 89d7ebcd..0d7c8b26 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -63,9 +63,14 @@ else
 fi
 echo "pwd=$(pwd)"
 
-# Make sure `JAVA_HOME` is set and using jdk11.
-export JAVA_HOME=/usr/lib/jvm/java-1.17.0-openjdk-amd64
+# Make sure `JAVA_HOME` is set and using jdk17.
+JDK_VERSION=17
+apt-get update
+# Install new JDK version
+apt-get install -y openjdk-"${JDK_VERSION}"-jdk
+export JAVA_HOME="$(update-java-alternatives -l | grep "1.${JDK_VERSION}" | head -n 1 | tr -s " " | cut -d " " -f 3)"
 echo "JAVA_HOME=$JAVA_HOME"
+
 mvn clean deploy -B -q \
   -P sonatype-oss-release \
   --settings=../settings.xml \

From e23f98f2dc7cbcdbd036a46423c99f82bddd80bc Mon Sep 17 00:00:00 2001
From: Lachlan <lachlan@webtide.com>
Date: Thu, 6 Nov 2025 10:26:57 +1100
Subject: [PATCH 280/308] chore(implementation): use Jetty-12.1 core without
 servlets (#333)

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

* chore(implementation)!: use Jetty-12 core without servlets

Port the invoker to upgrade to Eclipse Jetty-12 version 12.  Specifically using the new core APIs of Eclipse Jetty-12 that allow the overhead of a Servlet container to be avoided.

BREAKING CHANGE: use Java 17 or above, as required by Eclipse Jetty-12.

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

---------

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>
---
 invoker/core/pom.xml                          |  18 +-
 .../invoker/BackgroundFunctionExecutor.java   |  60 ++++--
 .../invoker/HttpFunctionExecutor.java         |  24 ++-
 .../invoker/TypedFunctionExecutor.java        |  25 ++-
 .../invoker/gcf/ExecutionIdUtil.java          |   8 +-
 .../invoker/http/HttpRequestImpl.java         | 146 +++++++------
 .../invoker/http/HttpResponseImpl.java        | 199 ++++++++++++++----
 .../functions/invoker/http/HttpUtil.java      |  32 +++
 .../functions/invoker/http/TimeoutFilter.java |  71 -------
 .../invoker/http/TimeoutHandler.java          |  82 ++++++++
 .../functions/invoker/runner/Invoker.java     | 119 +++++------
 .../functions/invoker/IntegrationTest.java    | 129 +++++++++---
 .../functions/invoker/http/HttpTest.java      | 148 +++++++------
 .../invoker/testfunctions/BufferedWrites.java |  27 +++
 14 files changed, 702 insertions(+), 386 deletions(-)
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpUtil.java
 delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java
 create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutHandler.java
 create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BufferedWrites.java

diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 8108c526..d1a94d3d 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -23,6 +23,7 @@
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
+    <jetty.version>12.1.3</jetty.version>
   </properties>
 
   <licenses>
@@ -46,11 +47,6 @@
       <artifactId>functions-framework-api</artifactId>
       <version>1.1.4</version>
     </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
-      <version>4.0.1</version>
-    </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-core</artifactId>
@@ -97,13 +93,13 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-servlet</artifactId>
-      <version>9.4.58.v20250814</version>
+      <artifactId>jetty-server</artifactId>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-server</artifactId>
-      <version>9.4.58.v20250814</version>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <version>2.0.9</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>
@@ -151,7 +147,7 @@
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-client</artifactId>
-      <version>9.4.58.v20250814</version>
+      <version>${jetty.version}</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 331c9586..097b9a67 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -30,25 +30,32 @@
 import io.cloudevents.http.HttpMessageFactory;
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.Reader;
 import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
 import java.time.OffsetDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.Callback;
 
 /** Executes the user's background function. */
-public final class BackgroundFunctionExecutor extends HttpServlet {
+public final class BackgroundFunctionExecutor extends Handler.Abstract {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final FunctionExecutor<?> functionExecutor;
@@ -177,8 +184,13 @@ static Optional<Type> backgroundFunctionTypeArgument(
         .findFirst();
   }
 
-  private static Event parseLegacyEvent(HttpServletRequest req) throws IOException {
-    try (BufferedReader bodyReader = req.getReader()) {
+  private static Event parseLegacyEvent(Request req) throws IOException {
+    try (BufferedReader bodyReader =
+        new BufferedReader(
+            new InputStreamReader(
+                Content.Source.asInputStream(req),
+                Objects.requireNonNullElse(
+                    Request.getCharset(req), StandardCharsets.ISO_8859_1)))) {
       return parseLegacyEvent(bodyReader);
     }
   }
@@ -225,7 +237,7 @@ private static Context contextFromCloudEvent(CloudEvent cloudEvent) {
    * for the various triggers. CloudEvents are ones that follow the standards defined by <a
    * href="https://cloudevents.io">cloudevents.io</a>.
    *
-   * @param <CloudEventDataT> the type to be used in the {@link Unmarshallers} call when
+   * @param <CloudEventDataT> the type to be used in the {code Unmarshallers} call when
    *     unmarshalling this event, if it is a CloudEvent.
    */
   private abstract static class FunctionExecutor<CloudEventDataT> {
@@ -322,23 +334,25 @@ void serviceCloudEvent(CloudEvent cloudEvent) throws Exception {
 
   /** Executes the user's background function. This can handle all HTTP methods. */
   @Override
-  public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
-    String contentType = req.getContentType();
+  public boolean handle(Request req, Response res, Callback callback) throws Exception {
+    String contentType = req.getHeaders().get(HttpHeader.CONTENT_TYPE);
     try {
       executionIdUtil.storeExecutionId(req);
       if ((contentType != null && contentType.startsWith("application/cloudevents+json"))
-          || req.getHeader("ce-specversion") != null) {
+          || req.getHeaders().get("ce-specversion") != null) {
         serviceCloudEvent(req);
       } else {
         serviceLegacyEvent(req);
       }
-      res.setStatus(HttpServletResponse.SC_OK);
+      res.setStatus(HttpStatus.OK_200);
+      callback.succeeded();
     } catch (Throwable t) {
-      res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
       logger.log(Level.SEVERE, "Failed to execute " + functionExecutor.functionName(), t);
+      Response.writeError(req, res, callback, HttpStatus.INTERNAL_SERVER_ERROR_500, null);
     } finally {
       executionIdUtil.removeExecutionId();
     }
+    return true;
   }
 
   private enum CloudEventKind {
@@ -352,10 +366,14 @@ private enum CloudEventKind {
    * @param <CloudEventT> a fake type parameter, which corresponds to the type parameter of {@link
    *     FunctionExecutor}.
    */
-  private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exception {
+  private <CloudEventT> void serviceCloudEvent(Request req) throws Exception {
     @SuppressWarnings("unchecked")
     FunctionExecutor<CloudEventT> executor = (FunctionExecutor<CloudEventT>) functionExecutor;
-    byte[] body = req.getInputStream().readAllBytes();
+
+    // Read the entire request body into a byte array.
+    // TODO: this method is deprecated for removal, use the method introduced by
+    //    https://github.com/jetty/jetty.project/pull/13939 when it is released.
+    byte[] body = Content.Source.asByteArrayAsync(req, -1).get();
     MessageReader reader = HttpMessageFactory.createReaderFromMultimap(headerMap(req), body);
     // It's important not to set the context ClassLoader earlier, because MessageUtils will use
     // ServiceLoader.load(EventFormat.class) to find a handler to deserialize a binary CloudEvent
@@ -369,17 +387,17 @@ private <CloudEventT> void serviceCloudEvent(HttpServletRequest req) throws Exce
     // https://github.com/cloudevents/sdk-java/pull/259.
   }
 
-  private static Map<String, List<String>> headerMap(HttpServletRequest req) {
+  private static Map<String, List<String>> headerMap(Request req) {
     Map<String, List<String>> headerMap = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
-    for (String header : Collections.list(req.getHeaderNames())) {
-      for (String value : Collections.list(req.getHeaders(header))) {
-        headerMap.computeIfAbsent(header, unused -> new ArrayList<>()).add(value);
-      }
+    for (HttpField field : req.getHeaders()) {
+      headerMap
+          .computeIfAbsent(field.getName(), unused -> new ArrayList<>())
+          .addAll(field.getValueList());
     }
     return headerMap;
   }
 
-  private void serviceLegacyEvent(HttpServletRequest req) throws Exception {
+  private void serviceLegacyEvent(Request req) throws Exception {
     Event event = parseLegacyEvent(req);
     runWithContextClassLoader(() -> functionExecutor.serviceLegacyEvent(event));
   }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 01f07e74..b414f110 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -20,12 +20,14 @@
 import com.google.cloud.functions.invoker.http.HttpResponseImpl;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.Callback;
 
 /** Executes the user's method. */
-public class HttpFunctionExecutor extends HttpServlet {
+public class HttpFunctionExecutor extends Handler.Abstract {
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
   private final HttpFunction function;
@@ -65,21 +67,23 @@ public static HttpFunctionExecutor forClass(Class<?> functionClass) {
 
   /** Executes the user's method, can handle all HTTP type methods. */
   @Override
-  public void service(HttpServletRequest req, HttpServletResponse res) {
-    HttpRequestImpl reqImpl = new HttpRequestImpl(req);
-    HttpResponseImpl respImpl = new HttpResponseImpl(res);
+  public boolean handle(Request request, Response response, Callback callback) throws Exception {
+
+    HttpRequestImpl reqImpl = new HttpRequestImpl(request);
+    HttpResponseImpl respImpl = new HttpResponseImpl(response);
     ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
     try {
-      executionIdUtil.storeExecutionId(req);
+      executionIdUtil.storeExecutionId(request);
       Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
       function.service(reqImpl, respImpl);
+      respImpl.close(callback);
     } catch (Throwable t) {
       logger.log(Level.SEVERE, "Failed to execute " + function.getClass().getName(), t);
-      res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      Response.writeError(request, response, callback, HttpStatus.INTERNAL_SERVER_ERROR_500, null);
     } finally {
       Thread.currentThread().setContextClassLoader(oldContextLoader);
       executionIdUtil.removeExecutionId();
-      respImpl.flush();
     }
+    return true;
   }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java
index a6edfc32..63418705 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/TypedFunctionExecutor.java
@@ -15,11 +15,13 @@
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.Callback;
 
-public class TypedFunctionExecutor extends HttpServlet {
+public class TypedFunctionExecutor extends Handler.Abstract {
   private static final String APPLY_METHOD = "apply";
   private static final Logger logger = Logger.getLogger("com.google.cloud.functions.invoker");
 
@@ -94,7 +96,7 @@ static Optional<Type> handlerTypeArgument(Class<? extends TypedFunction<?, ?>> f
 
   /** Executes the user's method, can handle all HTTP type methods. */
   @Override
-  public void service(HttpServletRequest req, HttpServletResponse res) {
+  public boolean handle(Request req, Response res, Callback callback) throws Exception {
     HttpRequestImpl reqImpl = new HttpRequestImpl(req);
     HttpResponseImpl resImpl = new HttpResponseImpl(res);
     ClassLoader oldContextClassLoader = Thread.currentThread().getContextClassLoader();
@@ -102,10 +104,13 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
     try {
       Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
       handleRequest(reqImpl, resImpl);
+      resImpl.close(callback);
+    } catch (Throwable t) {
+      Response.writeError(req, res, callback, HttpStatus.INTERNAL_SERVER_ERROR_500, null, t);
     } finally {
       Thread.currentThread().setContextClassLoader(oldContextClassLoader);
-      resImpl.flush();
     }
+    return true;
   }
 
   private void handleRequest(HttpRequest req, HttpResponse res) {
@@ -114,7 +119,7 @@ private void handleRequest(HttpRequest req, HttpResponse res) {
       reqObj = format.deserialize(req, argType);
     } catch (Throwable t) {
       logger.log(Level.SEVERE, "Failed to parse request for " + function.getClass().getName(), t);
-      res.setStatusCode(HttpServletResponse.SC_BAD_REQUEST);
+      res.setStatusCode(HttpStatus.BAD_REQUEST_400);
       return;
     }
 
@@ -123,7 +128,7 @@ private void handleRequest(HttpRequest req, HttpResponse res) {
       resObj = function.apply(reqObj);
     } catch (Throwable t) {
       logger.log(Level.SEVERE, "Failed to execute " + function.getClass().getName(), t);
-      res.setStatusCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      res.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR_500);
       return;
     }
 
@@ -132,7 +137,7 @@ private void handleRequest(HttpRequest req, HttpResponse res) {
     } catch (Throwable t) {
       logger.log(
           Level.SEVERE, "Failed to serialize response for " + function.getClass().getName(), t);
-      res.setStatusCode(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+      res.setStatusCode(HttpStatus.INTERNAL_SERVER_ERROR_500);
       return;
     }
   }
@@ -147,7 +152,7 @@ private static class GsonWireFormat implements TypedFunction.WireFormat {
     @Override
     public void serialize(Object object, HttpResponse response) throws Exception {
       if (object == null) {
-        response.setStatusCode(HttpServletResponse.SC_NO_CONTENT);
+        response.setStatusCode(HttpStatus.NO_CONTENT_204);
         return;
       }
       try (BufferedWriter bodyWriter = response.getWriter()) {
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java
index 7987317d..becf2c5c 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/ExecutionIdUtil.java
@@ -5,7 +5,7 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
-import javax.servlet.http.HttpServletRequest;
+import org.eclipse.jetty.server.Request;
 
 /**
  * A helper class that either fetches a unique execution id from request HTTP headers or generates a
@@ -23,7 +23,7 @@ public final class ExecutionIdUtil {
    * Add mapping to root logger from current thread id to execution id. This mapping will be used to
    * append the execution id to log lines.
    */
-  public void storeExecutionId(HttpServletRequest request) {
+  public void storeExecutionId(Request request) {
     if (!executionIdLoggingEnabled()) {
       return;
     }
@@ -47,8 +47,8 @@ public void removeExecutionId() {
     }
   }
 
-  private String getOrGenerateExecutionId(HttpServletRequest request) {
-    String executionId = request.getHeader(EXECUTION_ID_HTTP_HEADER);
+  private String getOrGenerateExecutionId(Request request) {
+    String executionId = request.getHeaders().get(EXECUTION_ID_HTTP_HEADER);
     if (executionId == null) {
       byte[] array = new byte[EXECUTION_ID_LENGTH];
       random.nextBytes(array);
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
index 2119645a..31ee4ac6 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
@@ -14,33 +14,33 @@
 
 package com.google.cloud.functions.invoker.http;
 
-import static java.util.stream.Collectors.toMap;
-
 import com.google.cloud.functions.HttpRequest;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.UncheckedIOException;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Part;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.http.MimeTypes;
+import org.eclipse.jetty.http.MultiPart.Part;
+import org.eclipse.jetty.http.MultiPartFormData;
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.util.Fields;
 
 public class HttpRequestImpl implements HttpRequest {
-  private final HttpServletRequest request;
+  private final Request request;
+  private InputStream inputStream;
+  private BufferedReader reader;
 
-  public HttpRequestImpl(HttpServletRequest request) {
+  public HttpRequestImpl(Request request) {
     this.request = request;
   }
 
@@ -51,133 +51,155 @@ public String getMethod() {
 
   @Override
   public String getUri() {
-    String url = request.getRequestURL().toString();
-    if (request.getQueryString() != null) {
-      url += "?" + request.getQueryString();
-    }
-    return url;
+    return request.getHttpURI().asString();
   }
 
   @Override
   public String getPath() {
-    return request.getRequestURI();
+    return request.getHttpURI().getCanonicalPath();
   }
 
   @Override
   public Optional<String> getQuery() {
-    return Optional.ofNullable(request.getQueryString());
+    return Optional.ofNullable(request.getHttpURI().getQuery());
   }
 
   @Override
   public Map<String, List<String>> getQueryParameters() {
-    return request.getParameterMap().entrySet().stream()
-        .collect(toMap(Map.Entry::getKey, e -> Arrays.asList(e.getValue())));
+    Fields fields = Request.extractQueryParameters(request);
+    if (fields.isEmpty()) {
+      return Collections.emptyMap();
+    }
+
+    Map<String, List<String>> map = new HashMap<>();
+    fields.forEach(
+        field -> map.put(field.getName(), Collections.unmodifiableList(field.getValues())));
+    return Collections.unmodifiableMap(map);
   }
 
   @Override
   public Map<String, HttpPart> getParts() {
-    String contentType = request.getContentType();
-    if (contentType == null || !request.getContentType().startsWith("multipart/form-data")) {
+    String contentType = request.getHeaders().get(HttpHeader.CONTENT_TYPE);
+    if (contentType == null
+        || !contentType.startsWith(MimeTypes.Type.MULTIPART_FORM_DATA.asString())) {
       throw new IllegalStateException("Content-Type must be multipart/form-data: " + contentType);
     }
-    try {
-      return request.getParts().stream().collect(toMap(Part::getName, HttpPartImpl::new));
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    } catch (ServletException e) {
-      throw new RuntimeException(e.getMessage(), e);
+
+    // The multipart parsing is done by the EagerContentHandler, so we just call getParts.
+    MultiPartFormData.Parts parts = MultiPartFormData.getParts(request);
+    if (parts == null) {
+      throw new IllegalStateException();
+    }
+
+    if (parts.size() == 0) {
+      return Collections.emptyMap();
     }
+
+    Map<String, HttpPart> map = new HashMap<>();
+    parts.forEach(part -> map.put(part.getName(), new HttpPartImpl(part)));
+    return Collections.unmodifiableMap(map);
   }
 
   @Override
   public Optional<String> getContentType() {
-    return Optional.ofNullable(request.getContentType());
+    return Optional.ofNullable(request.getHeaders().get(HttpHeader.CONTENT_TYPE));
   }
 
   @Override
   public long getContentLength() {
-    return request.getContentLength();
+    return request.getLength();
   }
 
   @Override
   public Optional<String> getCharacterEncoding() {
-    return Optional.ofNullable(request.getCharacterEncoding());
+    Charset charset = Request.getCharset(request);
+    return Optional.ofNullable(charset == null ? null : charset.name());
   }
 
   @Override
   public InputStream getInputStream() throws IOException {
-    return request.getInputStream();
+    if (reader != null) {
+      throw new IllegalStateException("getReader() already called");
+    }
+    if (inputStream == null) {
+      inputStream = Content.Source.asInputStream(request);
+    }
+    return inputStream;
   }
 
   @Override
   public BufferedReader getReader() throws IOException {
-    return request.getReader();
+    if (reader == null) {
+      if (inputStream != null) {
+        throw new IllegalStateException("getInputStream already called");
+      }
+      inputStream = Content.Source.asInputStream(request);
+      reader =
+          new BufferedReader(
+              new InputStreamReader(
+                  getInputStream(),
+                  Objects.requireNonNullElse(Request.getCharset(request), StandardCharsets.UTF_8)));
+    }
+    return reader;
   }
 
   @Override
   public Map<String, List<String>> getHeaders() {
-    return Collections.list(request.getHeaderNames()).stream()
-        .collect(
-            toMap(
-                name -> name,
-                name -> Collections.list(request.getHeaders(name)),
-                (a, b) -> b,
-                () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)));
+    return HttpUtil.toStringListMap(request.getHeaders());
   }
 
   private static class HttpPartImpl implements HttpPart {
     private final Part part;
+    private final String contentType;
 
     private HttpPartImpl(Part part) {
       this.part = part;
+      contentType = part.getHeaders().get(HttpHeader.CONTENT_TYPE);
     }
 
     @Override
     public Optional<String> getFileName() {
-      return Optional.ofNullable(part.getSubmittedFileName());
+      return Optional.ofNullable(part.getFileName());
     }
 
     @Override
     public Optional<String> getContentType() {
-      return Optional.ofNullable(part.getContentType());
+      return Optional.ofNullable(contentType);
     }
 
     @Override
     public long getContentLength() {
-      return part.getSize();
+      return part.getLength();
     }
 
     @Override
     public Optional<String> getCharacterEncoding() {
-      String contentType = getContentType().orElse(null);
-      if (contentType == null) {
-        return Optional.empty();
-      }
-      Pattern charsetPattern = Pattern.compile("(?i).*;\\s*charset\\s*=([^;\\s]*)\\s*(;|$)");
-      Matcher matcher = charsetPattern.matcher(contentType);
-      return matcher.matches() ? Optional.of(matcher.group(1)) : Optional.empty();
+      return Optional.ofNullable(MimeTypes.getCharsetFromContentType(contentType));
     }
 
     @Override
     public InputStream getInputStream() throws IOException {
-      return part.getInputStream();
+      Content.Source contentSource = part.createContentSource();
+      return Content.Source.asInputStream(contentSource);
     }
 
     @Override
     public BufferedReader getReader() throws IOException {
-      String encoding = getCharacterEncoding().orElse("utf-8");
-      return new BufferedReader(new InputStreamReader(getInputStream(), encoding));
+      return new BufferedReader(
+          new InputStreamReader(
+              getInputStream(),
+              Objects.requireNonNullElse(
+                  MimeTypes.DEFAULTS.getCharset(contentType), StandardCharsets.UTF_8)));
     }
 
     @Override
     public Map<String, List<String>> getHeaders() {
-      return part.getHeaderNames().stream()
-          .map(name -> new SimpleEntry<>(name, list(part.getHeaders(name))))
-          .collect(toMap(Map.Entry::getKey, Map.Entry::getValue));
+      return HttpUtil.toStringListMap(part.getHeaders());
     }
 
-    private static <T> List<T> list(Collection<T> collection) {
-      return (collection instanceof List<?>) ? (List<T>) collection : new ArrayList<>(collection);
+    @Override
+    public String toString() {
+      return "%s{%s}".formatted(super.toString(), part);
     }
   }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
index c02246f0..5773de4b 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
@@ -14,24 +14,33 @@
 
 package com.google.cloud.functions.invoker.http;
 
-import static java.util.stream.Collectors.toMap;
-
 import com.google.cloud.functions.HttpResponse;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
+import java.io.Writer;
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
-import java.util.TreeMap;
-import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpHeader;
+import org.eclipse.jetty.io.Content;
+import org.eclipse.jetty.io.WriteThroughWriter;
+import org.eclipse.jetty.io.content.BufferedContentSink;
+import org.eclipse.jetty.io.content.ContentSinkOutputStream;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.Callback;
 
 public class HttpResponseImpl implements HttpResponse {
-  private final HttpServletResponse response;
+  private final Response response;
+  private ContentSinkOutputStream outputStream;
+  private BufferedWriter writer;
+  private Charset charset;
 
-  public HttpResponseImpl(HttpServletResponse response) {
+  public HttpResponseImpl(Response response) {
     this.response = response;
   }
 
@@ -43,75 +52,173 @@ public void setStatusCode(int code) {
   @Override
   @SuppressWarnings("deprecation")
   public void setStatusCode(int code, String message) {
-    response.setStatus(code, message);
+    response.setStatus(code);
   }
 
   @Override
   public void setContentType(String contentType) {
-    response.setContentType(contentType);
+    response.getHeaders().put(HttpHeader.CONTENT_TYPE, contentType);
+    charset = response.getRequest().getContext().getMimeTypes().getCharset(contentType);
   }
 
   @Override
   public Optional<String> getContentType() {
-    return Optional.ofNullable(response.getContentType());
+    return Optional.ofNullable(response.getHeaders().get(HttpHeader.CONTENT_TYPE));
   }
 
   @Override
   public void appendHeader(String key, String value) {
-    response.addHeader(key, value);
+    if (HttpHeader.CONTENT_TYPE.is(key)) {
+      setContentType(value);
+    } else {
+      response.getHeaders().add(key, value);
+    }
   }
 
   @Override
   public Map<String, List<String>> getHeaders() {
-    return response.getHeaderNames().stream()
-        .collect(
-            toMap(
-                name -> name,
-                name -> new ArrayList<>(response.getHeaders(name)),
-                (a, b) -> b,
-                () -> new TreeMap<>(String.CASE_INSENSITIVE_ORDER)));
-  }
-
-  private static <T> List<T> list(Collection<T> collection) {
-    return (collection instanceof List<?>) ? (List<T>) collection : new ArrayList<>(collection);
+    return HttpUtil.toStringListMap(response.getHeaders());
   }
 
   @Override
-  public OutputStream getOutputStream() throws IOException {
-    return response.getOutputStream();
+  public OutputStream getOutputStream() {
+    if (writer != null) {
+      throw new IllegalStateException("getWriter called");
+    }
+    if (outputStream == null) {
+      Request request = response.getRequest();
+      int outputBufferSize =
+          request.getConnectionMetaData().getHttpConfiguration().getOutputBufferSize();
+      BufferedContentSink bufferedContentSink =
+          new BufferedContentSink(
+              response,
+              request.getComponents().getByteBufferPool(),
+              false,
+              outputBufferSize / 2,
+              outputBufferSize);
+
+      // TODO: remove override of close() when changes from
+      //    https://github.com/jetty/jetty.project/pull/13972 are released.
+      outputStream =
+          new ContentSinkOutputStream(bufferedContentSink) {
+            boolean closed = false;
+
+            @Override
+            public void close(Callback callback) throws IOException {
+              if (closed) {
+                callback.succeeded();
+              }
+
+              closed = true;
+              super.close(callback);
+            }
+          };
+    }
+    return outputStream;
   }
 
-  private BufferedWriter writer;
-
   @Override
   public synchronized BufferedWriter getWriter() throws IOException {
     if (writer == null) {
-      // Unfortunately this means that we get two intermediate objects between the object we return
-      // and the underlying Writer that response.getWriter() wraps. We could try accessing the
-      // PrintWriter.out field via reflection, but that sort of access to non-public fields of
-      // platform classes is now frowned on and may draw warnings or even fail in subsequent
-      // versions. We could instead wrap the OutputStream, but that would require us to deduce the
-      // appropriate Charset, using logic like this:
-      // https://github.com/eclipse/jetty.project/blob/923ec38adf/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java#L731
-      // We may end up doing that if performance is an issue.
-      writer = new BufferedWriter(response.getWriter());
+      if (outputStream != null) {
+        throw new IllegalStateException("getOutputStream called");
+      }
+
+      writer =
+          new NonBufferedWriter(
+              WriteThroughWriter.newWriter(
+                  getOutputStream(), Objects.requireNonNullElse(charset, StandardCharsets.UTF_8)));
     }
     return writer;
   }
 
-  public void flush() {
+  /**
+   * Close the response, flushing all content.
+   *
+   * @param callback a {@link Callback} to be completed when the response is closed.
+   */
+  public void close(Callback callback) {
     try {
-      // We can't use HttpServletResponse.flushBuffer() because we wrap the
-      // PrintWriter returned by HttpServletResponse in our own BufferedWriter
-      // to match our API. So we have to flush whichever of getWriter() or
-      // getOutputStream() works.
-      try {
-        getOutputStream().flush();
-      } catch (IllegalStateException e) {
-        getWriter().flush();
+      // The writer has been constructed to do no buffering, so it does not need to be flushed
+      if (outputStream != null) {
+        // Do an asynchronous close, so large buffered content may be written without blocking
+        outputStream.close(callback);
+      } else {
+        callback.succeeded();
       }
     } catch (IOException e) {
-      // Too bad, can't flush.
+      // Too bad, can't close.
+    }
+  }
+
+  /**
+   * A {@link BufferedWriter} that does not buffer. It is generally more efficient to buffer at the
+   * {@link Content.Sink} level, since frequently total content is smaller than a single buffer and
+   * the {@link Content.Sink} can turn a close into a last write that will avoid chunking the
+   * response if at all possible. However, {@link BufferedWriter} is in the API for {@link
+   * HttpResponse}, so we must return a writer of that type.
+   */
+  private static class NonBufferedWriter extends BufferedWriter {
+    private final Writer writer;
+
+    public NonBufferedWriter(Writer out) {
+      super(out, 1);
+      writer = out;
+    }
+
+    @Override
+    public void write(int c) throws IOException {
+      writer.write(c);
+    }
+
+    @Override
+    public void write(char[] cbuf) throws IOException {
+      writer.write(cbuf);
+    }
+
+    @Override
+    public void write(char[] cbuf, int off, int len) throws IOException {
+      writer.write(cbuf, off, len);
+    }
+
+    @Override
+    public void write(String str) throws IOException {
+      writer.write(str);
+    }
+
+    @Override
+    public void write(String str, int off, int len) throws IOException {
+      writer.write(str, off, len);
+    }
+
+    @Override
+    public Writer append(CharSequence csq) throws IOException {
+      return writer.append(csq);
+    }
+
+    @Override
+    public Writer append(CharSequence csq, int start, int end) throws IOException {
+      return writer.append(csq, start, end);
+    }
+
+    @Override
+    public Writer append(char c) throws IOException {
+      return writer.append(c);
+    }
+
+    @Override
+    public void flush() throws IOException {
+      writer.flush();
+    }
+
+    @Override
+    public void close() throws IOException {
+      writer.close();
+    }
+
+    @Override
+    public void newLine() throws IOException {
+      writer.write(System.lineSeparator());
     }
   }
 }
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpUtil.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpUtil.java
new file mode 100644
index 00000000..042af255
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpUtil.java
@@ -0,0 +1,32 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker.http;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import org.eclipse.jetty.http.HttpField;
+import org.eclipse.jetty.http.HttpFields;
+
+class HttpUtil {
+  public static Map<String, List<String>> toStringListMap(HttpFields headers) {
+    Map<String, List<String>> map = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
+    for (HttpField field : headers) {
+      map.computeIfAbsent(field.getName(), key -> new ArrayList<>()).add(field.getValue());
+    }
+    return map;
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java
deleted file mode 100644
index e0577f9b..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutFilter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker.http;
-
-import java.io.IOException;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.logging.Logger;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletResponse;
-
-public class TimeoutFilter implements Filter {
-
-  private static final Logger logger = Logger.getLogger(TimeoutFilter.class.getName());
-  private final int timeoutMs;
-
-  public TimeoutFilter(int timeoutSeconds) {
-    this.timeoutMs = timeoutSeconds * 1000; // Convert seconds to milliseconds
-  }
-
-  @Override
-  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-      throws IOException, ServletException {
-    Timer timer = new Timer(true);
-    TimerTask timeoutTask =
-        new TimerTask() {
-          @Override
-          public void run() {
-            if (response instanceof HttpServletResponse) {
-              try {
-                ((HttpServletResponse) response)
-                    .sendError(HttpServletResponse.SC_REQUEST_TIMEOUT, "Request timed out");
-              } catch (IOException e) {
-                logger.warning("Error while sending HTTP response: " + e.toString());
-              }
-            } else {
-              try {
-                response.getWriter().write("Request timed out");
-              } catch (IOException e) {
-                logger.warning("Error while writing response: " + e.toString());
-              }
-            }
-          }
-        };
-
-    timer.schedule(timeoutTask, timeoutMs);
-
-    try {
-      chain.doFilter(request, response);
-      timeoutTask.cancel();
-    } finally {
-      timer.purge();
-    }
-  }
-}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutHandler.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutHandler.java
new file mode 100644
index 00000000..96295fd2
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/TimeoutHandler.java
@@ -0,0 +1,82 @@
+// Copyright 2025 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.cloud.functions.invoker.http;
+
+import java.time.Duration;
+import java.util.concurrent.atomic.AtomicBoolean;
+import org.eclipse.jetty.http.BadMessageException;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
+import org.eclipse.jetty.util.Callback;
+import org.eclipse.jetty.util.thread.Scheduler;
+
+public class TimeoutHandler extends Handler.Wrapper {
+  private final Duration timeout;
+
+  public TimeoutHandler(int timeoutSeconds, Handler handler) {
+    setHandler(handler);
+    timeout = Duration.ofSeconds(timeoutSeconds);
+  }
+
+  @Override
+  public boolean handle(Request request, Response response, Callback callback) throws Exception {
+    // Wrap the callback to ensure it is only completed once between the
+    // handler and the timeout task.
+    Callback wrappedCallback = new ProtectedCallback(callback);
+    Scheduler.Task timeoutTask =
+        request
+            .getComponents()
+            .getScheduler()
+            .schedule(
+                () ->
+                    wrappedCallback.failed(
+                        new BadMessageException(
+                            HttpStatus.REQUEST_TIMEOUT_408, "Function execution timed out")),
+                timeout);
+
+    // Cancel the timeout if the request completes the callback first.
+    return super.handle(request, response, Callback.from(timeoutTask::cancel, wrappedCallback));
+  }
+
+  private static class ProtectedCallback implements Callback {
+    private final Callback callback;
+    private final AtomicBoolean completed = new AtomicBoolean(false);
+
+    public ProtectedCallback(Callback callback) {
+      this.callback = callback;
+    }
+
+    @Override
+    public void succeeded() {
+      if (completed.compareAndSet(false, true)) {
+        callback.succeeded();
+      }
+    }
+
+    @Override
+    public void failed(Throwable x) {
+      if (completed.compareAndSet(false, true)) {
+        callback.failed(x);
+      }
+    }
+
+    @Override
+    public InvocationType getInvocationType() {
+      return callback.getInvocationType();
+    }
+  }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index da5e72ec..20c3f248 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -25,7 +25,7 @@
 import com.google.cloud.functions.invoker.HttpFunctionExecutor;
 import com.google.cloud.functions.invoker.TypedFunctionExecutor;
 import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
-import com.google.cloud.functions.invoker.http.TimeoutFilter;
+import com.google.cloud.functions.invoker.http.TimeoutHandler;
 import java.io.File;
 import java.io.IOException;
 import java.io.UncheckedIOException;
@@ -39,32 +39,25 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.logging.Handler;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
-import javax.servlet.DispatcherType;
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpStatus;
-import org.eclipse.jetty.server.Connector;
+import org.eclipse.jetty.http.MultiPartConfig;
+import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
-import org.eclipse.jetty.server.handler.HandlerWrapper;
-import org.eclipse.jetty.servlet.FilterHolder;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.handler.EagerContentHandler;
+import org.eclipse.jetty.server.handler.ErrorHandler;
+import org.eclipse.jetty.util.Callback;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 
 /**
@@ -91,7 +84,7 @@ public class Invoker {
       // if we arrange for them to be formatted using StackDriver's "structured
       // logging" JSON format. Remove the JDK's standard logger and replace it with
       // the JSON one.
-      for (Handler handler : rootLogger.getHandlers()) {
+      for (java.util.logging.Handler handler : rootLogger.getHandlers()) {
         rootLogger.removeHandler(handler);
       }
       rootLogger.addHandler(new JsonLogHandler(System.out, false));
@@ -242,7 +235,7 @@ ClassLoader getFunctionClassLoader() {
    * unit or integration test, use {@link #startTestServer()} instead.
    *
    * @see #stopServer()
-   * @throws Exception
+   * @throws Exception If there was a problem starting the server
    */
   public void startServer() throws Exception {
     startServer(true);
@@ -274,7 +267,7 @@ public void startServer() throws Exception {
    * }</pre>
    *
    * @see #stopServer()
-   * @throws Exception
+   * @throws Exception If there was a problem starting the server
    */
   public void startTestServer() throws Exception {
     startServer(false);
@@ -287,34 +280,46 @@ private void startServer(boolean join) throws Exception {
 
     QueuedThreadPool pool = new QueuedThreadPool(1024);
     server = new Server(pool);
+    server.setErrorHandler(
+        new ErrorHandler() {
+          @Override
+          protected void generateResponse(
+              Request request,
+              Response response,
+              int code,
+              String message,
+              Throwable cause,
+              Callback callback) {
+            // Suppress error body
+            callback.succeeded();
+          }
+        });
     ServerConnector connector = new ServerConnector(server);
     connector.setPort(port);
-    server.setConnectors(new Connector[] {connector});
-
-    ServletContextHandler servletContextHandler = new ServletContextHandler();
-    servletContextHandler.setContextPath("/");
-    server.setHandler(NotFoundHandler.forServlet(servletContextHandler));
+    connector.setReuseAddress(true);
+    connector.setReusePort(true);
+    server.addConnector(connector);
 
     Class<?> functionClass = loadFunctionClass();
 
-    HttpServlet servlet;
+    Handler handler;
     if (functionSignatureType == null) {
-      servlet = servletForDeducedSignatureType(functionClass);
+      handler = handlerForDeducedSignatureType(functionClass);
     } else {
       switch (functionSignatureType) {
         case "http":
           if (TypedFunction.class.isAssignableFrom(functionClass)) {
-            servlet = TypedFunctionExecutor.forClass(functionClass);
+            handler = TypedFunctionExecutor.forClass(functionClass);
           } else {
-            servlet = HttpFunctionExecutor.forClass(functionClass);
+            handler = HttpFunctionExecutor.forClass(functionClass);
           }
           break;
         case "event":
         case "cloudevent":
-          servlet = BackgroundFunctionExecutor.forClass(functionClass);
+          handler = BackgroundFunctionExecutor.forClass(functionClass);
           break;
         case "typed":
-          servlet = TypedFunctionExecutor.forClass(functionClass);
+          handler = TypedFunctionExecutor.forClass(functionClass);
           break;
         default:
           String error =
@@ -325,10 +330,18 @@ private void startServer(boolean join) throws Exception {
           throw new RuntimeException(error);
       }
     }
-    ServletHolder servletHolder = new ServletHolder(servlet);
-    servletHolder.getRegistration().setMultipartConfig(new MultipartConfigElement(""));
-    servletContextHandler.addServlet(servletHolder, "/*");
-    servletContextHandler = addTimerFilterForRequestTimeout(servletContextHandler);
+
+    // Possibly wrap with TimeoutHandler if CLOUD_RUN_TIMEOUT_SECONDS is set.
+    handler = addTimerHandlerForRequestTimeout(handler);
+    server.setHandler(handler);
+
+    // Add a handler to asynchronously parse multipart before invoking the function.
+    MultiPartConfig config = new MultiPartConfig.Builder().maxMemoryPartSize(-1).build();
+    EagerContentHandler.MultiPartContentLoaderFactory factory =
+        new EagerContentHandler.MultiPartContentLoaderFactory(config);
+    server.insertHandler(new EagerContentHandler(factory));
+
+    server.insertHandler(new NotFoundHandler());
 
     server.start();
     logServerInfo();
@@ -376,7 +389,7 @@ private Class<?> loadFunctionClass() throws ClassNotFoundException {
     }
   }
 
-  private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
+  private Handler handlerForDeducedSignatureType(Class<?> functionClass) {
     if (HttpFunction.class.isAssignableFrom(functionClass)) {
       return HttpFunctionExecutor.forClass(functionClass);
     }
@@ -398,16 +411,13 @@ private HttpServlet servletForDeducedSignatureType(Class<?> functionClass) {
     throw new RuntimeException(error);
   }
 
-  private ServletContextHandler addTimerFilterForRequestTimeout(
-      ServletContextHandler servletContextHandler) {
+  private Handler addTimerHandlerForRequestTimeout(Handler handler) {
     String timeoutSeconds = System.getenv("CLOUD_RUN_TIMEOUT_SECONDS");
     if (timeoutSeconds == null) {
-      return servletContextHandler;
+      return handler;
     }
     int seconds = Integer.parseInt(timeoutSeconds);
-    FilterHolder holder = new FilterHolder(new TimeoutFilter(seconds));
-    servletContextHandler.addFilter(holder, "/*", EnumSet.of(DispatcherType.REQUEST));
-    return servletContextHandler;
+    return new TimeoutHandler(seconds, handler);
   }
 
   static URL[] classpathToUrls(String classpath) {
@@ -468,32 +478,24 @@ private static boolean isGcf() {
 
   /**
    * Wrapper that intercepts requests for {@code /favicon.ico} and {@code /robots.txt} and causes
-   * them to produce a 404 status. Otherwise they would be sent to the function code, like any other
-   * URL, meaning that someone testing their function by using a browser as an HTTP client can see
-   * two requests, one for {@code /favicon.ico} and one for {@code /} (or whatever).
+   * them to produce a 404 status. Otherwise, they would be sent to the function code, like any
+   * other URL, meaning that someone testing their function by using a browser as an HTTP client can
+   * see two requests, one for {@code /favicon.ico} and one for {@code /} (or whatever).
    */
-  private static class NotFoundHandler extends HandlerWrapper {
-    static NotFoundHandler forServlet(ServletContextHandler servletHandler) {
-      NotFoundHandler handler = new NotFoundHandler();
-      handler.setHandler(servletHandler);
-      return handler;
-    }
+  private static class NotFoundHandler extends Handler.Wrapper {
 
     private static final Set<String> NOT_FOUND_PATHS =
         new HashSet<>(Arrays.asList("/favicon.ico", "/robots.txt"));
 
     @Override
-    public void handle(
-        String target,
-        Request baseRequest,
-        HttpServletRequest request,
-        HttpServletResponse response)
-        throws IOException, ServletException {
-      if (NOT_FOUND_PATHS.contains(request.getRequestURI())) {
-        response.sendError(HttpStatus.NOT_FOUND_404, "Not Found");
-        return;
+    public boolean handle(Request request, Response response, Callback callback) throws Exception {
+      if (NOT_FOUND_PATHS.contains(request.getHttpURI().getCanonicalPath())) {
+        response.setStatus(HttpStatus.NOT_FOUND_404);
+        callback.succeeded();
+        return true;
       }
-      super.handle(target, baseRequest, request, response);
+
+      return super.handle(request, response, callback);
     }
   }
 
@@ -522,7 +524,6 @@ private static class OnlyApiClassLoader extends ClassLoader {
     protected Class<?> findClass(String name) throws ClassNotFoundException {
       String prefix = "com.google.cloud.functions.";
       if ((name.startsWith(prefix) && Character.isUpperCase(name.charAt(prefix.length())))
-          || name.startsWith("javax.servlet.")
           || isCloudEventsApiClass(name)) {
         return runtimeClassLoader.loadClass(name);
       }
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 2f1d8bc8..d6e3b14a 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -47,6 +47,7 @@
 import java.net.URI;
 import java.net.URL;
 import java.net.URLEncoder;
+import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -66,16 +67,17 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.regex.Pattern;
+import org.eclipse.jetty.client.ByteBufferRequestContent;
+import org.eclipse.jetty.client.ContentResponse;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.ContentProvider;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.util.BytesContentProvider;
-import org.eclipse.jetty.client.util.MultiPartContentProvider;
-import org.eclipse.jetty.client.util.StringContentProvider;
+import org.eclipse.jetty.client.MultiPartRequestContent;
+import org.eclipse.jetty.client.Request;
+import org.eclipse.jetty.client.StringRequestContent;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.http.MultiPart;
+import org.eclipse.jetty.http.MultiPart.ContentSourcePart;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
@@ -91,7 +93,7 @@ public class IntegrationTest {
   @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
   @Rule public final TestName testName = new TestName();
 
-  private static final String SERVER_READY_STRING = "Started ServerConnector";
+  private static final String SERVER_READY_STRING = "Started oejs.ServerConnector";
   private static final String EXECUTION_ID_HTTP_HEADER = "HTTP_FUNCTION_EXECUTION_ID";
   private static final String EXECUTION_ID = "1234abcd";
 
@@ -167,10 +169,18 @@ abstract static class TestCase {
 
     abstract String url();
 
-    abstract ContentProvider requestContent();
+    abstract Request.Content requestContent();
 
     abstract int expectedResponseCode();
 
+    /**
+     * Expected response headers map, header name -> value. Value "*" asserts the header is present
+     * with any value. Value "-" asserts the header is not present.
+     *
+     * @return the expected response headers for this test case.
+     */
+    abstract Optional<Map<String, String>> expectedResponseHeaders();
+
     abstract Optional<String> expectedResponseText();
 
     abstract Optional<JsonObject> expectedJson();
@@ -190,6 +200,7 @@ static Builder builder() {
           .setUrl("/")
           .setRequestText("")
           .setExpectedResponseCode(HttpStatus.OK_200)
+          .setExpectedResponseHeaders(ImmutableMap.of())
           .setExpectedResponseText("")
           .setHttpContentType("text/plain")
           .setHttpHeaders(ImmutableMap.of());
@@ -200,14 +211,16 @@ abstract static class Builder {
 
       abstract Builder setUrl(String x);
 
-      abstract Builder setRequestContent(ContentProvider x);
+      abstract Builder setRequestContent(Request.Content x);
 
       Builder setRequestText(String text) {
-        return setRequestContent(new StringContentProvider(text));
+        return setRequestContent(new StringRequestContent(text));
       }
 
       abstract Builder setExpectedResponseCode(int x);
 
+      abstract Builder setExpectedResponseHeaders(Map<String, String> x);
+
       abstract Builder setExpectedResponseText(String x);
 
       abstract Builder setExpectedResponseText(Optional<String> x);
@@ -253,7 +266,10 @@ public void helloWorld() throws Exception {
     testHttpFunction(
         fullTarget("HelloWorld"),
         ImmutableList.of(
-            TestCase.builder().setExpectedResponseText("hello\n").build(),
+            TestCase.builder()
+                .setExpectedResponseHeaders(ImmutableMap.of("Content-Length", "*"))
+                .setExpectedResponseText("hello\n")
+                .build(),
             FAVICON_TEST_CASE,
             ROBOTS_TXT_TEST_CASE));
   }
@@ -286,12 +302,42 @@ public void timeoutHttpTimesOut() throws Exception {
         ImmutableMap.of("CLOUD_RUN_TIMEOUT_SECONDS", "1"));
   }
 
+  @Test
+  public void bufferedWrites() throws Exception {
+    // This test checks that writes are buffered, and are written
+    // in an efficient way with known content-length if possible
+    // instead of doing a chunked response.
+    testHttpFunction(
+        fullTarget("BufferedWrites"),
+        ImmutableList.of(
+            TestCase.builder()
+                .setUrl("/target?writes=2")
+                .setExpectedResponseText("write 0\nwrite 1\n")
+                .setExpectedResponseHeaders(
+                    ImmutableMap.of(
+                        "x-write-0", "true",
+                        "x-write-1", "true",
+                        "x-written", "true",
+                        "Content-Length", "16"))
+                .build(),
+            TestCase.builder()
+                .setUrl("/target?writes=2&flush=true")
+                .setExpectedResponseText("write 0\nwrite 1\n")
+                .setExpectedResponseHeaders(
+                    ImmutableMap.of(
+                        "x-write-0", "true",
+                        "x-write-1", "true",
+                        "x-written", "-",
+                        "Transfer-Encoding", "chunked"))
+                .build()));
+  }
+
   @Test
   public void exceptionHttp() throws Exception {
     String exceptionExpectedOutput =
         "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
             + " \"com/google/cloud/functions/invoker/HttpFunctionExecutor.java\", \"method\":"
-            + " \"service\"}, \"execution_id\": \""
+            + " \"handle\"}, \"execution_id\": \""
             + EXECUTION_ID
             + "\","
             + " \"message\": \"Failed to execute"
@@ -302,6 +348,7 @@ public void exceptionHttp() throws Exception {
         ImmutableList.of(
             TestCase.builder()
                 .setExpectedResponseCode(500)
+                .setExpectedResponseText("")
                 .setHttpHeaders(ImmutableMap.of(EXECUTION_ID_HTTP_HEADER, EXECUTION_ID))
                 .setExpectedOutput(exceptionExpectedOutput)
                 .build()));
@@ -312,7 +359,7 @@ public void exceptionBackground() throws Exception {
     String exceptionExpectedOutput =
         "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
             + " \"com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java\", \"method\":"
-            + " \"service\"}, \"execution_id\": \""
+            + " \"handle\"}, \"execution_id\": \""
             + EXECUTION_ID
             + "\", "
             + "\"message\": \"Failed to execute"
@@ -583,7 +630,7 @@ public void nativeCloudEventException() throws Exception {
     String exceptionExpectedOutput =
         "\"severity\": \"ERROR\", \"logging.googleapis.com/sourceLocation\": {\"file\":"
             + " \"com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java\", \"method\":"
-            + " \"service\"}, \"execution_id\": \""
+            + " \"handle\"}, \"execution_id\": \""
             + EXECUTION_ID
             + "\", "
             + "\"message\": \"Failed to execute"
@@ -632,11 +679,16 @@ public void packageless() throws Exception {
 
   @Test
   public void multipart() throws Exception {
-    MultiPartContentProvider multiPartProvider = new MultiPartContentProvider();
+    MultiPartRequestContent multiPartRequestContent = new MultiPartRequestContent();
     byte[] bytes = new byte[17];
-    multiPartProvider.addFieldPart("bytes", new BytesContentProvider(bytes), new HttpFields());
-    String string = "1234567890";
-    multiPartProvider.addFieldPart("string", new StringContentProvider(string), new HttpFields());
+    multiPartRequestContent.addPart(
+        new ContentSourcePart(
+            "bytes", null, HttpFields.EMPTY, new ByteBufferRequestContent(ByteBuffer.wrap(bytes))));
+    multiPartRequestContent.addPart(
+        new MultiPart.ContentSourcePart(
+            "string", null, HttpFields.EMPTY, new StringRequestContent("1234567890")));
+    multiPartRequestContent.close();
+
     String expectedResponse =
         "part bytes type application/octet-stream length 17\n"
             + "part string type text/plain;charset=UTF-8 length 10\n";
@@ -644,8 +696,8 @@ public void multipart() throws Exception {
         fullTarget("Multipart"),
         ImmutableList.of(
             TestCase.builder()
-                .setHttpContentType(Optional.empty())
-                .setRequestContent(multiPartProvider)
+                .setHttpContentType(multiPartRequestContent.getContentType())
+                .setRequestContent(multiPartRequestContent)
                 .setExpectedResponseText(expectedResponse)
                 .build()));
   }
@@ -782,23 +834,47 @@ private void testFunction(
       throws Exception {
     ServerProcess serverProcess =
         startServer(signatureType, target, extraArgs, environmentVariables);
+    HttpClient httpClient = new HttpClient();
     try {
-      HttpClient httpClient = new HttpClient();
       httpClient.start();
       for (TestCase testCase : testCases) {
         testCase.snoopFile().ifPresent(File::delete);
         String uri = "http://localhost:" + serverPort + testCase.url();
         Request request = httpClient.POST(uri);
-        testCase
-            .httpContentType()
-            .ifPresent(contentType -> request.header(HttpHeader.CONTENT_TYPE, contentType));
-        testCase.httpHeaders().forEach((header, value) -> request.header(header, value));
-        request.content(testCase.requestContent());
+
+        request.headers(
+            headers -> {
+              testCase
+                  .httpContentType()
+                  .ifPresent(contentType -> headers.put(HttpHeader.CONTENT_TYPE, contentType));
+              testCase.httpHeaders().forEach(headers::put);
+            });
+        request.body(testCase.requestContent());
         ContentResponse response = request.send();
         expect
             .withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
             .that(response.getStatus())
             .isEqualTo(testCase.expectedResponseCode());
+        testCase
+            .expectedResponseHeaders()
+            .ifPresent(
+                expectedResponseHeaders -> {
+                  for (Map.Entry<String, String> entry : expectedResponseHeaders.entrySet()) {
+                    if ("*".equals(entry.getValue())) {
+                      expect
+                          .that(response.getHeaders().getFieldNamesCollection())
+                          .contains(entry.getKey());
+                    } else if ("-".equals(entry.getValue())) {
+                      expect
+                          .that(response.getHeaders().getFieldNamesCollection())
+                          .doesNotContain(entry.getKey());
+                    } else {
+                      expect
+                          .that(response.getHeaders().getValuesList(entry.getKey()))
+                          .contains(entry.getValue());
+                    }
+                  }
+                });
         testCase
             .expectedResponseText()
             .ifPresent(text -> expect.that(response.getContentAsString()).isEqualTo(text));
@@ -811,6 +887,7 @@ private void testFunction(
       }
     } finally {
       serverProcess.close();
+      httpClient.stop();
     }
     for (TestCase testCase : testCases) {
       testCase
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
index e0ca4675..a9794cd2 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
@@ -27,6 +27,7 @@
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.ServerSocket;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
@@ -34,22 +35,23 @@
 import java.util.TreeMap;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.client.ByteBufferRequestContent;
+import org.eclipse.jetty.client.ContentResponse;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.ContentResponse;
-import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.util.BytesContentProvider;
-import org.eclipse.jetty.client.util.MultiPartContentProvider;
-import org.eclipse.jetty.client.util.StringContentProvider;
+import org.eclipse.jetty.client.MultiPartRequestContent;
+import org.eclipse.jetty.client.StringRequestContent;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.http.HttpStatus.Code;
+import org.eclipse.jetty.http.MultiPart;
+import org.eclipse.jetty.http.MultiPartConfig;
+import org.eclipse.jetty.server.Handler;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
+import org.eclipse.jetty.server.handler.EagerContentHandler;
+import org.eclipse.jetty.util.Callback;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -81,21 +83,22 @@ public static void allocateServerPort() throws IOException {
   }
 
   /**
-   * Wrapper class that allows us to start a Jetty server with a single servlet for {@code /*}
-   * within a try-with-resources statement. The servlet will be configured to support multipart
+   * Wrapper class that allows us to start a Jetty server with a single handler for {@code /*}
+   * within a try-with-resources statement. The handler will be configured to support multipart
    * requests.
    */
   private static class SimpleServer implements AutoCloseable {
     private final Server server;
 
-    SimpleServer(HttpServlet servlet) throws Exception {
+    SimpleServer(Handler handler) throws Exception {
       this.server = new Server(serverPort);
-      ServletContextHandler context = new ServletContextHandler();
-      context.setContextPath("/");
-      server.setHandler(context);
-      ServletHolder servletHolder = new ServletHolder(servlet);
-      servletHolder.getRegistration().setMultipartConfig(new MultipartConfigElement("tiddly"));
-      context.addServlet(servletHolder, "/*");
+      server.setHandler(handler);
+
+      MultiPartConfig config = new MultiPartConfig.Builder().maxMemoryPartSize(-1).build();
+      EagerContentHandler.MultiPartContentLoaderFactory factory =
+          new EagerContentHandler.MultiPartContentLoaderFactory(config);
+      server.insertHandler(new EagerContentHandler(factory));
+
       server.start();
     }
 
@@ -112,16 +115,16 @@ private interface HttpRequestTest {
 
   /**
    * Tests methods on the {@link HttpRequest} object while the request is being serviced. We are not
-   * guaranteed that the underlying {@link HttpServletRequest} object will still be valid when the
-   * request completes, and in fact in Jetty it isn't. So we perform the checks in the context of
-   * the servlet, and report any exception back to the test method.
+   * guaranteed that the underlying {@link Request} object will still be valid when the request
+   * completes, and in fact in Jetty it isn't. So we perform the checks in the context of the
+   * handler, and report any exception back to the test method.
    */
   @Test
   public void httpRequestMethods() throws Exception {
     AtomicReference<HttpRequestTest> testReference = new AtomicReference<>();
     AtomicReference<Throwable> exceptionReference = new AtomicReference<>();
-    HttpRequestServlet testServlet = new HttpRequestServlet(testReference, exceptionReference);
-    try (SimpleServer server = new SimpleServer(testServlet)) {
+    HttpRequestHandler testHandler = new HttpRequestHandler(testReference, exceptionReference);
+    try (SimpleServer server = new SimpleServer(testHandler)) {
       httpRequestMethods(testReference, exceptionReference);
     }
   }
@@ -192,14 +195,17 @@ private void httpRequestMethods(
     };
     for (HttpRequestTest test : tests) {
       testReference.set(test);
-      Request request =
+      org.eclipse.jetty.client.Request request =
           httpClient
               .POST(uri)
-              .header(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8")
-              .header("foo", "bar")
-              .header("foo", "baz")
-              .header("CaSe-SeNsItIvE", "VaLuE")
-              .content(new StringContentProvider(TEST_BODY));
+              .headers(
+                  m -> {
+                    m.add(HttpHeader.CONTENT_TYPE, "text/plain; charset=utf-8");
+                    m.add("foo", "bar");
+                    m.add("foo", "baz");
+                    m.add("CaSe-SeNsItIvE", "VaLuE");
+                  })
+              .body(new StringRequestContent(TEST_BODY));
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());
@@ -222,8 +228,8 @@ public void emptyRequest() throws Exception {
         };
     AtomicReference<Throwable> exceptionReference = new AtomicReference<>();
     AtomicReference<HttpRequestTest> testReference = new AtomicReference<>(test);
-    HttpRequestServlet testServlet = new HttpRequestServlet(testReference, exceptionReference);
-    try (SimpleServer server = new SimpleServer(testServlet)) {
+    HttpRequestHandler testHandler = new HttpRequestHandler(testReference, exceptionReference);
+    try (SimpleServer server = new SimpleServer(testHandler)) {
       ContentResponse response = httpClient.POST(uri).send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());
@@ -239,20 +245,24 @@ private void validateReader(BufferedReader reader) {
   public void multiPartRequest() throws Exception {
     AtomicReference<HttpRequestTest> testReference = new AtomicReference<>();
     AtomicReference<Throwable> exceptionReference = new AtomicReference<>();
-    HttpRequestServlet testServlet = new HttpRequestServlet(testReference, exceptionReference);
+    HttpRequestHandler testHandler = new HttpRequestHandler(testReference, exceptionReference);
     HttpClient httpClient = new HttpClient();
     httpClient.start();
     String uri = "http://localhost:" + serverPort + "/";
-    MultiPartContentProvider multiPart = new MultiPartContentProvider();
-    HttpFields textHttpFields = new HttpFields();
-    textHttpFields.add("foo", "bar");
-    multiPart.addFieldPart("text", new StringContentProvider(TEST_BODY), textHttpFields);
-    HttpFields bytesHttpFields = new HttpFields();
-    bytesHttpFields.add("foo", "baz");
-    bytesHttpFields.add("foo", "buh");
+    MultiPartRequestContent multiPart = new MultiPartRequestContent();
+    HttpFields textHttpFields = HttpFields.build().add("foo", "bar");
+    multiPart.addPart(
+        new MultiPart.ContentSourcePart(
+            "text", null, textHttpFields, new StringRequestContent(TEST_BODY)));
+    HttpFields.Mutable bytesHttpFields = HttpFields.build().add("foo", "baz").add("foo", "buh");
     assertThat(bytesHttpFields.getValuesList("foo")).containsExactly("baz", "buh");
-    multiPart.addFilePart(
-        "binary", "/tmp/binary.x", new BytesContentProvider(RANDOM_BYTES), bytesHttpFields);
+    multiPart.addPart(
+        new MultiPart.ContentSourcePart(
+            "binary",
+            "/tmp/binary.x",
+            bytesHttpFields,
+            new ByteBufferRequestContent(ByteBuffer.wrap(RANDOM_BYTES))));
+    multiPart.close();
     HttpRequestTest test =
         request -> {
           // The Content-Type header will also have a boundary=something attribute.
@@ -271,10 +281,9 @@ public void multiPartRequest() throws Exception {
           assertThat(bytesPart.getFileName()).hasValue("/tmp/binary.x");
           assertThat(bytesPart.getContentLength()).isEqualTo(RANDOM_BYTES.length);
           assertThat(bytesPart.getContentType()).hasValue("application/octet-stream");
-          // We only see ["buh"] here, not ["baz", "buh"], apparently due to a Jetty bug.
-          // Repeated headers on multi-part content are not a big problem anyway.
           List<String> foos = bytesPart.getHeaders().get("foo");
-          assertThat(foos).contains("buh");
+          assertThat(foos).containsExactly("baz", "buh");
+
           byte[] bytes = new byte[RANDOM_BYTES.length];
           try (InputStream inputStream = bytesPart.getInputStream()) {
             assertThat(inputStream.read(bytes)).isEqualTo(bytes.length);
@@ -282,20 +291,21 @@ public void multiPartRequest() throws Exception {
             assertThat(bytes).isEqualTo(RANDOM_BYTES);
           }
         };
-    try (SimpleServer server = new SimpleServer(testServlet)) {
+    try (SimpleServer server = new SimpleServer(testHandler)) {
       testReference.set(test);
-      Request request = httpClient.POST(uri).header("foo", "oof").content(multiPart);
+      org.eclipse.jetty.client.Request request =
+          httpClient.POST(uri).headers(m -> m.put("foo", "oof")).body(multiPart);
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());
     }
   }
 
-  private static class HttpRequestServlet extends HttpServlet {
+  private static class HttpRequestHandler extends Handler.Abstract {
     private final AtomicReference<HttpRequestTest> testReference;
     private final AtomicReference<Throwable> exceptionReference;
 
-    private HttpRequestServlet(
+    private HttpRequestHandler(
         AtomicReference<HttpRequestTest> testReference,
         AtomicReference<Throwable> exceptionReference) {
       this.testReference = testReference;
@@ -303,12 +313,15 @@ private HttpRequestServlet(
     }
 
     @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
+    public boolean handle(Request request, Response response, Callback callback) {
       try {
-        testReference.get().test(new HttpRequestImpl(req));
+        testReference.get().test(new HttpRequestImpl(request));
       } catch (Throwable t) {
         exceptionReference.set(t);
+        Response.writeError(request, response, callback, t);
       }
+      callback.succeeded();
+      return true;
     }
   }
 
@@ -326,8 +339,8 @@ private interface HttpResponseTest {
   public void httpResponseSetAndGet() throws Exception {
     AtomicReference<HttpResponseTest> testReference = new AtomicReference<>();
     AtomicReference<Throwable> exceptionReference = new AtomicReference<>();
-    HttpResponseServlet testServlet = new HttpResponseServlet(testReference, exceptionReference);
-    try (SimpleServer server = new SimpleServer(testServlet)) {
+    HttpResponseHandler testHandler = new HttpResponseHandler(testReference, exceptionReference);
+    try (SimpleServer server = new SimpleServer(testHandler)) {
       httpResponseSetAndGet(testReference, exceptionReference);
     }
   }
@@ -349,8 +362,7 @@ private void httpResponseSetAndGet(
             .containsAtLeast("Content-Type", Arrays.asList("application/octet-stream"));
       },
       response -> {
-        Map<String, List<String>> initialHeaders = response.getHeaders();
-        // The servlet spec says this should be empty, but actually we get a Date header here.
+        // The fields are initialized with a Date header as per the HTTP RFCs.
         // So we just check that we can add our own headers.
         response.appendHeader("foo", "bar");
         response.appendHeader("wibbly", "wobbly");
@@ -365,18 +377,18 @@ private void httpResponseSetAndGet(
       HttpClient httpClient = new HttpClient();
       httpClient.start();
       String uri = "http://localhost:" + serverPort;
-      Request request = httpClient.POST(uri);
+      org.eclipse.jetty.client.Request request = httpClient.POST(uri);
       ContentResponse response = request.send();
       assertThat(response.getStatus()).isEqualTo(HttpStatus.OK_200);
       throwIfNotNull(exceptionReference.get());
     }
   }
 
-  private static class HttpResponseServlet extends HttpServlet {
+  private static class HttpResponseHandler extends Handler.Abstract {
     private final AtomicReference<HttpResponseTest> testReference;
     private final AtomicReference<Throwable> exceptionReference;
 
-    private HttpResponseServlet(
+    private HttpResponseHandler(
         AtomicReference<HttpResponseTest> testReference,
         AtomicReference<Throwable> exceptionReference) {
       this.testReference = testReference;
@@ -384,12 +396,15 @@ private HttpResponseServlet(
     }
 
     @Override
-    protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
+    public boolean handle(Request request, Response response, Callback callback) {
       try {
-        testReference.get().test(new HttpResponseImpl(resp));
+        testReference.get().test(new HttpResponseImpl(response));
+        callback.succeeded();
       } catch (Throwable t) {
         exceptionReference.set(t);
+        Response.writeError(request, response, callback, t);
       }
+      return true;
     }
   }
 
@@ -416,15 +431,15 @@ private static ResponseTest responseTest(
   /**
    * Tests that operations on the {@link HttpResponse} have the appropriate effect on the HTTP
    * response that ends up being sent. Here, for each check, we have two operations: the operation
-   * on the {@link HttpResponse}, which happens inside the servlet, and the operation to check the
+   * on the {@link HttpResponse}, which happens inside the handler, and the operation to check the
    * HTTP result, which happens in the client thread.
    */
   @Test
   public void httpResponseEffects() throws Exception {
     AtomicReference<HttpResponseTest> testReference = new AtomicReference<>();
     AtomicReference<Throwable> exceptionReference = new AtomicReference<>();
-    HttpResponseServlet testServlet = new HttpResponseServlet(testReference, exceptionReference);
-    try (SimpleServer server = new SimpleServer(testServlet)) {
+    HttpResponseHandler testHandler = new HttpResponseHandler(testReference, exceptionReference);
+    try (SimpleServer server = new SimpleServer(testHandler)) {
       httpResponseEffects(testReference, exceptionReference);
     }
   }
@@ -447,7 +462,8 @@ private void httpResponseEffects(
           response -> response.setStatusCode(HttpStatus.IM_A_TEAPOT_418, "Je suis une théière"),
           response -> {
             assertThat(response.getStatus()).isEqualTo(HttpStatus.IM_A_TEAPOT_418);
-            assertThat(response.getReason()).isEqualTo("Je suis une théière");
+            // Reason string cannot be set by the application.
+            assertThat(response.getReason()).isEqualTo(Code.IM_A_TEAPOT.getMessage());
           }),
       responseTest(
           response -> response.setContentType("application/noddy"),
@@ -490,7 +506,7 @@ private void httpResponseEffects(
       HttpClient httpClient = new HttpClient();
       httpClient.start();
       String uri = "http://localhost:" + serverPort;
-      Request request = httpClient.POST(uri);
+      org.eclipse.jetty.client.Request request = httpClient.POST(uri);
       ContentResponse response = request.send();
       throwIfNotNull(exceptionReference.get());
       test.responseCheck.test(response);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BufferedWrites.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BufferedWrites.java
new file mode 100644
index 00000000..a7989a74
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BufferedWrites.java
@@ -0,0 +1,27 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import java.io.BufferedWriter;
+import java.util.List;
+import java.util.Map;
+
+public class BufferedWrites implements HttpFunction {
+  @Override
+  public void service(HttpRequest request, HttpResponse response) throws Exception {
+    Map<String, List<String>> queryParameters = request.getQueryParameters();
+    int writes = Integer.parseInt(request.getFirstQueryParameter("writes").orElse("0"));
+    boolean flush = Boolean.parseBoolean(request.getFirstQueryParameter("flush").orElse("false"));
+
+    BufferedWriter writer = response.getWriter();
+    for (int i = 0; i < writes; i++) {
+      response.appendHeader("x-write-" + i, "true");
+      writer.write("write " + i + "\n");
+    }
+    if (flush) {
+      writer.flush();
+    }
+    response.appendHeader("x-written", "true");
+  }
+}

From 3fb1c02a3dbb7773b306e3877167980afe907bc4 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 5 Nov 2025 23:32:46 +0000
Subject: [PATCH 281/308] chore(deps): update actions/setup-java action to v5
 (#363)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/unit.yaml        | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 074d8c14..08529f77 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -35,7 +35,7 @@ jobs:
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 3a5860de..4457b8fa 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -22,7 +22,7 @@ jobs:
           repo.maven.apache.org:443
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         java-version: 17.x
         distribution: temurin
@@ -44,7 +44,7 @@ jobs:
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # v2 minimum required
       - name: Set up JDK
-        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
         with:
           java-version: 21.x
           distribution: temurin
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 2ddc0a5c..d6b8e3c6 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -29,7 +29,7 @@ jobs:
           *.githubusercontent.com:443
     - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
+      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin

From 1ff16ba426c4605c4a23313bae111e6ccc071736 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Wed, 5 Nov 2025 23:38:04 +0000
Subject: [PATCH 282/308] chore(deps): update all non-major dependencies (#362)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/codeql.yml       | 6 +++---
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/scorecard.yml    | 4 ++--
 .github/workflows/unit.yaml        | 2 +-
 function-maven-plugin/pom.xml      | 6 +++---
 invoker/conformance/pom.xml        | 2 +-
 invoker/core/pom.xml               | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 32d7e54e..ef1c713e 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
       with:
         disable-sudo: true
         egress-policy: block
@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+      uses: github/codeql-action/init@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -65,6 +65,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+      uses: github/codeql-action/analyze@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 08529f77..cbc4fb6b 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 4457b8fa..b492004f 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
       with:
         disable-sudo: true
         egress-policy: block
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index a6b8e986..1fab1ae1 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
         with:
           disable-sudo: true
           egress-policy: block
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3.30.6
+        uses: github/codeql-action/upload-sarif@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index d6b8e3c6..0468a01f 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
+      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 657ce775..9a841b16 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -68,7 +68,7 @@
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
       <artifactId>maven-plugin-annotations</artifactId>
-      <version>3.15.1</version>
+      <version>3.15.2</version>
       <scope>provided</scope>
     </dependency>
 
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.8.3</version>
+      <version>2.8.4</version>
       <type>jar</type>
     </dependency>
 
@@ -104,7 +104,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>3.15.1</version>
+        <version>3.15.2</version>
         <executions>
           <execution>
             <id>help-goal</id>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 11a51c29..8a1af674 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -53,7 +53,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.11.1</version>
+          <version>0.11.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index d1a94d3d..a6d2fe13 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -99,7 +99,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
-      <version>2.0.9</version>
+      <version>2.0.17</version>
     </dependency>
     <dependency>
       <groupId>com.beust</groupId>

From a868a62a803bf9c1ff450295838db98a1e873d19 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:04:57 -0800
Subject: [PATCH 283/308] chore(main): release functions-framework-api 2.0.0
 (#357)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 functions-framework-api/CHANGELOG.md  | 11 +++++++++++
 functions-framework-api/pom.xml       |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 9bc86bf6..4a932202 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"1.1.4","invoker":"1.4.3","function-maven-plugin":"0.11.2"}
+{"functions-framework-api":"2.0.0","invoker":"1.4.3","function-maven-plugin":"0.11.2"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index b97246fe..f588d527 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## [2.0.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.4...functions-framework-api-v2.0.0) (2025-11-05)
+
+
+### ⚠ BREAKING CHANGES
+
+* remove java11 support and expand java21 test coverage ([#356](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/356))
+
+### Features
+
+* remove java11 support and expand java21 test coverage ([#356](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/356)) ([c1f27d2](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/c1f27d289e3b9da2ec936fb4d2197f42a2eaa983))
+
 ## [1.1.4](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.3...functions-framework-api-v1.1.4) (2024-11-22)
 
 
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 6f4ce316..06fb4f2a 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>1.1.5-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

From daa0cc51f6e79c552dfde785d3519526d6cd4041 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Wed, 5 Nov 2025 16:48:43 -0800
Subject: [PATCH 284/308] chore: fix project metadata in poms (#366)

---
 function-maven-plugin/pom.xml   | 2 +-
 functions-framework-api/pom.xml | 3 +++
 invoker/conformance/pom.xml     | 2 +-
 invoker/core/pom.xml            | 1 +
 invoker/pom.xml                 | 2 +-
 invoker/testfunction/pom.xml    | 3 ++-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 9a841b16..8c8036d9 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -14,7 +14,7 @@
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>
-  <url>http://maven.apache.org</url>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
 
   <scm>
     <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 06fb4f2a..aceb7a79 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -25,6 +25,9 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
   <version>2.0.0</version>
+  <name>Functions Framework Java API</name>
+  <description>An open source FaaS (Function as a service) framework for writing portable Java functions.</description>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 8a1af674..5e537771 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -16,7 +16,7 @@
     A GCF project used to validate conformance to the Functions Framework contract
     using the Functions Framework Conformance tools.
   </description>
-  <url>https://github.com/GoogleCloudPlatform/functions-framework-conformance</url>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index a6d2fe13..e21b61f3 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -16,6 +16,7 @@
     complete HTTP server that interprets incoming HTTP requests appropriately
     and forwards them to the function code.
   </description>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index c52aba99..9d936ef8 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -15,7 +15,7 @@
     Parent POM for the GCF Java Invoker. The project is structured like this so
     that we can have modules that build jar files for use in tests.
   </description>
-  <url>https://github.com/GoogleCloudPlatform/functions-framework-java/tree/main/invoker</url>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
 
   <scm>
     <url>http://github.com/GoogleCloudPlatform/functions-framework-java</url>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 4ce12501..fad3df07 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -14,6 +14,7 @@
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.
   </description>
+  <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>
 
   <dependencies>
     <dependency>
@@ -93,4 +94,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>

From f351c1ade94a08bc4116b40e2d343e1b5d9a6db6 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Wed, 5 Nov 2025 17:05:25 -0800
Subject: [PATCH 285/308] chore!: update functions-framework-api dependency to
 2.0.0 (#365)

---
 invoker/conformance/pom.xml  | 2 +-
 invoker/core/pom.xml         | 2 +-
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 5e537771..e5f39c82 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -28,7 +28,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.4</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index e21b61f3..7fa923a8 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -46,7 +46,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.4</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>io.cloudevents</groupId>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 9d936ef8..b449fa4c 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -65,7 +65,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>1.1.4</version>
+        <version>2.0.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index fad3df07..a0613c87 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -20,7 +20,7 @@
     <dependency>
       <groupId>com.google.cloud.functions</groupId>
       <artifactId>functions-framework-api</artifactId>
-      <version>1.1.4</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <!-- We don't actually use this; we just check that its classes can be

From b536258cd86c2d18bc1eeb9d3f4010380e6dc99d Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 08:15:09 -0800
Subject: [PATCH 286/308] chore(main): release java-function-invoker 2.0.0
 (#359)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 invoker/CHANGELOG.md                  | 19 +++++++++++++++++++
 invoker/conformance/pom.xml           |  4 ++--
 invoker/core/pom.xml                  |  6 +++---
 invoker/pom.xml                       |  2 +-
 invoker/testfunction/pom.xml          |  4 ++--
 6 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 4a932202..ee1033b3 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"2.0.0","invoker":"1.4.3","function-maven-plugin":"0.11.2"}
+{"functions-framework-api":"2.0.0","invoker":"2.0.0","function-maven-plugin":"0.11.2"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index 9502293b..c732e50c 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,24 @@
 # Changelog
 
+## [2.0.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.3...java-function-invoker-v2.0.0) (2025-11-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* update functions-framework-api dependency to 2.0.0 ([#365](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/365))
+* **implementation:** use Java 17 or above, as required by Eclipse Jetty-12.
+* remove java11 support and expand java21 test coverage ([#356](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/356))
+
+### Features
+
+* remove java11 support and expand java21 test coverage ([#356](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/356)) ([c1f27d2](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/c1f27d289e3b9da2ec936fb4d2197f42a2eaa983))
+
+
+### Miscellaneous Chores
+
+* **implementation:** use Jetty-12.1 core without servlets ([#333](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/333)) ([e23f98f](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/e23f98f2dc7cbcdbd036a46423c99f82bddd80bc))
+* update functions-framework-api dependency to 2.0.0 ([#365](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/365)) ([f351c1a](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/f351c1ade94a08bc4116b40e2d343e1b5d9a6db6))
+
 ## [1.4.3](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.2...java-function-invoker-v1.4.3) (2025-10-20)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index e5f39c82..46518398 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>1.4.4-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>1.4.4-SNAPSHOT</version>
+  <version>2.0.0</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 7fa923a8..d9ff5070 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.4-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>1.4.4-SNAPSHOT</version>
+  <version>2.0.0</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>1.4.4-SNAPSHOT</version>
+      <version>2.0.0</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b449fa4c..ea84bbc7 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>1.4.4-SNAPSHOT</version>
+  <version>2.0.0</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index a0613c87..dac28bf7 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>1.4.4-SNAPSHOT</version>
+    <version>2.0.0</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>1.4.4-SNAPSHOT</version>
+  <version>2.0.0</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 9dd6008b254d7188a675e40f6ff234b82b07a11b Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Thu, 6 Nov 2025 08:52:06 -0800
Subject: [PATCH 287/308] chore!: update functions-framework-invoker dependency
 version to 2.0.0 for ff maven plugin (#368)

* chore: fix project metadata in poms

* chore!: update functions-framework-invoker dependency version to 2.0.0 for ff maven plugin
---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 8c8036d9..b3256a9b 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>1.4.3</version>
+      <version>2.0.0</version>
     </dependency>
 
     <dependency>

From 8ac76be47506213c6c0f544bca0187932f2ce723 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 09:01:56 -0800
Subject: [PATCH 288/308] chore(main): release function-maven-plugin 1.0.0
 (#358)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json |  2 +-
 function-maven-plugin/CHANGELOG.md    | 17 +++++++++++++++++
 function-maven-plugin/pom.xml         |  2 +-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index ee1033b3..3ba911b3 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"2.0.0","invoker":"2.0.0","function-maven-plugin":"0.11.2"}
+{"functions-framework-api":"2.0.0","invoker":"2.0.0","function-maven-plugin":"1.0.0"}
diff --git a/function-maven-plugin/CHANGELOG.md b/function-maven-plugin/CHANGELOG.md
index 8b636bc6..7d3a2345 100644
--- a/function-maven-plugin/CHANGELOG.md
+++ b/function-maven-plugin/CHANGELOG.md
@@ -1,5 +1,22 @@
 # Changelog
 
+## [1.0.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.11.2...function-maven-plugin-v1.0.0) (2025-11-06)
+
+
+### ⚠ BREAKING CHANGES
+
+* update functions-framework-invoker dependency version to 2.0.0 for ff maven plugin ([#368](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/368))
+* remove java11 support and expand java21 test coverage ([#356](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/356))
+
+### Features
+
+* remove java11 support and expand java21 test coverage ([#356](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/356)) ([c1f27d2](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/c1f27d289e3b9da2ec936fb4d2197f42a2eaa983))
+
+
+### Miscellaneous Chores
+
+* update functions-framework-invoker dependency version to 2.0.0 for ff maven plugin ([#368](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/368)) ([9dd6008](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/9dd6008b254d7188a675e40f6ff234b82b07a11b))
+
 ## [0.11.2](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.11.1...function-maven-plugin-v0.11.2) (2025-10-21)
 
 
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index b3256a9b..13ccd43f 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>0.11.3-SNAPSHOT</version>
+  <version>1.0.0</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From b366d60e4fbf08a045268535cea72c78f512dd27 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:40:06 -0800
Subject: [PATCH 289/308] chore(main): release functions-framework-api
 2.0.1-SNAPSHOT (#364)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index aceb7a79..09f65352 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1-SNAPSHOT</version>
   <name>Functions Framework Java API</name>
   <description>An open source FaaS (Function as a service) framework for writing portable Java functions.</description>
   <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>

From 06e211e2979e3672d27f0b46aef427c00612ad7e Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:45:16 -0800
Subject: [PATCH 290/308] chore(main): release java-function-invoker
 2.0.1-SNAPSHOT (#367)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 46518398..634c490b 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index d9ff5070..4ab569b2 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index ea84bbc7..7147e099 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index dac28bf7..994c4326 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>2.0.0</version>
+    <version>2.0.1-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>2.0.0</version>
+  <version>2.0.1-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From de202439e223dcb48e3a3319e4c0d57adc450ec8 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:49:54 -0800
Subject: [PATCH 291/308] chore(main): release function-maven-plugin
 1.0.1-SNAPSHOT (#369)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 13ccd43f..2278ae09 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.0.0</version>
+  <version>1.0.1-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From cec53c07041ade8854ba69fa80ab30562669b4a5 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 6 Feb 2026 03:36:51 +0000
Subject: [PATCH 292/308] chore(deps): update dependency
 com.google.cloud.functions:function-maven-plugin to v1 (#373)

---
 invoker/conformance/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 634c490b..a4d4e5f8 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -53,7 +53,7 @@
         <plugin>
           <groupId>com.google.cloud.functions</groupId>
           <artifactId>function-maven-plugin</artifactId>
-          <version>0.11.2</version>
+          <version>1.0.0</version>
         </plugin>
       </plugins>
     </pluginManagement>

From a8df10013464583f8d56b06ef679d3f6601737e1 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 6 Feb 2026 03:41:30 +0000
Subject: [PATCH 293/308] chore(deps): update all non-major dependencies (#370)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/codeql.yml       |  8 ++++----
 .github/workflows/conformance.yaml |  8 ++++----
 .github/workflows/lint.yaml        | 12 ++++++------
 .github/workflows/scorecard.yml    |  6 +++---
 .github/workflows/unit.yaml        |  6 +++---
 function-maven-plugin/pom.xml      |  8 ++++----
 functions-framework-api/pom.xml    |  6 +++---
 invoker/core/pom.xml               | 14 +++++++-------
 invoker/pom.xml                    |  2 +-
 invoker/testfunction/pom.xml       |  2 +-
 10 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index ef1c713e..5773a8e4 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -43,11 +43,11 @@ jobs:
           uploads.github.com:443
 
     - name: Checkout repository
-      uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+      uses: github/codeql-action/init@2588666de8825e1e9dc4e2329a4c985457d55b32 # v3.32.1
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -65,6 +65,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+      uses: github/codeql-action/analyze@2588666de8825e1e9dc4e2329a4c985457d55b32 # v3.32.1
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index cbc4fb6b..28fa9a0b 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -32,16 +32,16 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
 
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
+      uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
       with:
         go-version: '1.25'
 
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index b492004f..aa37cb55 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,16 +13,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
       with:
         disable-sudo: true
         egress-policy: block
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         java-version: 17.x
         distribution: temurin
@@ -38,13 +38,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0 # v2 minimum required
+      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # v2 minimum required
       - name: Set up JDK
-        uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+        uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
           java-version: 21.x
           distribution: temurin
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 1fab1ae1..85c605cd 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
         with:
           disable-sudo: true
           egress-policy: block
@@ -45,7 +45,7 @@ jobs:
             *.github.com:443
 
       - name: "Checkout code"
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
         with:
           persist-credentials: false
 
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@5d5cd550d3e189c569da8f16ea8de2d821c9bf7a # v3.31.2
+        uses: github/codeql-action/upload-sarif@2588666de8825e1e9dc4e2329a4c985457d55b32 # v3.32.1
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 0468a01f..84b44f4d 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@95d9a5deda9de15063e7595e9719c11c38c90ae2 # v2.13.2
+      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
       with:
         disable-sudo: true
         egress-policy: block
@@ -27,9 +27,9 @@ jobs:
           repo.maven.apache.org:443
           api.adoptium.net:443
           *.githubusercontent.com:443
-    - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
     - name: Set up JDK ${{ matrix.java }}
-      uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 # v5.0.0
+      uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
         java-version: ${{ matrix.java }}
         distribution: temurin
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 2278ae09..a486a1c3 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -56,13 +56,13 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.11</version>
+      <version>3.9.12</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.11</version>
+      <version>3.9.12</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.8.4</version>
+      <version>2.8.6</version>
       <type>jar</type>
     </dependency>
 
@@ -164,7 +164,7 @@
           <plugin>
             <groupId>org.sonatype.central</groupId>
             <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.0</version>
             <extensions>true</extensions>
             <configuration>
               <publishingServerId>sonatype-central-portal</publishingServerId>
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 09f65352..e1bfa976 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
+    <maven-compiler-plugin.version>3.15.0</maven-compiler-plugin.version>
     <maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
     <junit.jupiter.version>5.3.2</junit.jupiter.version>
   </properties>
@@ -104,7 +104,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>3.1.1</version>
+        <version>3.3.1</version>
         <executions>
           <execution>
             <id>default</id>
@@ -197,7 +197,7 @@
           <plugin>
             <groupId>org.sonatype.central</groupId>
             <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.0</version>
             <extensions>true</extensions>
             <configuration>
               <publishingServerId>sonatype-central-portal</publishingServerId>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 4ab569b2..82fd4894 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -24,7 +24,7 @@
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
-    <jetty.version>12.1.3</jetty.version>
+    <jetty.version>12.1.6</jetty.version>
   </properties>
 
   <licenses>
@@ -83,13 +83,13 @@
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>
-      <version>1.11.0</version>
+      <version>1.11.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value-annotations</artifactId>
-      <version>1.11.0</version>
+      <version>1.11.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.20.0</version>
+      <version>5.21.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -157,13 +157,13 @@
     <plugins>
      <plugin>
        <artifactId>maven-compiler-plugin</artifactId>
-       <version>3.14.1</version>
+       <version>3.15.0</version>
       <configuration>
         <annotationProcessorPaths>
           <path>
             <groupId>com.google.auto.value</groupId>
             <artifactId>auto-value</artifactId>
-            <version>1.11.0</version>
+            <version>1.11.1</version>
           </path>
           <path>
             <groupId>com.ryanharter.auto.value</groupId>
@@ -175,7 +175,7 @@
      </plugin>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.2</version>
+        <version>3.5.0</version>
         <configuration>
           <archive>
             <manifest>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 7147e099..3fae9483 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -130,7 +130,7 @@
           <plugin>
             <groupId>org.sonatype.central</groupId>
             <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.9.0</version>
+            <version>0.10.0</version>
             <extensions>true</extensions>
             <configuration>
               <publishingServerId>sonatype-central-portal</publishingServerId>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 994c4326..94e88ff6 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -45,7 +45,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>3.4.2</version>
+        <version>3.5.0</version>
         <configuration>
           <archive>
             <manifest>

From da8deb4aa8cb0a886863c04c6e9e53366d1bc617 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 6 Feb 2026 03:47:50 +0000
Subject: [PATCH 294/308] chore(deps): update actions/checkout action to v6
 (#371)

---
 .github/workflows/codeql.yml       | 2 +-
 .github/workflows/conformance.yaml | 2 +-
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/scorecard.yml    | 2 +-
 .github/workflows/unit.yaml        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5773a8e4..5e053c0a 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -43,7 +43,7 @@ jobs:
           uploads.github.com:443
 
     - name: Checkout repository
-      uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+      uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index 28fa9a0b..d5704255 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -32,7 +32,7 @@ jobs:
           repo.maven.apache.org:443
           storage.googleapis.com:443
 
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index aa37cb55..6e8459e7 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -20,7 +20,7 @@ jobs:
         allowed-endpoints: >
           github.com:443
           repo.maven.apache.org:443
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Set up JDK
       uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:
@@ -42,7 +42,7 @@ jobs:
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
-      - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1 # v2 minimum required
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 # v2 minimum required
       - name: Set up JDK
         uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
         with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 85c605cd..7e017155 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -45,7 +45,7 @@ jobs:
             *.github.com:443
 
       - name: "Checkout code"
-        uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 84b44f4d..69452a6f 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -27,7 +27,7 @@ jobs:
           repo.maven.apache.org:443
           api.adoptium.net:443
           *.githubusercontent.com:443
-    - uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v5.0.1
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Set up JDK ${{ matrix.java }}
       uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
       with:

From 28c79434a2cac8793581a1592009a7ce41366b22 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 6 Feb 2026 03:52:55 +0000
Subject: [PATCH 295/308] chore(deps): update github/codeql-action action to v4
 (#374)

---
 .github/workflows/codeql.yml    | 4 ++--
 .github/workflows/scorecard.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 5e053c0a..06baed72 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@2588666de8825e1e9dc4e2329a4c985457d55b32 # v3.32.1
+      uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -65,6 +65,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@2588666de8825e1e9dc4e2329a4c985457d55b32 # v3.32.1
+      uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 7e017155..9a1880f9 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@2588666de8825e1e9dc4e2329a4c985457d55b32 # v3.32.1
+        uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
         with:
           sarif_file: results.sarif

From 2c14b23be07a1a0de198fb317cc195208d10a882 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 10 Apr 2026 16:18:19 +0100
Subject: [PATCH 296/308] chore(deps): update all non-major dependencies (#377)

---
 .github/workflows/codeql.yml       | 6 +++---
 .github/workflows/conformance.yaml | 6 +++---
 .github/workflows/lint.yaml        | 4 ++--
 .github/workflows/scorecard.yml    | 4 ++--
 .github/workflows/unit.yaml        | 2 +-
 function-maven-plugin/pom.xml      | 6 +++---
 invoker/core/pom.xml               | 6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 06baed72..841500f7 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
+      uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -47,7 +47,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+      uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
       with:
         # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
         languages: java
@@ -65,6 +65,6 @@ jobs:
         (cd function-maven-plugin && mvn install)
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+      uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
       with:
         category: ${{ matrix.working-directory }}
diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index d5704255..ba966af3 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -19,7 +19,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
+      uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -41,9 +41,9 @@ jobs:
         distribution: temurin
 
     - name: Setup Go
-      uses: actions/setup-go@7a3fe6cf4cb3a834922a1244abfce67bcef6a0c5 # v6.2.0
+      uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
       with:
-        go-version: '1.25'
+        go-version: '1.26'
 
     - name: Build API with Maven
       run: (cd functions-framework-api/ && mvn install)
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
index 6e8459e7..2c88f621 100644
--- a/.github/workflows/lint.yaml
+++ b/.github/workflows/lint.yaml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
+      uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
       with:
         disable-sudo: true
         egress-policy: block
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
+        uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
         with:
           egress-policy: audit # TODO: change to 'egress-policy: block' after couple of runs
 
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
index 9a1880f9..ba1d718d 100644
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -26,7 +26,7 @@ jobs:
 
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
+        uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
         with:
           disable-sudo: true
           egress-policy: block
@@ -62,6 +62,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/unit.yaml b/.github/workflows/unit.yaml
index 69452a6f..fd3ffc97 100644
--- a/.github/workflows/unit.yaml
+++ b/.github/workflows/unit.yaml
@@ -18,7 +18,7 @@ jobs:
         ]
     steps:
     - name: Harden Runner
-      uses: step-security/harden-runner@e3f713f2d8f53843e71c69a996d56f51aa9adfb9 # v2.14.1
+      uses: step-security/harden-runner@f808768d1510423e83855289c910610ca9b43176 # v2.17.0
       with:
         disable-sudo: true
         egress-policy: block
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index a486a1c3..3a3fcb33 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -56,13 +56,13 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-plugin-api</artifactId>
-      <version>3.9.12</version>
+      <version>3.9.14</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core</artifactId>
-      <version>3.9.12</version>
+      <version>3.9.14</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -81,7 +81,7 @@
     <dependency>
       <groupId>com.google.cloud.tools</groupId>
       <artifactId>appengine-maven-plugin</artifactId>
-      <version>2.8.6</version>
+      <version>2.8.7</version>
       <type>jar</type>
     </dependency>
 
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 82fd4894..b85221a2 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -24,7 +24,7 @@
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
     <cloudevents.sdk.version>4.0.1</cloudevents.sdk.version>
-    <jetty.version>12.1.6</jetty.version>
+    <jetty.version>12.1.8</jetty.version>
   </properties>
 
   <licenses>
@@ -119,7 +119,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
-      <version>5.21.0</version>
+      <version>5.23.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -189,7 +189,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.6.2</version>
         <executions>
           <execution>
             <phase>package</phase>

From 44ece0153369732e4bf6a23df8e000266a74d350 Mon Sep 17 00:00:00 2001
From: Mend Renovate <bot@renovateapp.com>
Date: Fri, 10 Apr 2026 16:24:53 +0100
Subject: [PATCH 297/308] chore(deps): update
 googlecloudplatform/functions-framework-conformance digest to 86ea750 (#376)

Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/workflows/conformance.yaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml
index ba966af3..091a77a4 100644
--- a/.github/workflows/conformance.yaml
+++ b/.github/workflows/conformance.yaml
@@ -55,7 +55,7 @@ jobs:
       run: (cd function-maven-plugin/ && mvn install)
 
     - name: Run HTTP conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@86ea75023bd1b906b55d89b64dbdf80b49b850cc # main
       with:
         functionType: 'http'
         useBuildpacks: false
@@ -63,7 +63,7 @@ jobs:
         startDelay: 10
 
     - name: Run Typed conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@86ea75023bd1b906b55d89b64dbdf80b49b850cc # main
       with:
         functionType: 'http'
         declarativeType: 'typed'
@@ -72,7 +72,7 @@ jobs:
         startDelay: 10
 
     - name: Run background event conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@86ea75023bd1b906b55d89b64dbdf80b49b850cc # main
       with:
         functionType: 'legacyevent'
         useBuildpacks: false
@@ -81,7 +81,7 @@ jobs:
         startDelay: 10
 
     - name: Run cloudevent conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@86ea75023bd1b906b55d89b64dbdf80b49b850cc # main
       with:
         functionType: 'cloudevent'
         useBuildpacks: false
@@ -90,7 +90,7 @@ jobs:
         startDelay: 10
 
     - name: Run HTTP concurrency conformance tests
-      uses: GoogleCloudPlatform/functions-framework-conformance/action@6ae50bd9db5ed980c5ceff3cf7b200f705be94fc # main
+      uses: GoogleCloudPlatform/functions-framework-conformance/action@86ea75023bd1b906b55d89b64dbdf80b49b850cc # main
       with:
         functionType: 'http'
         useBuildpacks: false

From de983d907ebba9fba6809e816f6c70f207d6c252 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Fri, 10 Apr 2026 08:41:47 -0700
Subject: [PATCH 298/308] fix: update CloudEvents dependencyFixes #378 (#379)

---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index e1bfa976..b810722e 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>io.cloudevents</groupId>
       <artifactId>cloudevents-api</artifactId>
-      <version>4.0.1</version>
+      <version>4.0.2</version>
     </dependency>
   </dependencies>
 

From 0467294bce90adb56b81c03b3f0227c1a1edfe33 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 08:48:54 -0700
Subject: [PATCH 299/308] chore(main): release functions-framework-api 2.0.1
 (#380)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 functions-framework-api/CHANGELOG.md  | 7 +++++++
 functions-framework-api/pom.xml       | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index 3ba911b3..e21c415f 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"2.0.0","invoker":"2.0.0","function-maven-plugin":"1.0.0"}
+{"functions-framework-api":"2.0.1","invoker":"2.0.0","function-maven-plugin":"1.0.0"}
diff --git a/functions-framework-api/CHANGELOG.md b/functions-framework-api/CHANGELOG.md
index f588d527..c2999393 100644
--- a/functions-framework-api/CHANGELOG.md
+++ b/functions-framework-api/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.0.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v2.0.0...functions-framework-api-v2.0.1) (2026-04-10)
+
+
+### Bug Fixes
+
+* update CloudEvents dependencyFixes [#378](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/378) ([#379](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/379)) ([de983d9](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/de983d907ebba9fba6809e816f6c70f207d6c252))
+
 ## [2.0.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/functions-framework-api-v1.1.4...functions-framework-api-v2.0.0) (2025-11-05)
 
 
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index b810722e..f1fb7cf8 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.0.1</version>
   <name>Functions Framework Java API</name>
   <description>An open source FaaS (Function as a service) framework for writing portable Java functions.</description>
   <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>

From a453a315f1e6abd0720929f451bb6f3aec1aa498 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:37:31 -0700
Subject: [PATCH 300/308] deps: update Functions Framework API dependency to
 2.0.1 (#382)

---
 invoker/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3fae9483..fc772385 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -65,7 +65,7 @@
       <dependency>
         <groupId>com.google.cloud.functions</groupId>
         <artifactId>functions-framework-api</artifactId>
-        <version>2.0.0</version>
+        <version>2.0.1</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

From b800a50cb2c426ff29c2126a732b1ac386b0ea64 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 10:55:19 -0700
Subject: [PATCH 301/308] chore(main): release java-function-invoker 2.0.1
 (#383)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 invoker/CHANGELOG.md                  | 7 +++++++
 invoker/conformance/pom.xml           | 4 ++--
 invoker/core/pom.xml                  | 6 +++---
 invoker/pom.xml                       | 2 +-
 invoker/testfunction/pom.xml          | 4 ++--
 6 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index e21c415f..ba430840 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"2.0.1","invoker":"2.0.0","function-maven-plugin":"1.0.0"}
+{"functions-framework-api":"2.0.1","invoker":"2.0.1","function-maven-plugin":"1.0.0"}
diff --git a/invoker/CHANGELOG.md b/invoker/CHANGELOG.md
index c732e50c..87db009f 100644
--- a/invoker/CHANGELOG.md
+++ b/invoker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [2.0.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v2.0.0...java-function-invoker-v2.0.1) (2026-04-10)
+
+
+### Dependencies
+
+* update Functions Framework API dependency to 2.0.1 ([#382](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/382)) ([a453a31](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/a453a315f1e6abd0720929f451bb6f3aec1aa498))
+
 ## [2.0.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/java-function-invoker-v1.4.3...java-function-invoker-v2.0.0) (2025-11-06)
 
 
diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index a4d4e5f8..4dc238be 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.0.1</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index b85221a2..46718c30 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.0.1</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>2.0.1-SNAPSHOT</version>
+      <version>2.0.1</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index fc772385..d6e756c6 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.0.1</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 94e88ff6..2e426a61 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>2.0.1-SNAPSHOT</version>
+  <version>2.0.1</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From 9e69efe14b779ab21a4f85e54c51283d0ec1a2ec Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Fri, 10 Apr 2026 11:22:24 -0700
Subject: [PATCH 302/308] deps: update Functions Framework Invoker dependency
 to 2.0.1 (#385)

---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 3a3fcb33..b2929370 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker</artifactId>
-      <version>2.0.0</version>
+      <version>2.0.1</version>
     </dependency>
 
     <dependency>

From 81621fb56d524f65223c6d193c93b041d2f6c8f8 Mon Sep 17 00:00:00 2001
From: Andras Kerekes <akerekes@users.noreply.github.com>
Date: Fri, 10 Apr 2026 12:39:06 -0700
Subject: [PATCH 303/308] fix: add flag to enable logs during release (#387)

---
 .kokoro/release.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.kokoro/release.sh b/.kokoro/release.sh
index 0d7c8b26..b85e6003 100644
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -71,7 +71,12 @@ apt-get install -y openjdk-"${JDK_VERSION}"-jdk
 export JAVA_HOME="$(update-java-alternatives -l | grep "1.${JDK_VERSION}" | head -n 1 | tr -s " " | cut -d " " -f 3)"
 echo "JAVA_HOME=$JAVA_HOME"
 
-mvn clean deploy -B -q \
+SUPPRESS_LOGS='-q'
+if [[ -n "${ENABLE_LOGS}" ]]; then
+  SUPPRESS_LOGS=''
+fi
+
+mvn clean deploy -B ${SUPPRESS_LOGS} \
   -P sonatype-oss-release \
   --settings=../settings.xml \
   -Dgpg.executable=gpg \

From 29430f0e209075a69360add76ef4a3c73674c63a Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 13:15:56 -0700
Subject: [PATCH 304/308] chore(main): release function-maven-plugin 1.0.1
 (#386)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
Co-authored-by: Andras Kerekes <akerekes@users.noreply.github.com>
---
 .github/.release-please-manifest.json | 2 +-
 function-maven-plugin/CHANGELOG.md    | 7 +++++++
 function-maven-plugin/pom.xml         | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.github/.release-please-manifest.json b/.github/.release-please-manifest.json
index ba430840..bece83ba 100644
--- a/.github/.release-please-manifest.json
+++ b/.github/.release-please-manifest.json
@@ -1 +1 @@
-{"functions-framework-api":"2.0.1","invoker":"2.0.1","function-maven-plugin":"1.0.0"}
+{"functions-framework-api":"2.0.1","invoker":"2.0.1","function-maven-plugin":"1.0.1"}
diff --git a/function-maven-plugin/CHANGELOG.md b/function-maven-plugin/CHANGELOG.md
index 7d3a2345..6004a955 100644
--- a/function-maven-plugin/CHANGELOG.md
+++ b/function-maven-plugin/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.0.1](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v1.0.0...function-maven-plugin-v1.0.1) (2026-04-10)
+
+
+### Dependencies
+
+* update Functions Framework Invoker dependency to 2.0.1 ([#385](https://github.com/GoogleCloudPlatform/functions-framework-java/issues/385)) ([9e69efe](https://github.com/GoogleCloudPlatform/functions-framework-java/commit/9e69efe14b779ab21a4f85e54c51283d0ec1a2ec))
+
 ## [1.0.0](https://github.com/GoogleCloudPlatform/functions-framework-java/compare/function-maven-plugin-v0.11.2...function-maven-plugin-v1.0.0) (2025-11-06)
 
 
diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index b2929370..7d9e8c34 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.0.1-SNAPSHOT</version>
+  <version>1.0.1</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From 9eb99243835c937eaa95a0ab5eb4af2ef096900c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 13:31:40 -0700
Subject: [PATCH 305/308] chore(main): release functions-framework-api
 2.0.2-SNAPSHOT (#381)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 functions-framework-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index f1fb7cf8..250d5c2b 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>functions-framework-api</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
   <name>Functions Framework Java API</name>
   <description>An open source FaaS (Function as a service) framework for writing portable Java functions.</description>
   <url>https://github.com/GoogleCloudPlatform/functions-framework-java</url>

From 4af068ba787c5a136bb3a31bb48855098006c154 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 13:35:36 -0700
Subject: [PATCH 306/308] chore(main): release java-function-invoker
 2.0.2-SNAPSHOT (#384)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 invoker/conformance/pom.xml  | 4 ++--
 invoker/core/pom.xml         | 6 +++---
 invoker/pom.xml              | 2 +-
 invoker/testfunction/pom.xml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/invoker/conformance/pom.xml b/invoker/conformance/pom.xml
index 4dc238be..331f08d1 100644
--- a/invoker/conformance/pom.xml
+++ b/invoker/conformance/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <artifactId>java-function-invoker-parent</artifactId>
     <groupId>com.google.cloud.functions.invoker</groupId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>conformance</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
 
   <name>GCF Confromance Tests</name>
   <description>
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 46718c30..cd8984ba 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
   <name>GCF Java Invoker</name>
   <description>
     Application that invokes a GCF Java function. This application is a
@@ -112,7 +112,7 @@
     <dependency>
       <groupId>com.google.cloud.functions.invoker</groupId>
       <artifactId>java-function-invoker-testfunction</artifactId>
-      <version>2.0.1</version>
+      <version>2.0.2-SNAPSHOT</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
diff --git a/invoker/pom.xml b/invoker/pom.xml
index d6e756c6..33cf5383 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-parent</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>GCF Java Invoker Parent</name>
   <description>
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 2e426a61..541eb9a8 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.cloud.functions.invoker</groupId>
     <artifactId>java-function-invoker-parent</artifactId>
-    <version>2.0.1</version>
+    <version>2.0.2-SNAPSHOT</version>
   </parent>
 
   <groupId>com.google.cloud.functions.invoker</groupId>
   <artifactId>java-function-invoker-testfunction</artifactId>
-  <version>2.0.1</version>
+  <version>2.0.2-SNAPSHOT</version>
   <name>Example GCF Function Jar</name>
   <description>
     An example of a GCF function packaged into a jar. We use this in tests.

From a76521410adadbd88ff76dd3d2b160f25e86832c Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Fri, 10 Apr 2026 13:36:39 -0700
Subject: [PATCH 307/308] chore(main): release function-maven-plugin
 1.0.2-SNAPSHOT (#388)

Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com>
---
 function-maven-plugin/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/function-maven-plugin/pom.xml b/function-maven-plugin/pom.xml
index 7d9e8c34..6dca952c 100644
--- a/function-maven-plugin/pom.xml
+++ b/function-maven-plugin/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.google.cloud.functions</groupId>
   <artifactId>function-maven-plugin</artifactId>
   <packaging>maven-plugin</packaging>
-  <version>1.0.1</version>
+  <version>1.0.2-SNAPSHOT</version>
   <name>Functions Framework Plugin</name>
   <description>A Maven plugin that allows functions to be deployed, and to be run locally
     using the Java Functions Framework.</description>

From 73d9fa3a53bc1afca8b716cedfd24da6a09725dc Mon Sep 17 00:00:00 2001
From: Anshul Patni <anshulpatni19@gmail.com>
Date: Tue, 23 Jun 2026 14:41:25 -0700
Subject: [PATCH 308/308] chore(release): setup kokoro builds (#389)

Co-authored-by: Anshul Patni <anshulpatni@google.com>
---
 .kokoro/build.cfg   |  24 ++++++++++
 .kokoro/build.sh    | 114 ++++++++++++++++++++++++++++++++++++++++++++
 .kokoro/release.cfg |  43 +++++++----------
 .kokoro/release.sh  |  86 +++------------------------------
 4 files changed, 162 insertions(+), 105 deletions(-)
 create mode 100644 .kokoro/build.cfg
 create mode 100755 .kokoro/build.sh
 mode change 100644 => 100755 .kokoro/release.sh

diff --git a/.kokoro/build.cfg b/.kokoro/build.cfg
new file mode 100644
index 00000000..59cdfe4c
--- /dev/null
+++ b/.kokoro/build.cfg
@@ -0,0 +1,24 @@
+# -*- protobuffer -*-
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
+build_file: "functions-framework-java/.kokoro/build.sh"
+container_properties {
+  # Use the full image which has Java, Maven, and gcloud CLI pre-installed
+  docker_image: "us-central1-docker.pkg.dev/kokoro-container-bakery/kokoro/ubuntu/ubuntu2204/full:current"
+}
+
+fileset_artifacts {
+  name: "artifacts"
+  # We will copy the built jars to this folder in build.sh for signing
+  artifact_globs: "artifacts/*"
+  error_if_missing: true
+  destinations {
+    store_attestation: true
+    gcs {
+      gcs_root_path: "oss-exit-gate-prod-projects-bucket/ff-releases/mavencentral/attestations"
+    }
+  }
+  generate_sbom_from_fileset: true
+  generate_attestation: true
+}
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
new file mode 100755
index 00000000..597b5cf3
--- /dev/null
+++ b/.kokoro/build.sh
@@ -0,0 +1,114 @@
+#!/bin/bash
+set -euo pipefail
+
+# The repo is cloned to $KOKORO_ARTIFACTS_DIR/git/functions-framework-java
+REPO_DIR="${KOKORO_ARTIFACTS_DIR}/git/functions-framework-java"
+cd "${REPO_DIR}"
+
+# ==============================================================================
+# 1. Configure Airlock and AR Credentials
+# ==============================================================================
+# Get OAuth token from GCE metadata server inside Kokoro VM
+MAVEN_TOKEN=$(curl -s "http://metadata.google.internal/computeMetadata/v1/instance/service-accounts/default/token" -H "Metadata-Flavor: Google" | grep -oP '"access_token":"\K[^"]+')
+
+# Create a temporary settings.xml to configure Airlock mirror and AR auth
+cat > settings.xml <<EOF
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+  <mirrors>
+    <!-- Redirect ALL downloads to Airlock Maven Central mirror -->
+    <mirror>
+      <id>airlock-mirror</id>
+      <name>Airlock Maven Central mirror</name>
+      <url>https://us-maven.pkg.dev/artifact-foundry-prod/maven-3p-trusted</url>
+      <mirrorOf>*</mirrorOf>
+    </mirror>
+  </mirrors>
+  <servers>
+    <!-- Credentials for the Airlock mirror -->
+    <server>
+      <id>airlock-mirror</id>
+      <username>oauth2accesstoken</username>
+      <password>${MAVEN_TOKEN}</password>
+    </server>
+    <!-- Credentials for the Exit Gate AR deployment repo -->
+    <server>
+      <id>exit-gate-ar</id>
+      <username>oauth2accesstoken</username>
+      <password>${MAVEN_TOKEN}</password>
+    </server>
+  </servers>
+</settings>
+EOF
+
+# ==============================================================================
+# 2. Retrieve GPG keys from Secret Manager
+# ==============================================================================
+GPG_KEYRING="${KOKORO_ARTIFACTS_DIR}/gpg-keyring"
+GPG_PASSPHRASE_FILE="${KOKORO_ARTIFACTS_DIR}/gpg-passphrase"
+
+# Read names from environment variables injected by Louhi
+PROJECT_ID="${_LOUHI_SECRET_PROJECT_ID}"
+KEYRING_NAME="${_LOUHI_GPG_KEYRING_SECRET_NAME}"
+PASSPHRASE_NAME="${_LOUHI_GPG_PASSPHRASE_SECRET_NAME}"
+
+echo "Fetching secrets from project: ${PROJECT_ID}"
+gcloud secrets versions access latest --secret="${KEYRING_NAME}" --project="${PROJECT_ID}" > "${GPG_KEYRING}"
+gcloud secrets versions access latest --secret="${PASSPHRASE_NAME}" --project="${PROJECT_ID}" > "${GPG_PASSPHRASE_FILE}"
+
+export GPG_TTY=$(tty)
+export GPG_PASSPHRASE=$(cat "${GPG_PASSPHRASE_FILE}")
+export GNUPGHOME=/tmp/gpg
+mkdir -p "${GNUPGHOME}"
+gpg --batch --import "${GPG_KEYRING}"
+
+# ==============================================================================
+# 3. Build, Sign, and Deploy
+# ==============================================================================
+# Detect which package to build based on the Louhi trigger tag
+if [[ -n "${_LOUHI_REF_NAME:-}" ]]; then
+  echo "Triggered by Louhi tag: ${_LOUHI_REF_NAME}"
+  if [[ "${_LOUHI_REF_NAME}" == *functions-framework-api* ]]; then
+    PACKAGE_DIR="functions-framework-api"
+  elif [[ "${_LOUHI_REF_NAME}" == *function-maven-plugin* ]]; then
+    PACKAGE_DIR="function-maven-plugin"
+  elif [[ "${_LOUHI_REF_NAME}" == *java-function-invoker* ]]; then
+    PACKAGE_DIR="invoker"
+  else
+    echo "Unknown tag format: ${_LOUHI_REF_NAME}. Defaulting to invoker."
+    PACKAGE_DIR="invoker"
+  fi
+else
+  # Fallback for manual/non-tag builds (e.g. testing)
+  echo "No Louhi tag detected. Falling back to KOKORO_JOB_NAME detection."
+  if [[ $KOKORO_JOB_NAME == *"function-maven-plugin"* ]]; then
+    PACKAGE_DIR="function-maven-plugin"
+  elif [[ $KOKORO_JOB_NAME == *"functions-framework-api"* ]]; then
+    PACKAGE_DIR="functions-framework-api"
+  else
+    PACKAGE_DIR="invoker"
+  fi
+fi
+
+echo "Building package in directory: ${PACKAGE_DIR}"
+cd "${PACKAGE_DIR}"
+
+# Run maven deploy using the temporary settings.xml
+# We use altDeploymentRepository to override the deploy target without editing pom.xml
+mvn clean deploy -B \
+  -P sonatype-oss-release \
+  --settings=../settings.xml \
+  -DaltDeploymentRepository=exit-gate-ar::https://us-maven.pkg.dev/oss-exit-gate-prod/ff-releases--mavencentral \
+  -Dgpg.executable=gpg \
+  -Dgpg.passphrase="${GPG_PASSPHRASE}" \
+  -Dgpg.homedir="${GNUPGHOME}"
+
+# ==============================================================================
+# 4. Copy artifacts to 'artifacts/' folder for Kokoro Attestation Generation
+# ==============================================================================
+ARTIFACTS_DIR="${REPO_DIR}/artifacts"
+mkdir -p "${ARTIFACTS_DIR}"
+
+# Copy target jars and poms (excluding test jars) to be captured by build.cfg
+find target/ -maxdepth 1 -name "*.jar" -o -name "*.pom" | grep -v "test" | xargs -I {} cp {} "${ARTIFACTS_DIR}/"
diff --git a/.kokoro/release.cfg b/.kokoro/release.cfg
index 08d0ac9f..c617e165 100644
--- a/.kokoro/release.cfg
+++ b/.kokoro/release.cfg
@@ -1,30 +1,23 @@
+# -*- protobuffer -*-
+# proto-file: google3/devtools/kokoro/config/proto/build.proto
+# proto-message: BuildConfig
+
 build_file: "functions-framework-java/.kokoro/release.sh"
+container_properties {
+  docker_image: "us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/ubuntu:22.04"
+}
 
-before_action {
-  fetch_keystore {
-    keystore_resource {
-      keystore_config_id: 75669
-      keyname: "functions-framework-java-release-bot-sonatype-password"
-    }
-    keystore_resource {
-      keystore_config_id: 75669
-      keyname: "functions-framework-release-sonatype-central-portal-username"
-    }
-    keystore_resource {
-      keystore_config_id: 75669
-      keyname: "functions-framework-release-sonatype-central-portal-password"
-    }
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "maven-gpg-pubkeyring"
-    }
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "maven-gpg-keyring"
-    }
-    keystore_resource {
-      keystore_config_id: 70247
-      keyname: "maven-gpg-passphrase"
+fileset_artifacts {
+  name: "manifest"
+  artifact_globs: "manifest.json"
+  error_if_missing: true
+  destinations {
+    store_attestation: false
+    gcs {
+      gcs_root_path: "oss-exit-gate-prod-projects-bucket/ff-releases/mavencentral/manifests"
+      populate_content_type: true
     }
   }
+  generate_sbom_from_fileset: false
+  generate_attestation: false
 }
diff --git a/.kokoro/release.sh b/.kokoro/release.sh
old mode 100644
new mode 100755
index b85e6003..58b865a6
--- a/.kokoro/release.sh
+++ b/.kokoro/release.sh
@@ -1,84 +1,10 @@
 #!/bin/bash
+set -euo pipefail
 
-# Stop execution when any command fails.
-set -e
+cd "${KOKORO_ARTIFACTS_DIR}"
 
-# update the Maven version to 3.9.11
-pushd /usr/local
-wget https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.tar.gz
-tar -xvzf apache-maven-3.9.11-bin.tar.gz apache-maven-3.9.11
-rm -f /usr/local/apache-maven
-ln -s /usr/local/apache-maven-3.9.11 /usr/local/apache-maven
-rm apache-maven-3.9.11-bin.tar.gz
-popd
-
-
-# Get secrets from keystore and set and environment variables.
-setup_environment_secrets() {
-  export GPG_TTY=$(tty)
-  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
-
-  # Add the key ring files to $GNUPGHOME to verify the GPG credentials.
-  export GNUPGHOME=/tmp/gpg
-  mkdir $GNUPGHOME
-  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GNUPGHOME/pubring.gpg
-  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GNUPGHOME/secring.gpg
-  gpg -k
-}
-
-create_settings_xml_file() {
-  echo "<settings>
-   <profiles>
-     <profile>
-         <activation>
-             <activeByDefault>true</activeByDefault>
-         </activation>
-         <properties>
-             <gpg.passphrase>${GPG_PASSPHRASE}</gpg.passphrase>
-         </properties>
-     </profile>
-  </profiles>
-  <servers>
-    <server>
-      <id>sonatype-central-portal</id>
-      <username>$(cat "${KOKORO_KEYSTORE_DIR}/75669_functions-framework-release-sonatype-central-portal-username")</username>
-      <password>$(cat "${KOKORO_KEYSTORE_DIR}/75669_functions-framework-release-sonatype-central-portal-password")</password>
-    </server>
-  </servers>
-</settings>" > $1
+cat > manifest.json <<'EOF'
+{
+  "publish_all": true
 }
-
-setup_environment_secrets
-
-# Pick the right package to release based on the Kokoro job name.
-cd ${KOKORO_ARTIFACTS_DIR}/github/functions-framework-java
-create_settings_xml_file "settings.xml"
-echo "KOKORO_JOB_NAME=${KOKORO_JOB_NAME}"
-if [[ $KOKORO_JOB_NAME == *"function-maven-plugin"* ]]; then
-  cd function-maven-plugin
-elif [[ $KOKORO_JOB_NAME == *"functions-framework-api"* ]]; then
-  cd functions-framework-api
-else
-  cd invoker
-fi
-echo "pwd=$(pwd)"
-
-# Make sure `JAVA_HOME` is set and using jdk17.
-JDK_VERSION=17
-apt-get update
-# Install new JDK version
-apt-get install -y openjdk-"${JDK_VERSION}"-jdk
-export JAVA_HOME="$(update-java-alternatives -l | grep "1.${JDK_VERSION}" | head -n 1 | tr -s " " | cut -d " " -f 3)"
-echo "JAVA_HOME=$JAVA_HOME"
-
-SUPPRESS_LOGS='-q'
-if [[ -n "${ENABLE_LOGS}" ]]; then
-  SUPPRESS_LOGS=''
-fi
-
-mvn clean deploy -B ${SUPPRESS_LOGS} \
-  -P sonatype-oss-release \
-  --settings=../settings.xml \
-  -Dgpg.executable=gpg \
-  -Dgpg.passphrase=${GPG_PASSPHRASE} \
-  -Dgpg.homedir=${GNUPGHOME}
+EOF