from main (#414)

* Use Servlet 3.1 so that annotation scanning is triggered.

PiperOrigin-RevId: 807961122
Change-Id: I7d3bc779cba725800e7a2cd8bd5787b0c65998cf

* Upgrade GAE Java version to 3.0.0-beta and prepare next version 3.0.0-SNAPSHOT

PiperOrigin-RevId: 809022511
Change-Id: I9636317c5d42acfb1d23a571bfc510cafb735fc3

* Update all non-major dependencies

---------

Co-authored-by: Mend Renovate <bot@renovateapp.com>
Co-authored-by: GAE Java Team <gae-java-bot@google.com>

Author: 3 people

README.md

@@ -17,7 +17,7 @@
 [![Maven][maven-version-image]][maven-version-link]
 [![Code of conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg)](https://github.com/GoogleCloudPlatform/appengine-java-standard/blob/main/CODE_OF_CONDUCT.md)
 
-# Google App Engine Standard Environment Source Code for Java 17, Java 21, Java25
+# Google App Engine Standard Environment Source Code for Java 17, Java 21, Java 25.
 
 
 This repository contains the Java Source Code for [Google App Engine
@@ -100,7 +100,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
     ...
     ```
 
-*  Maven Java 25 Alpha with Jarkata EE 11 support pom.xml (EE10 is not supported in Java25, EE11 is fully compatible with EE10)
+*  Maven Java 25 Alpha with Jakarta EE 11 support pom.xml (EE10 is not supported in Java25, EE11 is fully compatible with EE10)
 
     ```
     <packaging>war</packaging><!-- Servlet 6.1 WAR packaging-->
@@ -109,7 +109,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.38</version><!-- or later-->
+            <version>3.0.0-beta</version><!-- or later-->
         </dependency>
         <dependency>
           <groupId>jakarta.servlet</groupId>
@@ -121,7 +121,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
     ```
 
 
-*  Java 21/25  with javax EE8 profile appengine-web.xml
+*  Java 21/25 with javax EE8 profile appengine-web.xml
 
     ```
     <?xml version="1.0" encoding="utf-8"?>

TRYLATESTBITSINPROD.md

@@ -49,7 +49,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 `3.0.0-beta-SNAPSHOT`.
+Let's assume the current build version is `3.0.0-SNAPSHOT`.
 
 See the output of the runtime deployment module which contains all the jars needed by the runtime:
 
@@ -70,7 +70,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:
 
 ```
  <properties>
-        <appengine.runtime.version>3.0.0-beta-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>3.0.0-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
  <properties>
  ...
@@ -148,7 +148,7 @@ In the appengine-web.xml, modify the entrypoint to use the bundled runtime jars
 ```
 <?xml version="1.0" encoding="utf-8"?>
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
-   <runtime>java17</runtime>
+   <runtime>java21</runtime>
    <app-engine-apis>true</app-engine-apis>
    <system-properties>
         <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>

api/pom.xml

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

api_dev/pom.xml

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

api_legacy/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>3.0.0-beta-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
 
   <packaging>jar</packaging>

appengine-api-1.0-sdk/pom.xml

@@ -20,7 +20,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>3.0.0-beta-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-api-1.0-sdk</name>

appengine-api-stubs/pom.xml

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

appengine_init/pom.xml

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

appengine_jsr107/pom.xml

@@ -26,7 +26,7 @@
     <parent>
         <groupId>com.google.appengine</groupId>
         <artifactId>parent</artifactId>
-        <version>3.0.0-beta-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

appengine_resources/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>3.0.0-beta-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
   </parent>
   <packaging>jar</packaging>
   <name>AppEngine :: appengine-resources</name>