GoogleCloudPlatform · Oct 17, 2022 · Oct 17, 2022 · Oct 17, 2022 · Oct 18, 2022 · Oct 19, 2022
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -31,7 +31,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [8, 11, 17]
+        java: [8, 11, 17, 19]
         jdk: [temurin]
       fail-fast: false
 

diff --git a/api/pom.xml b/api/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>

diff --git a/api/src/main/java/com/google/appengine/api/datastore/CloudDatastoreRemoteServiceConfig.java b/api/src/main/java/com/google/appengine/api/datastore/CloudDatastoreRemoteServiceConfig.java
@@ -106,6 +106,7 @@ private DatastoreServiceGlobalConfig toInternalConfig() {
         .hostOverride(hostOverride())
         .additionalAppIds(additionalAppIdsAsStrings())
         .serviceAccount(serviceAccount())
+        .accessToken(accessToken())
         .privateKey(privateKey())
         .useComputeEngineCredential(useComputeEngineCredential())
         .installApiProxyEnvironment(installApiProxyEnvironment())
@@ -179,6 +180,8 @@ String appIdString() {
 
   abstract @Nullable PrivateKey privateKey();
 
+  abstract @Nullable String accessToken();
+
   abstract boolean useComputeEngineCredential();
 
   abstract int maxRetries();
@@ -187,8 +190,7 @@ String appIdString() {
 
   abstract boolean asyncStackTraceCaptureEnabled();
 
-  @Nullable
-  ImmutableSet<String> additionalAppIdsAsStrings() {
+  @Nullable ImmutableSet<String> additionalAppIdsAsStrings() {
     if (additionalAppIds() == null) {
       return null;
     }
@@ -253,8 +255,8 @@ public abstract CloudDatastoreRemoteServiceConfig.Builder installApiProxyEnviron
      * If set to true, always use a Compute Engine credential instead of using the Application
      * Default Credentials library to construct the credential.
      *
-     * <p>Cannot be combined with a call to {@link #useServiceAccountCredential(String,
-     * PrivateKey)}.
+     * <p>Cannot be combined with a call to {@link #useServiceAccountCredential(String, PrivateKey)}
+     * or {@link #accessToken(String)}.
      */
     public abstract CloudDatastoreRemoteServiceConfig.Builder useComputeEngineCredential(
         boolean value);
@@ -273,11 +275,19 @@ public abstract CloudDatastoreRemoteServiceConfig.Builder useComputeEngineCreden
     public abstract CloudDatastoreRemoteServiceConfig.Builder asyncStackTraceCaptureEnabled(
         boolean value);
 
+    /**
+     * Sets the access token.
+     *
+     * <p>Cannot be combined with a call to {@link #useComputeEngineCredential(boolean)} or {@link
+     * #useServiceAccountCredential(String, PrivateKey)}.
+     */
+    public abstract CloudDatastoreRemoteServiceConfig.Builder accessToken(String accessToken);
     /**
      * Instructs the client to use a service account credential instead of using the Application
      * Default Credentials library to construct the credential.
      *
-     * <p>Cannot be combined with a call to {@link #useComputeEngineCredential(boolean)}.
+     * <p>Cannot be combined with a call to {@link #useComputeEngineCredential(boolean)} or {@link
+     * #accessToken(String)}.
      */
     public CloudDatastoreRemoteServiceConfig.Builder useServiceAccountCredential(
         String serviceAccountId, PrivateKey privateKey) {

diff --git a/api/src/main/java/com/google/appengine/api/datastore/CloudDatastoreV1ClientImpl.java b/api/src/main/java/com/google/appengine/api/datastore/CloudDatastoreV1ClientImpl.java
@@ -323,6 +323,15 @@ private static Credential getCredential() throws GeneralSecurityException, IOExc
       return new ComputeCredential(
           GoogleNetHttpTransport.newTrustedTransport(), GsonFactory.getDefaultInstance());
     }
+    if (DatastoreServiceGlobalConfig.getConfig().accessToken() != null) {
+      GoogleCredential credential =
+          getCredentialBuilder()
+              .build()
+              .setAccessToken(DatastoreServiceGlobalConfig.getConfig().accessToken())
+              .createScoped(DatastoreOptions.SCOPES);
+      credential.refreshToken();
+      return credential;
+    }
     return GoogleCredential.getApplicationDefault().createScoped(DatastoreOptions.SCOPES);
   }
 
@@ -347,10 +356,15 @@ private static void setProjectEndpoint(String projectId, DatastoreOptions.Builde
 
   private static GoogleCredential.Builder getServiceAccountCredentialBuilder(String account)
       throws GeneralSecurityException, IOException {
-    return new GoogleCredential.Builder()
-        .setTransport(GoogleNetHttpTransport.newTrustedTransport())
-        .setJsonFactory(GsonFactory.getDefaultInstance())
+    return getCredentialBuilder()
         .setServiceAccountId(account)
         .setServiceAccountScopes(DatastoreOptions.SCOPES);
   }
+
+  private static GoogleCredential.Builder getCredentialBuilder()
+      throws GeneralSecurityException, IOException {
+    return new GoogleCredential.Builder()
+        .setTransport(GoogleNetHttpTransport.newTrustedTransport())
+        .setJsonFactory(GsonFactory.getDefaultInstance());
+  }
 }
diff --git a/api/src/main/java/com/google/appengine/api/datastore/DatastoreServiceGlobalConfig.java b/api/src/main/java/com/google/appengine/api/datastore/DatastoreServiceGlobalConfig.java
@@ -201,6 +201,9 @@ static Environment getCurrentApiProxyEnvironment() {
   @Nullable
   abstract String emulatorHost();
 
+  @Nullable
+  abstract String accessToken();
+
   @Nullable
   abstract String serviceAccount();
 
@@ -258,6 +261,8 @@ abstract static class Builder {
 
     abstract DatastoreServiceGlobalConfig.Builder useApiProxy(boolean value);
 
+    abstract DatastoreServiceGlobalConfig.Builder accessToken(String value);
+
     abstract DatastoreServiceGlobalConfig.Builder serviceAccount(String value);
 
     abstract DatastoreServiceGlobalConfig.Builder privateKey(PrivateKey value);
@@ -301,7 +306,8 @@ DatastoreServiceGlobalConfig build() {
         checkState(
             config.additionalAppIds() == null,
             "Cannot specify additional app IDs when using API proxy.");
-
+        checkState(
+            config.accessToken() == null, "Cannot specify access token when using API proxy.");
         checkState(
             config.serviceAccount() == null,
             "Cannot specify service account when using API proxy.");
@@ -346,6 +352,9 @@ DatastoreServiceGlobalConfig build() {
           !(config.serviceAccount() != null && config.useComputeEngineCredential()),
           "Must not provide a service account and at the same time require the use of Compute "
               + "Engine credentials.");
+      checkState(
+          config.accessToken() == null || config.serviceAccount() == null,
+          "Must not provide both an access token and a service account.");
 
       return config;
     }

diff --git a/api/src/main/java/com/google/appengine/api/log/LogQuery.java b/api/src/main/java/com/google/appengine/api/log/LogQuery.java
@@ -293,11 +293,11 @@ public static LogQuery withStartTimeUsec(long startTimeUsec) {
     }
 
     /**
-     * Create a {@link LogQuery} with the given end time.
-     * Shorthand for <code>LogQuery.Builder.withDefaults().endTimeMillis(endTimeMillis);</code>.
-     * Please read the {@link LogQuery} class javadoc for an explanation of
-     * how end time is used.
-     * @param endTimeMillis the start time to use, in milliseconds.
+     * Create a {@link LogQuery} with the given end time. Shorthand for <code>
+     * LogQuery.Builder.withDefaults().endTimeMillis(endTimeMillis);</code>. Please read the {@link
+     * LogQuery} class javadoc for an explanation of how end time is used.
+     *
+     * @param endTimeMillis the end time to use, in milliseconds.
      * @return The newly created LogQuery instance.
      */
     public static LogQuery withEndTimeMillis(long endTimeMillis) {

diff --git a/api_dev/pom.xml b/api_dev/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/api_dev/src/test/java/com/google/appengine/api/images/dev/LocalImagesServiceTest.java b/api_dev/src/test/java/com/google/appengine/api/images/dev/LocalImagesServiceTest.java
@@ -487,12 +487,14 @@ private void compareImage(String filename, byte[] responseImage) throws IOExcept
     assertThat(responseImage).isEqualTo(expectedImage);
   }
 
-  private static boolean isJdk11or17() {
-    return StandardSystemProperty.JAVA_SPECIFICATION_VERSION.value().equals("11")
-        || StandardSystemProperty.JAVA_SPECIFICATION_VERSION.value().equals("17");
+  private static boolean isJDK8() {
+    return StandardSystemProperty.JAVA_SPECIFICATION_VERSION.value().equals("1.8");
   }
 
-  private static final String jdk11or17Name(String filename) {
+  /**
+   * We have 2 test files per image: one for jdk8 and the other one (11) used by jdk 11,17 and above
+   */
+  private static final String jdk11(String filename) {
     return filename.replaceAll("(?!-jdk11)\\.(png|jpg)$", "-jdk11.$1");
   }
 
@@ -504,8 +506,8 @@ private static final String jdk11or17Name(String filename) {
    */
   private byte[] readImage(String filename) throws IOException {
     URL resource = null;
-    if (isJdk11or17()) {
-      String jdk11Name = jdk11or17Name(filename);
+    if (!isJDK8()) {
+      String jdk11Name = jdk11(filename);
       resource = getClass().getResource("testdata/" + jdk11Name);
     }
     if (resource == null) {

diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-api-1.0-sdk</name>

diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
     </parent>
 
     <dependencies>

diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-resources</name>

diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>

diff --git a/applications/pom.xml b/applications/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <properties>

diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
@@ -14,9 +14,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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
@@ -27,7 +25,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>applications</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
     <properties>
@@ -41,6 +39,7 @@
 
         <appengine.target.version>${project.version}</appengine.target.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
     </properties>
 
     <dependencies>

diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml
@@ -15,13 +15,12 @@
  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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>springboot</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <name>AppEngine :: springboot</name>

diff --git a/kokoro/gcp_ubuntu/build.sh b/kokoro/gcp_ubuntu/build.sh
@@ -27,31 +27,39 @@ echo "JAVA_HOME = $JAVA_HOME"
 
 ./mvnw -e clean install
 
-# The artifacts under `${KOKORO_ARTIFACTS_DIR}/maven-artifacts` will be uploaded.
-mkdir ${KOKORO_ARTIFACTS_DIR}/maven-artifacts
+# The artifacts under `${KOKORO_ARTIFACTS_DIR}/maven-artifacts` will be uploaded as a zip file named maven_jars.binary
+TMP_STAGING_LOCATION=${KOKORO_ARTIFACTS_DIR}/tmp
+PUBLISHED_LOCATION=${KOKORO_ARTIFACTS_DIR}/maven-artifacts
+mkdir ${TMP_STAGING_LOCATION}
+mkdir ${PUBLISHED_LOCATION}
 # Remove jars we do not need in google3.
 ls **/*.jar
 rm **/target/*sources.jar || true
 rm **/target/*tests.jar || true
 
 # LINT.IfChange
-cp api_legacy/target/appengine-api-legacy*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-api-legacy.jar
-cp appengine-api-1.0-sdk/target/appengine-api-1.0-sdk*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-api-1.0-sdk.jar
-cp appengine-api-stubs/target/appengine-api-stubs*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-api-stubs.jar
-cp appengine_testing/target/appengine-testing*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-testing.jar
-cp remoteapi/target/appengine-remote-api*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-remote-api.jar
-cp appengine_jsr107/target/appengine-jsr107*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-jsr107.jar
-cp runtime_shared/target/runtime-shared*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/runtime-shared.jar
-cp lib/tools_api/target/appengine-tools-sdk*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-tools-api.jar
-cp lib/xml_validator/target/libxmlvalidator*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/libxmlvalidator.jar
-cp runtime/impl/target/runtime-impl*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/runtime-impl.jar
-cp runtime/local/target/appengine-local-runtime*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-local-runtime.jar
-cp runtime/main/target/runtime-main*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/runtime-main.jar
-cp local_runtime_shared/target/appengine-local-runtime-shared*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-local-runtime-shared.jar
-cp quickstartgenerator/target/quickstartgenerator*.jar ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/quickstartgenerator.jar
+cp api_legacy/target/appengine-api-legacy*.jar ${TMP_STAGING_LOCATION}/appengine-api-legacy.jar
+cp appengine-api-1.0-sdk/target/appengine-api-1.0-sdk*.jar ${TMP_STAGING_LOCATION}/appengine-api-1.0-sdk.jar
+cp appengine-api-stubs/target/appengine-api-stubs*.jar ${TMP_STAGING_LOCATION}/appengine-api-stubs.jar
+cp appengine_testing/target/appengine-testing*.jar ${TMP_STAGING_LOCATION}/appengine-testing.jar
+cp remoteapi/target/appengine-remote-api*.jar ${TMP_STAGING_LOCATION}/appengine-remote-api.jar
+cp appengine_jsr107/target/appengine-jsr107*.jar ${TMP_STAGING_LOCATION}/appengine-jsr107.jar
+cp runtime_shared/target/runtime-shared*.jar ${TMP_STAGING_LOCATION}/runtime-shared.jar
+cp lib/tools_api/target/appengine-tools-sdk*.jar ${TMP_STAGING_LOCATION}/appengine-tools-api.jar
+cp lib/xml_validator/target/libxmlvalidator*.jar ${TMP_STAGING_LOCATION}/libxmlvalidator.jar
+cp runtime/impl/target/runtime-impl*.jar ${TMP_STAGING_LOCATION}/runtime-impl.jar
+cp runtime/local/target/appengine-local-runtime*.jar ${TMP_STAGING_LOCATION}/appengine-local-runtime.jar
+cp runtime/main/target/runtime-main*.jar ${TMP_STAGING_LOCATION}/runtime-main.jar
+cp local_runtime_shared/target/appengine-local-runtime-shared*.jar ${TMP_STAGING_LOCATION}/appengine-local-runtime-shared.jar
+cp quickstartgenerator/target/quickstartgenerator*.jar ${TMP_STAGING_LOCATION}/quickstartgenerator.jar
 
-cp -rf sdk_assembly/target/appengine-java-sdk ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/
+cp -rf sdk_assembly/target/appengine-java-sdk ${TMP_STAGING_LOCATION}/
 # Make binaries executable.
-chmod a+x ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/appengine-java-sdk/bin/*
+chmod a+x ${TMP_STAGING_LOCATION}/appengine-java-sdk/bin/*
 # LINT.ThenChange(//depot/google3/third_party/java_src/appengine_standard/check_build.sh)
-cp sdk_assembly/target/google_appengine_java_delta*.zip ${KOKORO_ARTIFACTS_DIR}/maven-artifacts/google_appengine_java_delta_from_maven.zip
+cp sdk_assembly/target/google_appengine_java_delta*.zip ${TMP_STAGING_LOCATION}/google_appengine_java_delta_from_maven.zip
+cd ${TMP_STAGING_LOCATION}
+zip -r ${PUBLISHED_LOCATION}/maven_jars.binary .
+# cleanup staging area
+cd ..
+rm -rf ${TMP_STAGING_LOCATION}
diff --git a/lib/pom.xml b/lib/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
 

diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: libxmlvalidator</name>

diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>lib-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: libxmlvalidator_test</name>

diff --git a/local_runtime_shared/pom.xml b/local_runtime_shared/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-local-runtime-shared</name>

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>
   <artifactId>parent</artifactId>
-  <version>2.0.10-SNAPSHOT</version>
+  <version>2.0.11-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>AppEngine :: Parent project</name>
   <modules>
@@ -386,7 +386,7 @@
       <dependency>
         <groupId>com.google.cloud.datastore</groupId>
         <artifactId>datastore-v1-proto-client</artifactId>
-        <version>2.11.1</version>
+        <version>2.11.5</version>
       </dependency>
       <dependency>
         <groupId>com.google.geometry</groupId>
@@ -449,12 +449,12 @@
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-cloud-datastore-v1</artifactId>
-        <version>0.102.1</version>
+        <version>0.103.0</version>
       </dependency>
       <dependency>
         <groupId>com.google.api.grpc</groupId>
         <artifactId>proto-google-common-protos</artifactId>
-        <version>2.9.2</version>
+        <version>2.9.6</version>
       </dependency>
       <dependency>
         <groupId>com.google.code.findbugs</groupId>
@@ -626,22 +626,22 @@
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-api</artifactId>
-        <version>1.49.0</version>
+        <version>1.49.2</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-stub</artifactId>
-        <version>1.49.0</version>
+        <version>1.49.2</version>
       </dependency>
       <dependency>
         <groupId>io.grpc</groupId>
         <artifactId>grpc-protobuf</artifactId>
-        <version>1.49.0</version>
+        <version>1.49.2</version>
       </dependency>
       <dependency>
          <groupId>io.grpc</groupId>
          <artifactId>grpc-netty</artifactId>
-         <version>1.49.0</version>
+         <version>1.49.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tomcat</groupId>
@@ -656,12 +656,12 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.11.1</version>
+        <version>2.11.2</version>
       </dependency>
       <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
-        <version>20220320</version>
+        <version>20220924</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
@@ -789,7 +789,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.3.0</version>
+          <version>3.4.1</version>
         </plugin>
         <plugin>
           <groupId>com.github.os72</groupId>

diff --git a/protobuf/pom.xml b/protobuf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-remote-api</name>

diff --git a/remoteapi/src/main/java/com/google/appengine/tools/remoteapi/RemoteApiOptions.java b/remoteapi/src/main/java/com/google/appengine/tools/remoteapi/RemoteApiOptions.java
@@ -227,6 +227,24 @@ public RemoteApiOptions useServiceAccountCredential(
     return this;
   }
 
+  /**
+   * Use an access token credential. Overrides any previously-provided credentials.
+   *
+   * @param accessToken the access token (generally from {@link GoogleCredential#getAccessToken})
+   * @return this {@code RemoteApiOptions} instance
+   */
+  public RemoteApiOptions useAccessToken(String accessToken) {
+    try {
+      GoogleCredential credential = getCredentialBuilder().build().setAccessToken(accessToken);
+      credential = credential.createScoped(OAUTH_SCOPES);
+      credential.refreshToken();
+      setOAuthCredential(credential);
+    } catch (IOException | GeneralSecurityException e) {
+      throw new RuntimeException("Failed to build access token credential.", e);
+    }
+    return this;
+  }
+
   /**
    * Use credentials appropriate for talking to the Development Server. Overrides any
    * previously-provided credentials.
@@ -247,13 +265,16 @@ public RemoteApiOptions useDevelopmentServerCredential() {
     return this;
   }
 
-  private GoogleCredential.Builder getCredentialBuilder(String serviceAccountId)
+  private GoogleCredential.Builder getCredentialBuilder()
       throws GeneralSecurityException, IOException {
     HttpTransport transport = getOrCreateHttpTransportForOAuth();
     JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
-    return new GoogleCredential.Builder()
-        .setTransport(transport)
-        .setJsonFactory(jsonFactory)
+    return new GoogleCredential.Builder().setTransport(transport).setJsonFactory(jsonFactory);
+  }
+
+  private GoogleCredential.Builder getCredentialBuilder(String serviceAccountId)
+      throws GeneralSecurityException, IOException {
+    return getCredentialBuilder()
         .setServiceAccountId(serviceAccountId)
         .setServiceAccountScopes(OAUTH_SCOPES);
   }

diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml
@@ -14,13 +14,11 @@
  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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>annotationscanningwebapp</artifactId>

diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>pom</packaging>

diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml
@@ -14,13 +14,11 @@
  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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>failinitfilterwebapp</artifactId>

diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>runtime-parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>

diff --git a/runtime/impl/src/main/java/com/google/apphosting/runtime/RequestManager.java b/runtime/impl/src/main/java/com/google/apphosting/runtime/RequestManager.java
@@ -500,14 +500,15 @@ public void sendDeadline(String securityTicket, boolean isUncatchable) {
   // So at least for the time being we can still achieve the effect of Thread.stop(Throwable) by
   // calling the JNI method. That means we don't get the permission checks and so on that come
   // with Thread.stop, but the code that's calling it is privileged anyway.
-  private static final Method threadStop0;
-
-  static {
-    try {
-      threadStop0 = Thread.class.getDeclaredMethod("stop0", Object.class);
-      threadStop0.setAccessible(true);
-    } catch (NoSuchMethodException e) {
-      throw new RuntimeException(e);
+  private static class ThreadStop0Holder {
+   private static final Method threadStop0;
+    static {
+      try {
+        threadStop0 = Thread.class.getDeclaredMethod("stop0", Object.class);
+        threadStop0.setAccessible(true);
+      } catch (NoSuchMethodException e) {
+        throw new RuntimeException(e);
+      }
     }
   }
 
@@ -611,7 +612,7 @@ public void sendDeadline(RequestToken token, boolean isUncatchable) {
         AccessController.doPrivileged(
             (PrivilegedAction<Void>) () -> {
               try {
-                threadStop0.invoke(targetThread, throwable);
+                ThreadStop0Holder.threadStop0.invoke(targetThread, throwable);
               } catch (Exception e) {
                 logger.atWarning().withCause(e).log("Failed to stop thread");
               }

diff --git a/...me/impl/src/main/java/com/google/apphosting/runtime/jetty94/AppVersionHandlerFactory.java b/...me/impl/src/main/java/com/google/apphosting/runtime/jetty94/AppVersionHandlerFactory.java
@@ -101,12 +101,17 @@ public class AppVersionHandlerFactory {
   private final Server server;
   private final String serverInfo;
   private final WebAppContextFactory contextFactory;
+  private final boolean useJettyErrorPageHandler;
 
   public AppVersionHandlerFactory(
-      Server server, String serverInfo, WebAppContextFactory contextFactory) {
+      Server server,
+      String serverInfo,
+      WebAppContextFactory contextFactory,
+      boolean useJettyErrorPageHandler) {
     this.server = server;
     this.serverInfo = serverInfo;
     this.contextFactory = contextFactory;
+    this.useJettyErrorPageHandler = useJettyErrorPageHandler;
   }
 
   /**
@@ -146,7 +151,11 @@ private Handler doCreateHandler(AppVersion appVersion) throws ServletException {
       context.setServer(server);
       context.setDefaultsDescriptor(WEB_DEFAULTS_XML);
       context.setClassLoader(appVersion.getClassLoader());
-      context.setErrorHandler(new NullErrorHandler());
+      if (useJettyErrorPageHandler) {
+        context.getErrorHandler().setShowStacks(false);
+      } else {
+        context.setErrorHandler(new NullErrorHandler());
+      }
       File qswebxml = new File(contextRoot, "WEB-INF/quickstart-web.xml");
       if (qswebxml.exists()) {
         context.setConfigurationClasses(quickstartConfigurationClasses);

diff --git a/runtime/impl/src/main/java/com/google/apphosting/runtime/jetty94/JettyHttpProxy.java b/runtime/impl/src/main/java/com/google/apphosting/runtime/jetty94/JettyHttpProxy.java
diff --git a/...rc/main/java/com/google/apphosting/runtime/jetty94/JettyServerConnectorWithReusePort.java b/...rc/main/java/com/google/apphosting/runtime/jetty94/JettyServerConnectorWithReusePort.java
@@ -33,7 +33,7 @@
  * A wrapper for Jetty to add support for SO_REUSEPORT. (Jetty 9.x does not directly expose it as a
  * setting.) SO_REUSEPORT only works when running with a Java 9+ JDK.
  */
-class JettyServerConnectorWithReusePort extends ServerConnector {
+public class JettyServerConnectorWithReusePort extends ServerConnector {
 
   private final boolean reusePort;
 

diff --git a/...e/impl/src/main/java/com/google/apphosting/runtime/jetty94/JettyServletEngineAdapter.java b/...e/impl/src/main/java/com/google/apphosting/runtime/jetty94/JettyServletEngineAdapter.java
@@ -97,7 +97,8 @@ public void start(String serverInfo, ServletEngineAdapter.Config runtimeOptions)
     rpcConnector = new RpcConnector(server);
     server.setConnectors(new Connector[] {rpcConnector});
     AppVersionHandlerFactory appVersionHandlerFactory =
-        new AppVersionHandlerFactory(server, serverInfo, contextFactory);
+        new AppVersionHandlerFactory(
+            server, serverInfo, contextFactory, /*useJettyErrorPageHandler=*/ false);
     appVersionHandlerMap = new AppVersionHandlerMap(appVersionHandlerFactory);
     server.setHandler(appVersionHandlerMap);
 

diff --git a/runtime/impl/src/main/java/com/google/apphosting/runtime/jetty94/UPRequestTranslator.java b/runtime/impl/src/main/java/com/google/apphosting/runtime/jetty94/UPRequestTranslator.java
diff --git a/...ime/impl/src/test/java/com/google/apphosting/runtime/jetty94/UPRequestTranslatorTest.java b/...ime/impl/src/test/java/com/google/apphosting/runtime/jetty94/UPRequestTranslatorTest.java
diff --git a/runtime/local/pom.xml b/runtime/local/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/runtime/main/src/main/java/com/google/apphosting/runtime/JavaRuntimeMain.java b/runtime/main/src/main/java/com/google/apphosting/runtime/JavaRuntimeMain.java
@@ -40,7 +40,11 @@ public class JavaRuntimeMain {
   private static final Logger logger = Logger.getLogger(JavaRuntimeMain.class.getName());
   private static final String PROPERTIES_LOCATION = "WEB-INF/appengine_optional.properties";
 
-  /** This property will be used in ClassPathUtils processing to determine the correct classpath. */
+  /**
+   * This property will be used in ClassPathUtils processing to determine the correct classpath.
+   * Property must now be true for the Java8 runtime, and is ignored for Java11/17 runtimes which
+   * can only use maven jars.
+   */
   private static final String USE_MAVEN_JARS = "use.mavenjars";
 
   /**

diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml
@@ -14,13 +14,11 @@
  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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>war</packaging>
-    <version>1.0</version>
+    <version>1.1-SNAPSHOT</version>
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>nogaeapiswebapp</artifactId>

diff --git a/runtime/pom.xml b/runtime/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <name>AppEngine :: runtime projects</name>
   <packaging>pom</packaging>

diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>runtime-parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>

diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>appengine-java-sdk</artifactId>
@@ -278,8 +278,8 @@
                                 <chmod dir="${assembly-directory}/bin" perm="755" includes="**/*.sh" />
                             </target>
                             <tasks>
-                                <delete file="${assembly-directory}/jetty94/jetty-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.version}.jar"/>
-                                <delete dir="${assembly-directory}/jetty94/jetty-home/demo-base"/>
+                                <delete file="${assembly-directory}/jetty94/jetty-home/lib/apache-jsp/org.eclipse.jetty.apache-jsp-${jetty.version}.jar" />
+                                <delete dir="${assembly-directory}/jetty94/jetty-home/demo-base" />
                             </tasks>
                         </configuration>
                     </execution>

diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
     </parent>
 
     <packaging>jar</packaging>

diff --git a/third_party/geronimo_javamail/pom.xml b/third_party/geronimo_javamail/pom.xml
@@ -22,14 +22,14 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.10-SNAPSHOT</version>
+        <version>2.0.11-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-javamail_1.4_spec</artifactId>
     <packaging>jar</packaging>
     <name>AppEngine :: JavaMail 1.4</name>
-    <version>1.4.4-${project.parent.version}</version>
+    <version>1.4.4-3.0.10-SNAPSHOT</version>
 
     <description>Javamail 1.4 Specification with AppEngine updates.</description>
 

diff --git a/utils/pom.xml b/utils/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.10-SNAPSHOT</version>
+    <version>2.0.11-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>