Merge remote-tracking branch 'origin/main' into jetty-12.1.x

Author: lachlan-roberts

.github/workflows/maven.yml

@@ -32,14 +32,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         java: [17, 21, 24]
-        jdk: [temurin, liberica, zulu]
-        exclude:
-          - java: 17
-            jdk: liberica
-          - java: 17
-            jdk: zulu
-          - java: 24
-            jdk: temurin
+        jdk: [temurin]
       fail-fast: false
 
     runs-on: ${{ matrix.os }}

.mvn/wrapper/maven-wrapper.properties

@@ -16,4 +16,4 @@
 # under the License.
 wrapperVersion=3.3.2
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.10/apache-maven-3.9.10-bin.zip

README.md

@@ -69,7 +69,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.33</version><!-- or later-->
+            <version>2.0.37</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>javax.servlet</groupId>
@@ -89,7 +89,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.33</version><!-- or later-->
+            <version>2.0.37</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>jakarta.servlet</groupId>
@@ -188,7 +188,7 @@ Source code for remote APIs for App Engine.
     <dependency>
        <groupId>com.google.appengine</groupId>
        <artifactId>appengine-remote-api</artifactId>
-       <version>2.0.33</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
     </dependency>
 ```
 
@@ -211,7 +211,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
     <dependency>
        <groupId>com.google.appengine</groupId>
        <artifactId>appengine-api-legacy.jar/artifactId>
-       <version>2.0.33</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
     </dependency>
 ```
 
@@ -226,19 +226,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-testing</artifactId>
-       <version>2.0.33</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-stubs</artifactId>
-       <version>2.0.33</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-tools-sdk</artifactId>
-       <version>2.0.33</version><!-- Or later-->
+       <version>2.0.37</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
 ```

THIRD-PARTY.txt

@@ -65,24 +65,6 @@ The repository contains 3rd-party code under the following licenses:
         * Guava InternalFutureFailureAccess and InternalFutures (com.google.guava:failureaccess:1.0.1 - https://github.com/google/guava/failureaccess)
         * Guava ListenableFuture only (com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - https://github.com/google/guava/listenablefuture)
         * Guava Testing Library (com.google.guava:guava-testlib:31.1-jre - https://github.com/google/guava/guava-testlib)
-        * io.grpc:grpc-alts (io.grpc:grpc-alts:1.45.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-api (io.grpc:grpc-api:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-auth (io.grpc:grpc-auth:1.42.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-context (io.grpc:grpc-context:1.27.2 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-context (io.grpc:grpc-context:1.42.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-context (io.grpc:grpc-context:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-core (io.grpc:grpc-core:1.45.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-core (io.grpc:grpc-core:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-googleapis (io.grpc:grpc-googleapis:1.45.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-grpclb (io.grpc:grpc-grpclb:1.42.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-netty (io.grpc:grpc-netty:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-netty-shaded (io.grpc:grpc-netty-shaded:1.45.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-protobuf (io.grpc:grpc-protobuf:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-protobuf-lite (io.grpc:grpc-protobuf-lite:1.42.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-protobuf-lite (io.grpc:grpc-protobuf-lite:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-services (io.grpc:grpc-services:1.42.1 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-stub (io.grpc:grpc-stub:1.49.0 - https://github.com/grpc/grpc-java)
-        * io.grpc:grpc-xds (io.grpc:grpc-xds:1.45.1 - https://github.com/grpc/grpc-java)
         * J2ObjC Annotations (com.google.j2objc:j2objc-annotations:1.3 - https://github.com/google/j2objc/)
         * Jackson (org.codehaus.jackson:jackson-core-asl:1.9.13 - http://jackson.codehaus.org)
         * Jackson 2 extensions to the Google HTTP Client Library for Java. (com.google.http-client:google-http-client-jackson2:1.41.7 - https://github.com/googleapis/google-http-java-client/google-http-client-jackson2)
@@ -113,17 +95,6 @@ The repository contains 3rd-party code under the following licenses:
         * Lucene Core (org.apache.lucene:lucene-core:2.9.4 - http://lucene.apache.org/java/lucene-core)
         * MortBay :: Apache EL :: API and Implementation (org.mortbay.jasper:apache-el:8.5.70 - https://github.com/jetty-project/jasper-jsp/apache-el)
         * MortBay :: Apache Jasper :: JSP Implementation (org.mortbay.jasper:apache-jsp:8.5.70 - https://github.com/jetty-project/jasper-jsp/apache-jsp)
-        * Netty/Buffer (io.netty:netty-buffer:4.1.77.Final - https://netty.io/netty-buffer/)
-        * Netty/Codec/HTTP (io.netty:netty-codec-http:4.1.77.Final - https://netty.io/netty-codec-http/)
-        * Netty/Codec/HTTP2 (io.netty:netty-codec-http2:4.1.77.Final - https://netty.io/netty-codec-http2/)
-        * Netty/Codec/Socks (io.netty:netty-codec-socks:4.1.77.Final - https://netty.io/netty-codec-socks/)
-        * Netty/Codec (io.netty:netty-codec:4.1.77.Final - https://netty.io/netty-codec/)
-        * Netty/Common (io.netty:netty-common:4.1.77.Final - https://netty.io/netty-common/)
-        * Netty/Handler/Proxy (io.netty:netty-handler-proxy:4.1.77.Final - https://netty.io/netty-handler-proxy/)
-        * Netty/Handler (io.netty:netty-handler:4.1.77.Final - https://netty.io/netty-handler/)
-        * Netty/Resolver (io.netty:netty-resolver:4.1.77.Final - https://netty.io/netty-resolver/)
-        * Netty/Transport/Native/Unix/Common (io.netty:netty-transport-native-unix-common:4.1.77.Final - https://netty.io/netty-transport-native-unix-common/)
-        * Netty/Transport (io.netty:netty-transport:4.1.77.Final - https://netty.io/netty-transport/)
         * Objenesis (org.objenesis:objenesis:3.2 - http://objenesis.org/objenesis)
         * OpenCensus (io.opencensus:opencensus-api:0.30.0 - https://github.com/census-instrumentation/opencensus-java)
         * OpenCensus (io.opencensus:opencensus-api:0.31.1 - https://github.com/census-instrumentation/opencensus-java)

TRYLATESTBITSINPROD.md

@@ -46,7 +46,7 @@ top of your web application and change the entrypoint to boot with these jars in
  ./mvnw clean install
 ```
 
