Addressing auto-review comments and taking comments from previous PR #10193

Author: maigovannon

appengine-java21/ee8/analytics/pom.xml

@@ -32,9 +32,9 @@
   </parent>
 
   <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <appengine.sdk.version>2.0.23</appengine.sdk.version>
+    <maven.compiler.target>25</maven.compiler.target>
+    <maven.compiler.source>25</maven.compiler.source>
+    <appengine.sdk.version>3.0.1</appengine.sdk.version>
   </properties>
 
   <dependencyManagement>

flexible/java-25/websocket-jetty/README.md

@@ -37,9 +37,7 @@ test against the Websocket server.
 
 ## Deploy
 
-The sample application is packaged as a war, and hence will be automatically run
-using the [Java 8/Jetty 9 with Servlet 3.1
-Runtime](https://cloud.google.com/appengine/docs/flexible/java/dev-jetty9).
+The sample application is packaged as a jar and runs on the Java 25 runtime.
 
 ```sh
 mvn clean package appengine:deploy

flexible/java-25/websocket-jetty/pom.xml

@@ -34,8 +34,8 @@
   </parent>
 
   <properties>
-    <maven.compiler.target>17</maven.compiler.target>
-    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>25</maven.compiler.target>
+    <maven.compiler.source>25</maven.compiler.source>
     <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
     <jetty.version>9.4.57.v20241219</jetty.version>
     <spring.boot.version>2.7.18</spring.boot.version>

flexible/java-25/websocket-jetty/src/main/java/com/example/flexible/websocket/jettynative/Main.java

@@ -104,8 +104,8 @@ private static void enableEmbeddedJspSupport(ServletContextHandler servletContex
     holderJsp.setInitParameter("logVerbosityLevel", "DEBUG");
     holderJsp.setInitParameter("fork", "false");
     holderJsp.setInitParameter("xpoweredBy", "false");
-    holderJsp.setInitParameter("compilerTargetVM", "1.8");
-    holderJsp.setInitParameter("compilerSourceVM", "1.8");
+    holderJsp.setInitParameter("compilerTargetVM", "25");
+    holderJsp.setInitParameter("compilerSourceVM", "25");
     holderJsp.setInitParameter("keepgenerated", "true");
     servletContextHandler.addServlet(holderJsp, "*.jsp");
   }