experiment to upgrade GAE ee10 code to use ee11

Signed-off-by: Lachlan Roberts <lachlan.p.roberts@gmail.com>

Author: lachlan-roberts

README.md

@@ -94,7 +94,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
         <dependency>
           <groupId>jakarta.servlet</groupId>
           <artifactId>jakarta.servlet-api</artifactId>
-          <version>6.0.0</version>
+          <version>6.1.0</version>
           <scope>provided</scope>
         </dependency>
     ...
@@ -167,13 +167,13 @@ Source code for remote APIs for App Engine.
 ```
 
 
-* Servlet Jarkata EE10 web.xml
+* Servlet Jarkata EE11 web.xml
 
 ```
    <servlet>
      <display-name>Remote API Servlet</display-name>
      <servlet-name>RemoteApiServlet</servlet-name>
-     <servlet-class>com.google.apphosting.utils.remoteapi.EE10RemoteApiServlet</servlet-class>
+     <servlet-class>com.google.apphosting.utils.remoteapi.EE11RemoteApiServlet</servlet-class>
      <load-on-startup>1</load-on-startup>
    </servlet>
    <servlet-mapping>

TRYLATESTBITSINPROD.md

@@ -33,7 +33,7 @@ are bundled as a Maven assembly under `<artifactId>runtime-deployment</artifactI
   * runtime-impl-jetty12.jar
   * runtime-shared-jetty9.jar
   * runtime-shared-jetty12.jar
-  * runtime-shared-jetty12-ee10.jar
+  * runtime-shared-jetty12-ee11.jar
   * runtime-main.jar
 
 Let's say you want the latest from head in this github repository. You could built the 6 jars, add them at the
@@ -54,7 +54,7 @@ See the output of the runtime deployment module which contains all the jars need
 ```
 ls  runtime/deployment/target/runtime-deployment-*/
 runtime-impl-jetty12.jar	runtime-main.jar		runtime-shared-jetty12.jar
