Merge main to proto2 tests (#302)

* Copybara import of the project: -- bbad663 by Mend Renovate <[email protected]>: Update all non-major dependencies COPYBARA_INTEGRATE_REVIEW=#285 from renovate-bot:renovate/all-minor-patch bbad663 PiperOrigin-RevId: 684477251 Change-Id: If7dfb2beb25d1378618a884350ec5d8d4bd3dd46 * Copybara import of the project: -- af7d544 by Mend Renovate <[email protected]>: Update all non-major dependencies COPYBARA_INTEGRATE_REVIEW=#286 from renovate-bot:renovate/all-minor-patch af7d544 PiperOrigin-RevId: 685680510 Change-Id: I96df12dbd2fb7c6eb6cfaae3489626a14766bef9 * Upgrade GAE Java version from 2.0.30 to 2.0.31 and prepare next version 2.0.32-SNAPSHOT PiperOrigin-RevId: 686867662 Change-Id: Id02da08eb160552da419cace43b86c3558e08b0d * Update all non-major dependencies * Update all non-major dependencies * Fix multithread build by ensuring jars are build correctly before copy those jars Signed-off-by: Olivier Lamy <[email protected]> * Update dependency com.google.cloud:google-cloud-logging to v3.20.5 * Simplity copying dependencies Signed-off-by: Olivier Lamy <[email protected]> * exclude not needed artifacts Signed-off-by: Olivier Lamy <[email protected]> * Do not include runtime-* in WEB-INF/lib Signed-off-by: Olivier Lamy <[email protected]> * Copybara import of the project: -- cb49a97 by Mend Renovate <[email protected]>: Update all non-major dependencies COPYBARA_INTEGRATE_REVIEW=#299 from renovate-bot:renovate/all-minor-patch cb49a97 PiperOrigin-RevId: 690485840 Change-Id: I76205310268bc27e3c1ab56be4d42b6d486f4e4c * Copybara import of the project: -- 05d0d3c by Mend Renovate <[email protected]>: Update all non-major dependencies COPYBARA_INTEGRATE_REVIEW=#299 from renovate-bot:renovate/all-minor-patch 05d0d3c PiperOrigin-RevId: 690870869 Change-Id: I1ba450e60d8637dfd64adb866a5b185b08a744ad * Update all non-major dependencies --------- Signed-off-by: Olivier Lamy <[email protected]> Co-authored-by: Mend Renovate <[email protected]> Co-authored-by: Srinjoy Ray <[email protected]> Co-authored-by: GAE Java Team <[email protected]> Co-authored-by: Olivier Lamy <[email protected]>
GoogleCloudPlatform · Nov 7, 2024 · 2d72288 · 2d72288
1 parent 1f5fbe1
commit 2d72288
Show file tree

Hide file tree

Showing 115 changed files with 348 additions and 320 deletions.
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
@@ -14,5 +14,6 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-wrapperVersion=3.3.1
+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
diff --git a/README.md b/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.30</version><!-- or later-->
+            <version>2.0.31</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.30</version><!-- or later-->
+            <version>2.0.31</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>javax.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.30</version><!-- Or later-->
+       <version>2.0.31</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.30</version><!-- Or later-->
+       <version>2.0.31</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.30</version><!-- Or later-->
+       <version>2.0.31</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-stubs</artifactId>
-       <version>2.0.30</version><!-- Or later-->
+       <version>2.0.31</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-tools-sdk</artifactId>
-       <version>2.0.30</version><!-- Or later-->
+       <version>2.0.31</version><!-- Or later-->
       <scope>test</scope>
     </dependency>
 ```

diff --git a/TRYLATESTBITSINPROD.md b/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.31-SNAPSHOT`.
+Let's assume the current build version is `2.0.32-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.31-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>2.0.32-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
  <properties>
  ...

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.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
@@ -236,7 +236,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.10.1</version>
+            <version>3.11.1</version>
             <configuration>
               <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
               <useStandardDocletOptions>false</useStandardDocletOptions>

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.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

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.31-SNAPSHOT</version>
+    <version>2.0.32-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.31-SNAPSHOT</version>
+    <version>2.0.32-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.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-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.31-SNAPSHOT</version>
+        <version>2.0.32-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.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-resources</name>

diff --git a/appengine_setup/apiserver_local/pom.xml b/appengine_setup/apiserver_local/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>appengine_setup</artifactId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -36,7 +36,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.5.1</version>
+        <version>3.5.2</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

diff --git a/appengine_setup/pom.xml b/appengine_setup/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <modules>
     <module>apiserver_local</module>

diff --git a/appengine_setup/test/pom.xml b/appengine_setup/test/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>appengine_setup</artifactId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>

diff --git a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java
@@ -26,6 +26,6 @@ protected String appName() {
     @Override
     protected String relativePathForUserApplicationJar() {
     return "../testapps/jetty12_testapp/target/"
-        + "jetty12_testapp-2.0.31-SNAPSHOT-jar-with-dependencies.jar";
+        + "jetty12_testapp-2.0.32-SNAPSHOT-jar-with-dependencies.jar";
     }
 }
diff --git a/...ngine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java b/...ngine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java
@@ -25,6 +25,6 @@ protected String appName() {
 
     @Override
     protected String relativePathForUserApplicationJar() {
-    return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.31-SNAPSHOT.jar";
+    return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.32-SNAPSHOT.jar";
     }
 }
diff --git a/appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java b/appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java
@@ -62,7 +62,7 @@ public static HttpClient initializeHttpClient(int timeoutMillis) {
     @SneakyThrows
     public static Process initializeHttpApiServer() {
     String apiServerRelativeJarPath =
-        "../apiserver_local/target/" + "apiserver_local-2.0.31-SNAPSHOT-jar-with-dependencies.jar";
+        "../apiserver_local/target/" + "apiserver_local-2.0.32-SNAPSHOT-jar-with-dependencies.jar";
         File currentDirectory = new File("").getAbsoluteFile();
         File apiServerJar = new File(currentDirectory, apiServerRelativeJarPath);
         ImmutableList<String> processArgs = ImmutableList.<String>builder()

diff --git a/appengine_setup/testapps/jetty12_testapp/pom.xml b/appengine_setup/testapps/jetty12_testapp/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>testapps</artifactId>
     <groupId>com.google.appengine</groupId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine.setup.testapps</groupId>
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>com.google.appengine.setup.testapps</groupId>
       <artifactId>testapps_common</artifactId>
-      <version>2.0.31-SNAPSHOT</version>
+      <version>2.0.32-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
@@ -106,7 +106,7 @@
           <projectId>srirammahavadi-dev</projectId>
           <version>GCLOUD_CONFIG</version>
           <automaticRestart>true</automaticRestart>
-          <artifact>${project.build.directory}/jetty11_testapp-2.0.31-SNAPSHOT-jar-with-dependencies.jar</artifact>
+          <artifact>${project.build.directory}/jetty11_testapp-2.0.32-SNAPSHOT-jar-with-dependencies.jar</artifact>
         </configuration>
       </plugin>
 

diff --git a/appengine_setup/testapps/pom.xml b/appengine_setup/testapps/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>appengine_setup</artifactId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine</groupId>

diff --git a/appengine_setup/testapps/springboot_testapp/pom.xml b/appengine_setup/testapps/springboot_testapp/pom.xml
@@ -25,7 +25,7 @@
 	</parent>
 	<groupId>com.google.appengine.setup.testapps</groupId>
 	<artifactId>springboot_testapp</artifactId>
-	<version>2.0.31-SNAPSHOT</version>
+	<version>2.0.32-SNAPSHOT</version>
 	<name>springboot_testapp</name>
 	<description>Demo project for Spring Boot</description>
 	<properties>
@@ -44,12 +44,12 @@
 		<dependency>
 			<groupId>com.google.appengine</groupId>
 			<artifactId>appengine-api-1.0-sdk</artifactId>
-			<version>2.0.31-SNAPSHOT</version>
+			<version>2.0.32-SNAPSHOT</version>
 		</dependency>
 	 <dependency>
 	  <groupId>com.google.appengine.setup.testapps</groupId>
 	  <artifactId>testapps_common</artifactId>
-	  <version>2.0.31-SNAPSHOT</version>
+	  <version>2.0.32-SNAPSHOT</version>
 	  <type>jar</type>
 	 </dependency>
 	</dependencies>

diff --git a/appengine_setup/testapps/testapps_common/pom.xml b/appengine_setup/testapps/testapps_common/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <artifactId>testapps</artifactId>
     <groupId>com.google.appengine</groupId>
-    <version>2.0.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.appengine.setup.testapps</groupId>

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.31-SNAPSHOT</version>
+    <version>2.0.32-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.31-SNAPSHOT</version>
+        <version>2.0.32-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.31-SNAPSHOT</version>
+    <version>2.0.32-SNAPSHOT</version>
   </parent>
   <packaging>pom</packaging>
   <properties>