Merge pull request #62 from GoogleCloudPlatform/main

Merge changes from main
GoogleCloudPlatform · Oct 10, 2023 · c8201ff · c8201ff
2 parents f51cc59 + 0d09e8a
commit c8201ff
Show file tree

Hide file tree

Showing 56 changed files with 331 additions and 410 deletions.
diff --git a/api/src/main/java/com/google/apphosting/utils/remoteapi/RemoteApiServlet.java b/api/src/main/java/com/google/apphosting/utils/remoteapi/RemoteApiServlet.java
@@ -36,6 +36,7 @@
 import com.google.apphosting.utils.remoteapi.RemoteApiPb.ApplicationError;
 import com.google.apphosting.utils.remoteapi.RemoteApiPb.Request;
 import com.google.apphosting.utils.remoteapi.RemoteApiPb.Response;
+import com.google.apphosting.utils.remoteapi.RemoteApiPb.TransactionQueryResult;
 import com.google.apphosting.utils.remoteapi.RemoteApiPb.TransactionRequest;
 import com.google.apphosting.utils.remoteapi.RemoteApiPb.TransactionRequest.Precondition;
 import com.google.io.protocol.ProtocolMessage;
@@ -267,7 +268,7 @@ private byte[] executeRunQuery(Request request) {
   }
 
   private byte[] executeTxQuery(Request request) {
-    RemoteApiPb.TransactionQueryResult result = new RemoteApiPb.TransactionQueryResult();
+    TransactionQueryResult result = new TransactionQueryResult();
 
     Query query = new Query();
     parseFromBytes(query, request.getRequestAsBytes());

diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml
@@ -243,7 +243,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>appengine-maven-plugin</artifactId>
-                <version>2.4.1</version>
+                <version>2.4.4</version>
                 <configuration>
                     <projectId>ludo-in-in</projectId>
                     <version>liveruntimejava8maven</version>
@@ -253,15 +253,15 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.10.1</version>
+                <version>3.11.0</version>
                 <configuration>
                     <release>8</release>
                 </configuration>
             </plugin>
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-enforcer-plugin</artifactId>
-              <version>3.1.0</version>
+              <version>3.4.0</version>
               <executions>
                 <execution>
                   <id>enforce-maven</id>

diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>springboot</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>applications</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: springboot</name>
@@ -31,7 +35,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.deploy.skip>true</maven.deploy.skip>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <spring.boot.version>2.7.2</spring.boot.version>
+        <spring.boot.version>2.7.15</spring.boot.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
@@ -40,7 +44,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring.boot.version}</version>
             <!-- Exclude Tomcat so that it doesn't conflict w/ Jetty server -->
             <exclusions>
                 <exclusion>
@@ -54,28 +57,24 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.30</version>
             <scope>provided</scope>
         </dependency>
 
         <!-- Include Servlet API -->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -103,7 +102,7 @@
             <plugin>
                 <groupId>com.google.cloud.tools</groupId>
                 <artifactId>appengine-maven-plugin</artifactId>
-                <version>2.4.3</version>
+                <version>2.4.4</version>
                 <configuration>
                     <!-- can be set w/ -DprojectId=myProjectId on command line -->
                     <projectId>ludo-in-in</projectId>
@@ -114,7 +113,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>

diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
@@ -177,7 +177,7 @@ private static String getWarPath(String directoryName) {
                     + directoryName
                     + "/target/"
                     + directoryName
-                    + "-0.0.1-SNAPSHOT")
+                    + "-2.0.21-SNAPSHOT")
             .getAbsolutePath();
 
 //    assertThat(appRoot.isDirectory()).isTrue();

diff --git a/...agingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java b/...agingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java
@@ -56,7 +56,7 @@ static File createApp(String directoryName) {
     File appRoot =
         new File(
             currentDirectory,
-            "../testlocalapps/" + directoryName + "/target/" + directoryName + "-0.0.1-SNAPSHOT");
+            "../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.21-SNAPSHOT");
     return appRoot;
   }
 

diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>allinone</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: allinone test application</name>
@@ -39,18 +43,15 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.appengine</groupId>
             <artifactId>appengine-api-1.0-sdk</artifactId>
-            <version>2.0.19</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>32.1.2-jre</version>
             <type>jar</type>
         </dependency>
     </dependencies>
@@ -71,7 +72,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
+                <version>3.4.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>

diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>badcron</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: badcron</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml
@@ -21,7 +21,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard</name>
@@ -39,7 +43,6 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
       <scope>provided</scope>
     </dependency>
   </dependencies>
@@ -58,13 +61,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
@@ -22,7 +22,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard_with_container_initializer</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard_with_container_initializer</name>
@@ -69,13 +73,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
@@ -21,7 +21,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard_with_no_jsp</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard_with_no_jsp</name>
@@ -30,7 +34,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.deploy.skip>true</maven.deploy.skip>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.boot.version>2.7.2</spring.boot.version>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
@@ -59,13 +62,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
@@ -21,7 +21,11 @@
 
   <groupId>com.google.appengine.demos</groupId>
   <artifactId>bundle_standard_with_weblistener_memcache</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>testlocalapps</artifactId>
+    <version>2.0.21-SNAPSHOT</version>
+  </parent>
   <packaging>war</packaging>
 
   <name>AppEngine :: bundle_standard_with_weblistener_memcache</name>
@@ -30,7 +34,6 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.deploy.skip>true</maven.deploy.skip>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <spring.boot.version>2.7.2</spring.boot.version>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
   </properties>
@@ -64,13 +67,6 @@
           <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <version>3.3.1</version>
-        <configuration>
-          <failOnMissingWebXml>false</failOnMissingWebXml>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
@@ -21,7 +21,11 @@
 
     <groupId>com.google.appengine.demos</groupId>
     <artifactId>cron-bad-job-age-limit</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <parent>
+      <groupId>com.google.appengine</groupId>
+      <artifactId>testlocalapps</artifactId>
+      <version>2.0.21-SNAPSHOT</version>
+    </parent>
     <packaging>war</packaging>
 
     <name>AppEngine :: cron-bad-job-age-limit</name>
@@ -39,7 +43,6 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
-            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>
@@ -58,13 +61,6 @@
                     <!-- set the GAE version or use "GCLOUD_CONFIG" for an autogenerated GAE version -->
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>3.3.1</version>
-                <configuration>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>