-runtime-impl-jetty9.jar		runtime-shared-jetty12-ee10.jar	runtime-shared-jetty9.jar
+runtime-impl-jetty9.jar		runtime-shared-jetty12-ee11.jar	runtime-shared-jetty9.jar
 ```
 
 These jars are pushed in Maven Central as well under artifact com.google.appengine:runtime-deployment.
@@ -112,8 +112,8 @@ deployed web application.
                         <destinationFile>${appengine.runtime.location}/runtime-shared-jetty12.jar</destinationFile>
                     </fileSet>
                      <fileSet>
-                        <sourceFile>${appengine.runtime.location}/WEB-INF/lib/runtime-shared-jetty12-ee10-${appengine.runtime.version}.jar</sourceFile>
-                        <destinationFile>${appengine.runtime.location}/runtime-shared-jetty12-ee10.jar</destinationFile>
+                        <sourceFile>${appengine.runtime.location}/WEB-INF/lib/runtime-shared-jetty12-ee11-${appengine.runtime.version}.jar</sourceFile>
+                        <destinationFile>${appengine.runtime.location}/runtime-shared-jetty12-ee11.jar</destinationFile>
                     </fileSet>
                     <fileSet>
                         <sourceFile>${appengine.runtime.location}/WEB-INF/lib/runtime-main-${appengine.runtime.version}.jar</sourceFile>

…api/blobstore/ee10/BlobstoreService.java …api/blobstore/ee11/BlobstoreService.javaapi/src/main/java/com/google/appengine/api/blobstore/ee10/BlobstoreService.java renamed to api/src/main/java/com/google/appengine/api/blobstore/ee11/BlobstoreService.java api/src/main/java/com/google/appengine/api/blobstore/ee10/BlobstoreService.java renamed to api/src/main/java/com/google/appengine/api/blobstore/ee11/BlobstoreService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.appengine.api.blobstore.ee10;
+package com.google.appengine.api.blobstore.ee11;
 
 import com.google.appengine.api.blobstore.BlobInfo;
 import com.google.appengine.api.blobstore.BlobKey;

…bstore/ee10/BlobstoreServiceFactory.java …bstore/ee11/BlobstoreServiceFactory.javaapi/src/main/java/com/google/appengine/api/blobstore/ee10/BlobstoreServiceFactory.java renamed to api/src/main/java/com/google/appengine/api/blobstore/ee11/BlobstoreServiceFactory.java api/src/main/java/com/google/appengine/api/blobstore/ee10/BlobstoreServiceFactory.java renamed to api/src/main/java/com/google/appengine/api/blobstore/ee11/BlobstoreServiceFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.appengine.api.blobstore.ee10;
+package com.google.appengine.api.blobstore.ee11;
 
 
 /** Creates {@link BlobstoreService} implementations for java EE 10. */

…blobstore/ee10/BlobstoreServiceImpl.java …blobstore/ee11/BlobstoreServiceImpl.javaapi/src/main/java/com/google/appengine/api/blobstore/ee10/BlobstoreServiceImpl.java renamed to api/src/main/java/com/google/appengine/api/blobstore/ee11/BlobstoreServiceImpl.java api/src/main/java/com/google/appengine/api/blobstore/ee10/BlobstoreServiceImpl.java renamed to api/src/main/java/com/google/appengine/api/blobstore/ee11/BlobstoreServiceImpl.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.appengine.api.blobstore.ee10;
+package com.google.appengine.api.blobstore.ee11;
 
 import static java.util.Objects.requireNonNull;
 

…/mail/ee10/BounceNotificationParser.java …/mail/ee11/BounceNotificationParser.javaapi/src/main/java/com/google/appengine/api/mail/ee10/BounceNotificationParser.java renamed to api/src/main/java/com/google/appengine/api/mail/ee11/BounceNotificationParser.java api/src/main/java/com/google/appengine/api/mail/ee10/BounceNotificationParser.java renamed to api/src/main/java/com/google/appengine/api/mail/ee11/BounceNotificationParser.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.appengine.api.mail.ee10;
+package com.google.appengine.api.mail.ee11;
 
 import com.google.appengine.api.mail.BounceNotification;
-import com.google.appengine.api.utils.ee10.HttpRequestParser;
+import com.google.appengine.api.utils.ee11.HttpRequestParser;
 import jakarta.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.Properties;

…/taskqueue/ee10/DeferredTaskContext.java …/taskqueue/ee11/DeferredTaskContext.javaapi/src/main/java/com/google/appengine/api/taskqueue/ee10/DeferredTaskContext.java renamed to api/src/main/java/com/google/appengine/api/taskqueue/ee11/DeferredTaskContext.java api/src/main/java/com/google/appengine/api/taskqueue/ee10/DeferredTaskContext.java renamed to api/src/main/java/com/google/appengine/api/taskqueue/ee11/DeferredTaskContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.appengine.api.taskqueue.ee10;
+package com.google.appengine.api.taskqueue.ee11;
 
 import com.google.apphosting.api.ApiProxy;
 import jakarta.servlet.http.HttpServlet;

…ne/api/utils/ee10/HttpRequestParser.java …ne/api/utils/ee11/HttpRequestParser.javaapi/src/main/java/com/google/appengine/api/utils/ee10/HttpRequestParser.java renamed to api/src/main/java/com/google/appengine/api/utils/ee11/HttpRequestParser.java api/src/main/java/com/google/appengine/api/utils/ee10/HttpRequestParser.java renamed to api/src/main/java/com/google/appengine/api/utils/ee11/HttpRequestParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.appengine.api.utils.ee10;
+package com.google.appengine.api.utils.ee11;
 
 import jakarta.servlet.ServletInputStream;
 import jakarta.servlet.http.HttpServletRequest;

…tils/remoteapi/EE10RemoteApiServlet.java …tils/remoteapi/EE11RemoteApiServlet.javaapi/src/main/java/com/google/apphosting/utils/remoteapi/EE10RemoteApiServlet.java renamed to api/src/main/java/com/google/apphosting/utils/remoteapi/EE11RemoteApiServlet.java api/src/main/java/com/google/apphosting/utils/remoteapi/EE10RemoteApiServlet.java renamed to api/src/main/java/com/google/apphosting/utils/remoteapi/EE11RemoteApiServlet.java

@@ -65,8 +65,8 @@
  * Remote API servlet handler for Jarkata EE APIs.
  *
  */
-public class EE10RemoteApiServlet extends HttpServlet {
-  private static final Logger log = Logger.getLogger(EE10RemoteApiServlet.class.getName());
+public class EE11RemoteApiServlet extends HttpServlet {
+  private static final Logger log = Logger.getLogger(EE11RemoteApiServlet.class.getName());
 
   private static final String[] OAUTH_SCOPES = new String[] {
       "https://www.googleapis.com/auth/appengine.apis",
@@ -78,12 +78,12 @@ public class EE10RemoteApiServlet extends HttpServlet {
   private HashSet<String> allowedApps = null;
   private final OAuthService oauthService;
 
-  public EE10RemoteApiServlet() {
+  public EE11RemoteApiServlet() {
     this(OAuthServiceFactory.getOAuthService());
   }
 
   // @VisibleForTesting
-  EE10RemoteApiServlet(OAuthService oauthService) {
+  EE11RemoteApiServlet(OAuthService oauthService) {
     this.oauthService = oauthService;
   }
 

…ls/servlet/ee10/DeferredTaskServlet.java …ls/servlet/ee11/DeferredTaskServlet.javaapi/src/main/java/com/google/apphosting/utils/servlet/ee10/DeferredTaskServlet.java renamed to api/src/main/java/com/google/apphosting/utils/servlet/ee11/DeferredTaskServlet.java api/src/main/java/com/google/apphosting/utils/servlet/ee10/DeferredTaskServlet.java renamed to api/src/main/java/com/google/apphosting/utils/servlet/ee11/DeferredTaskServlet.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.apphosting.utils.servlet.ee10;
+package com.google.apphosting.utils.servlet.ee11;
 
 import com.google.appengine.api.taskqueue.DeferredTask;
-import com.google.appengine.api.taskqueue.ee10.DeferredTaskContext;
+import com.google.appengine.api.taskqueue.ee11.DeferredTaskContext;
 import com.google.apphosting.api.ApiProxy;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletInputStream;