Fixing PR comments

Author: maigovannon

.kokoro/tests/run_test_java.sh

@@ -20,7 +20,7 @@ SCRIPT_DIR="$(dirname $0)/"
 
 # Fail the tests if no Java version was found.
 POM_JAVA=$(grep -oP '(?<=<maven.compiler.target>).*?(?=</maven.compiler.target>)' pom.xml)
-ALLOWED_VERSIONS=("1.8" "11" "17" "21")
+ALLOWED_VERSIONS=("1.8" "11" "17" "21", "25")
 # shellcheck disable=SC2199
 # shellcheck disable=SC2076
 if [[ "$POM_JAVA" = "" ]] || [[ ! " ${ALLOWED_VERSIONS[*]} " =~ " ${POM_JAVA} " ]]; then

appengine-java25/ee11/analytics/README.md

@@ -1,6 +1,6 @@
 # Google Analytics sample for Google App Engine
 
-<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java21/analytics/README.md">
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=appengine-java25/ee11/analytics/README.md">
 <img alt="Open in Cloud Shell" src ="https://gstatic.com/cloudssh/images/open-btn.png"></a>
 
 Integrating App Engine with Google Analytics using EE11.

appengine-java25/ee11/analytics/pom.xml

@@ -34,7 +34,7 @@
   <properties>
     <maven.compiler.target>25</maven.compiler.target>
     <maven.compiler.source>25</maven.compiler.source>
-    <appengine.sdk.version>2.0.29</appengine.sdk.version>
+    <appengine.sdk.version>3.0.1</appengine.sdk.version>
   </properties>
 
   <dependencyManagement>

appengine-java25/ee11/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java

@@ -16,7 +16,7 @@
 
 package com.example.appengine.analytics;
 
-// [START gae_java21_analytics_track]
+// [START gae_java25_analytics_track]
 import com.google.appengine.api.urlfetch.URLFetchService;
 import com.google.appengine.api.urlfetch.URLFetchServiceFactory;
 import java.io.IOException;
@@ -67,4 +67,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)
     resp.getWriter().println("Event tracked.");
   }
 }
-// [END gae_java21_analytics_track]
+// [END gae_java25_analytics_track]

appengine-java25/ee11/analytics/src/main/webapp/WEB-INF/web.xml

@@ -13,11 +13,11 @@
   limitations under the License.
 -->
 <!-- [END_EXCLUDE] -->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" version="3.1">
-  <welcome-file-list>
-    <welcome-file>analytics</welcome-file>
-  </welcome-file-list>
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version="6.0">
+    <welcome-file-list>
+        <welcome-file>analytics</welcome-file>
+    </welcome-file-list>
 </web-app>

appengine-java25/helloworld/README.md

@@ -1,4 +1,4 @@
-HelloWorld for App Engine Standard (Java 21)
+HelloWorld for App Engine Standard (Java 25)
 ============================
 
 This sample demonstrates how to deploy an application on Google App Engine.
@@ -9,7 +9,7 @@ detailed instructions.
 [ae-docs]: https://cloud.google.com/appengine/docs/java/
 
 
-* [Java 21](https://www.oracle.com/java/technologies/downloads/)
+* [Java 25](https://www.oracle.com/java/technologies/downloads/)
 * [Maven](https://maven.apache.org/download.cgi) (at least 3.5)
 * [Google Cloud SDK](https://cloud.google.com/sdk/) (aka gcloud)
 
@@ -34,7 +34,7 @@ with your Google Cloud Project Id:
 <plugin>
   <groupId>com.google.cloud.tools</groupId>
   <artifactId>appengine-maven-plugin</artifactId>
-  <version>2.8.0</version>
+  <version>2.8.3</version>
   <configuration>
     <projectId>myProjectId</projectId>
     <version>GCLOUD_CONFIG</version>
@@ -74,7 +74,7 @@ to (`src/main/test/...`).  The following resources are quite useful:
 
     ./gradlew appengineRun
 
-To use vist: http://localhost:8080/
+To use visit: http://localhost:8080/
 
 ### Deploying
 

appengine-java25/helloworld/build.gradle

@@ -53,13 +53,13 @@ sourceSets {
 }
 
 dependencies {
-    implementation 'com.google.appengine:appengine-api-1.0-sdk:2.0.30'
+    implementation 'com.google.appengine:appengine-api-1.0-sdk:3.0.1'
     implementation 'jakarta.servlet:jakarta.servlet-api:6.1.0'
 
     // Test Dependencies
-    testImplementation 'com.google.appengine:appengine-testing:2.0.30'
-    testImplementation 'com.google.appengine:appengine-api-stubs:2.0.30'
-    testImplementation 'com.google.appengine:appengine-tools-sdk:2.0.30'
+    testImplementation 'com.google.appengine:appengine-testing:3.0.1'
+    testImplementation 'com.google.appengine:appengine-api-stubs:3.0.1'
+    testImplementation 'com.google.appengine:appengine-tools-sdk:3.0.1'
 
     testImplementation 'com.google.truth:truth:1.1.5'
     testImplementation 'junit:junit:4.13.2'

appengine-java25/helloworld/pom.xml

@@ -40,7 +40,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>2.0.23</version>
+      <version>3.0.1</version>
     </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
@@ -102,7 +102,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.8.0</version>
+        <version>2.8.3</version>
         <configuration>
           <!-- can be set w/ -DprojectId=myProjectId on command line -->
           <projectId>myProjectId</projectId>

appengine-java25/helloworld/settings.gradle

@@ -29,4 +29,4 @@ plugins {
     id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0'
 }
 
-rootProject.name = 'helloworld'
+rootProject.name = 'helloworld'

appengine-java25/helloworld/src/main/webapp/WEB-INF/appengine-web.xml

@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!-- [START_EXCLUDE] -->
+<!--
+  Copyright 2015 Google LLC
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- [END_EXCLUDE] -->
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <runtime>java25</runtime>
   <app-engine-apis>true</app-engine-apis>
-</appengine-web-app>
+</appengine-web-app>
+