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

maigovannon · maigovannon · commit 5680a0a37e0e · 2025-11-03T17:34:39.000+05:30
diff --git a/appengine-java25/ee11/analytics/README.md b/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.
diff --git a/appengine-java25/ee11/analytics/pom.xml b/appengine-java25/ee11/analytics/pom.xml
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
-      <version>6.0.0</version>
+      <version>6.1.0</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
diff --git a/appengine-java25/ee11/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java b/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_ee11_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_ee11_analytics_track]
diff --git a/appengine-java25/ee11/analytics/src/main/webapp/WEB-INF/web.xml b/appengine-java25/ee11/analytics/src/main/webapp/WEB-INF/web.xml
@@ -13,11 +13,10 @@
   limitations under the License.
 -->
 <!-- [END_EXCLUDE] -->
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         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>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="https://jakarta.ee/xml/ns/jakartaee"
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"
+         version="6.1">
+    <welcome-file-list>
+        <welcome-file>analytics</welcome-file>
+    </welcome-file-list>
 </web-app>
diff --git a/appengine-java25/ee8/analytics/README.md b/appengine-java25/ee8/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/ee8/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 EE8.
diff --git a/appengine-java25/ee8/analytics/pom.xml b/appengine-java25/ee8/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>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <version>4.0.1</version>
       <type>jar</type>
       <scope>provided</scope>
     </dependency>
@@ -128,7 +128,7 @@
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>2.7.0</version>
+        <version>2.8.3</version>
         <configuration>
           <projectId>GCLOUD_CONFIG</projectId>
           <version>analytics</version>
diff --git a/appengine-java25/ee8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java b/appengine-java25/ee8/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_ee8_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_ee8_analytics_track]
diff --git a/appengine-java25/ee8/analytics/src/main/webapp/WEB-INF/appengine-web.xml b/appengine-java25/ee8/analytics/src/main/webapp/WEB-INF/appengine-web.xml
@@ -16,7 +16,7 @@
 <appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
   <runtime>java25</runtime>
   <app-engine-apis>true</app-engine-apis>
-  <service>appengine-analytics-j25-ee9</service>
+  <service>appengine-analytics-j25-ee8</service>
   <system-properties>
     <property name="appengine.use.EE8" value="true"/>
   </system-properties>
diff --git a/appengine-java25/ee8/analytics/src/main/webapp/WEB-INF/web.xml b/appengine-java25/ee8/analytics/src/main/webapp/WEB-INF/web.xml
@@ -16,7 +16,7 @@
 <web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
          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">
+         http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd" version="4.0">
   <welcome-file-list>
     <welcome-file>analytics</welcome-file>
   </welcome-file-list>
diff --git a/appengine-java25/helloworld/README.md b/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
 
diff --git a/appengine-java25/helloworld/build.gradle b/appengine-java25/helloworld/build.gradle
@@ -53,16 +53,16 @@ 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'
     testImplementation 'org.mockito:mockito-core:4.11.0'
 }
-// [END gae_standard21_gradle]
+// [END gae_standard25_gradle]
diff --git a/appengine-java25/helloworld/pom.xml b/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>
diff --git a/appengine-java25/helloworld/src/main/webapp/WEB-INF/web.xml b/appengine-java25/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -1,8 +1,7 @@
 <web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
-    version="6.0">
-  <runtime>java25</runtime> <!-- or another supported version -->
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_1.xsd"
+    version="6.1">
   <servlet>
     <servlet-name>helloworld</servlet-name>
     <servlet-class>com.example.appengine.java25.HelloAppEngine</servlet-class>
@@ -11,5 +10,4 @@
     <servlet-name>helloworld</servlet-name>
     <url-pattern>/*</url-pattern>
   </servlet-mapping>
-  <app-engine-apis>true</app-engine-apis>
 </web-app>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`package com.example.appengine.analytics;`
`18`	`18`
`19`		`-// [START gae_java21_analytics_track]`
	`19`	`+// [START gae_java25_ee11_analytics_track]`
`20`	`20`	`import com.google.appengine.api.urlfetch.URLFetchService;`
`21`	`21`	`import com.google.appengine.api.urlfetch.URLFetchServiceFactory;`
`22`	`22`	`import java.io.IOException;`
`@@ -67,4 +67,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse resp)`
`67`	`67`	`resp.getWriter().println("Event tracked.");`
`68`	`68`	`}`
`69`	`69`	`}`
`70`		`-// [END gae_java21_analytics_track]`
	`70`	`+// [END gae_java25_ee11_analytics_track]`