Update Java version from 25-ea to 25 in Maven workflow.

PiperOrigin-RevId: 810960169
Change-Id: Ifc85416c2f519e4c1964d21af6229e850951670c

Author: ludoch

.github/workflows/maven.yml

@@ -31,14 +31,14 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        java: [17, 21, 25-ea]
+        java: [17, 21, 25]
         jdk: [temurin]
         include:
           - java: 17
             maven_profile: ""
           - java: 21
             maven_profile: "-Pjdk21"
-          - java: 25-ea
+          - java: 25
             maven_profile: "-Pjdk25"
       fail-fast: false
 
@@ -59,7 +59,7 @@ jobs:
         run: |
           if [[ "${{ matrix.java }}" == "21" ]]; then
             echo "JAVA_HOME_21=$JAVA_HOME" >> $GITHUB_ENV
-          elif [[ "${{ matrix.java }}" == "25-ea" ]]; then
+          elif [[ "${{ matrix.java }}" == "25" ]]; then
             echo "JAVA_HOME_25=$JAVA_HOME" >> $GITHUB_ENV
           fi
 

applications/springboot/pom.xml

@@ -36,7 +36,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.18</spring.boot.version>
+        <spring.boot.version>3.5.5</spring.boot.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>
@@ -63,8 +63,9 @@
 
         <!-- Include Servlet API -->
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>6.1.0</version>
             <scope>provided</scope>
         </dependency>
 

applications/springboot/src/main/webapp/WEB-INF/appengine-web.xml

@@ -18,6 +18,7 @@
   <runtime>java17</runtime>
   <system-properties>
     <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties"/>
+    <property name="appengine.use.jetty121" value="true"/>
   </system-properties>
   <instance-class>F4</instance-class>
 </appengine-web-app>

pom.xml

@@ -236,10 +236,9 @@
       <profile>
           <id>jdk25</id>
           <properties>
-              <!-- TODO: Update the JDK version to 25 once shader plugin is fixed for 25. -->
-              <maven.compiler.release>23</maven.compiler.release>
-              <maven.compiler.source>23</maven.compiler.source>
-              <maven.compiler.target>23</maven.compiler.target>
+              <maven.compiler.release>25</maven.compiler.release>
+              <maven.compiler.source>25</maven.compiler.source>
+              <maven.compiler.target>25</maven.compiler.target>
           </properties>
           <build>
               <plugins>

runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java

@@ -45,19 +45,19 @@ public void initialize() throws IOException, InterruptedException {
                 "install",
                 "appengine:stage",
                 "-f",
-                new File(currentDirectory, "../../applications/springboot/pom.xml")
+                new File(currentDirectory.getParentFile().getParentFile(), "applications/springboot/pom.xml")
                     .getAbsolutePath())
             .start();
     List<String> results = readOutput(process.getInputStream());
     System.out.println("mvn process output:" + results);
     int exitCode = process.waitFor();
     assertThat(0).isEqualTo(exitCode);
-    appRoot = new File(currentDirectory, "../../applications/springboot/target/appengine-staging");
+    appRoot = new File(currentDirectory.getParentFile().getParentFile(), "applications/springboot/target/appengine-staging");
     assertThat(appRoot.isDirectory()).isTrue();
   }
 
   public SpringBootTest() {
-    super("java17", "12.0", "EE8", false);
+    super("java17", "12.1", "EE11", false);
   }
 
   private RuntimeContext<DummyApiServer> runtimeContext() throws IOException, InterruptedException {
@@ -75,6 +75,7 @@ private static List<String> readOutput(InputStream inputStream) throws IOExcepti
   @Test
   public void testSpringBootCanBoot() throws Exception {
     initialize();
+    Thread.sleep(1000);
     try (RuntimeContext<DummyApiServer> runtime = runtimeContext()) {
       runtime.executeHttpGet("/", "Hello world - springboot-appengine-standard!", 200);
     }