-Let's assume the current build version is `2.0.34-SNAPSHOT`.
+Let's assume the current build version is `2.0.38-SNAPSHOT`.
 
 See the output of the runtime deployment module which contains all the jars needed by the runtime:
 
@@ -66,7 +66,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:
 
 ```
  <properties>
-        <appengine.runtime.version>2.0.34-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>2.0.38-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
  <properties>
  ...

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.34-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>

api/src/main/java/com/google/appengine/api/datastore/PreparedQueryImpl.java

@@ -36,11 +36,6 @@ public PreparedQueryImpl(Query query, Transaction txn, QueryRunner queryRunner)
     this.txn = txn;
     this.queryRunner = queryRunner;
 
-    // TODO Move this check and the one that follows into the
-    // LocalDatastoreService (it may already be there).
-    checkArgument(
-        txn == null || query.getAncestor() != null,
-        "Only ancestor queries are allowed inside transactions.");
     TransactionImpl.ensureTxnActive(txn);
   }
 

api/src/main/java/com/google/appengine/api/datastore/ValidatedQuery.java

@@ -93,13 +93,6 @@ private void validateQuery() {
       }
     }
 
-    // Transaction requires ancestor
-    if (query.hasTransaction() && !query.hasAncestor()) {
-      throw new IllegalQueryException(
-          "Only ancestor queries are allowed inside transactions.",
-          IllegalQueryType.TRANSACTION_REQUIRES_ANCESTOR);
-    }
-
     // Filters and sort orders require kind.
     if (!query.hasKind()) {
       for (Filter filter : query.filters()) {

api_dev/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.34-SNAPSHOT</version>
+    <version>2.0.38-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

api_dev/src/main/java/com/google/appengine/api/datastore/dev/LocalDatastoreService.java

@@ -1207,29 +1207,23 @@ public QueryResult runQuery(Status status, Query query) {
     String app = query.getApp();
     Profile profile = getOrCreateProfile(app);
 
-    // The real datastore supports executing ancestor queries in transactions.
-    // For now we're just going to make sure the entity group of the ancestor
-    // is the same entity group with which the transaction is associated and
-    // skip providing a transactionally consistent result set.
-
     synchronized (profile) {
-      // Having a transaction implies we have an ancestor, but having an
-      // ancestor does not imply we have a transaction.
-      if (query.hasTransaction() || query.hasAncestor()) {
-        // Query can only have a txn if it is an ancestor query.  Either way we
-        // know we've got an ancestor.
+
+      if (query.hasTransaction()) {
+        if (!app.equals(query.getTransaction().getApp())) {
+          throw newError(
+              ErrorCode.INTERNAL_ERROR,
+              "Can't query app "
+                  + app
+                  + "in a transaction on app "
+                  + query.getTransaction().getApp());
+        }
+      }
+
+      if (query.hasAncestor()) {
         Path groupPath = getGroup(query.getAncestor());
         Profile.EntityGroup eg = profile.getGroup(groupPath);
         if (query.hasTransaction()) {
-          if (!app.equals(query.getTransaction().getApp())) {
-            throw newError(
-                ErrorCode.INTERNAL_ERROR,
-                "Can't query app "
-                    + app
-                    + "in a transaction on app "
-                    + query.getTransaction().getApp());
-          }
-
           LiveTxn liveTxn = profile.getTxn(query.getTransaction().getHandle());
           // this will throw an exception if we attempt to read from
           // the wrong entity group
@@ -1238,12 +1232,10 @@ public QueryResult runQuery(Status status, Query query) {
           profile = eg.getSnapshot(liveTxn);
         }
 
-        if (query.hasAncestor()) {
-          if (query.hasTransaction() || !query.hasFailoverMs()) {
-            // Either we have a transaction or the user has requested strongly
-            // consistent results.  Either way, we need to apply jobs.
-            eg.rollForwardUnappliedJobs();
-          }
+        if (query.hasTransaction() || !query.hasFailoverMs()) {
+          // Either we have a transaction or the user has requested strongly
+          // consistent results.  Either way, we need to apply jobs.
+          eg.rollForwardUnappliedJobs();
         }
       }