Skip to content

from main #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ludoch merged 4 commits into from
Sep 21, 2025
Merged

from main #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7d9b2a
Use Servlet 3.1 so that annotation scanning is triggered.
ludoch Sep 17, 2025
0809941
Upgrade GAE Java version to 3.0.0-beta and prepare next version 3.0.0…
ludoch Sep 19, 2025
44e8aa0
Update all non-major dependencies
renovate-bot Sep 19, 2025
68aed38
Merge pull request #412 from renovate-bot:renovate/all-minor-patch
gae-java-bot Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
[![Maven][maven-version-image]][maven-version-link]
[![Code of conduct](https://img.shields.io/badge/%E2%9D%A4-code%20of%20conduct-blue.svg)](https://github.com/GoogleCloudPlatform/appengine-java-standard/blob/main/CODE_OF_CONDUCT.md)

# Google App Engine Standard Environment Source Code for Java 17, Java 21, Java25
# Google App Engine Standard Environment Source Code for Java 17, Java 21, Java 25.


This repository contains the Java Source Code for [Google App Engine
Expand Down Expand Up @@ -100,7 +100,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
...
```

* Maven Java 25 Alpha with Jarkata EE 11 support pom.xml (EE10 is not supported in Java25, EE11 is fully compatible with EE10)
* Maven Java 25 Alpha with Jakarta EE 11 support pom.xml (EE10 is not supported in Java25, EE11 is fully compatible with EE10)

```
<packaging>war</packaging><!-- Servlet 6.1 WAR packaging-->
Expand All @@ -109,7 +109,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>2.0.38</version><!-- or later-->
<version>3.0.0-beta</version><!-- or later-->
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
Expand All @@ -121,7 +121,7 @@ Source code for all public APIs for com.google.appengine.api.* packages.
```


* Java 21/25 with javax EE8 profile appengine-web.xml
* Java 21/25 with javax EE8 profile appengine-web.xml

```
<?xml version="1.0" encoding="utf-8"?>
Expand Down
6 changes: 3 additions & 3 deletions TRYLATESTBITSINPROD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ top of your web application and change the entrypoint to boot with these jars in
./mvnw clean install
```

Let's assume the current build version is `3.0.0-beta-SNAPSHOT`.
Let's assume the current build version is `3.0.0-SNAPSHOT`.

See the output of the runtime deployment module which contains all the jars needed by the runtime:

Expand All @@ -70,7 +70,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:

```
<properties>
<appengine.runtime.version>3.0.0-beta-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.version>3.0.0-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
<properties>
...
Expand Down Expand Up @@ -148,7 +148,7 @@ In the appengine-web.xml, modify the entrypoint to use the bundled runtime jars
```
<?xml version="1.0" encoding="utf-8"?>
<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
<runtime>java17</runtime>
<runtime>java21</runtime>
<app-engine-apis>true</app-engine-apis>
<system-properties>
<property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/>
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
Expand Down
2 changes: 1 addition & 1 deletion api_dev/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion api_legacy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine-api-1.0-sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>AppEngine :: appengine-api-1.0-sdk</name>
Expand Down
2 changes: 1 addition & 1 deletion appengine-api-stubs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_init/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_jsr107/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine_resources/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>AppEngine :: appengine-resources</name>
Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/apiserver_local/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>appengine_setup</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modules>
<module>apiserver_local</module>
Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>appengine_setup</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ protected String appName() {
@Override
protected String relativePathForUserApplicationJar() {
return "../testapps/jetty12_testapp/target/"
+ "jetty12_testapp-3.0.0-beta-SNAPSHOT-jar-with-dependencies.jar";
+ "jetty12_testapp-3.0.0-SNAPSHOT-jar-with-dependencies.jar";
}
}
2 changes: 1 addition & 1 deletion ...ngine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ protected String appName() {

@Override
protected String relativePathForUserApplicationJar() {
return "../testapps/springboot_testapp/target/" + "springboot_testapp-3.0.0-beta-SNAPSHOT.jar";
return "../testapps/springboot_testapp/target/" + "springboot_testapp-3.0.0-SNAPSHOT.jar";
}
}
2 changes: 1 addition & 1 deletion appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public static HttpClient initializeHttpClient(int timeoutMillis) {
@SneakyThrows
public static Process initializeHttpApiServer() {
String apiServerRelativeJarPath =
"../apiserver_local/target/" + "apiserver_local-3.0.0-beta-SNAPSHOT-jar-with-dependencies.jar";
"../apiserver_local/target/" + "apiserver_local-3.0.0-SNAPSHOT-jar-with-dependencies.jar";
File currentDirectory = new File("").getAbsoluteFile();
File apiServerJar = new File(currentDirectory, apiServerRelativeJarPath);
ImmutableList<String> processArgs = ImmutableList.<String>builder()
Expand Down
6 changes: 3 additions & 3 deletions appengine_setup/testapps/jetty12_testapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>testapps</artifactId>
<groupId>com.google.appengine</groupId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine.setup.testapps</groupId>
Expand All @@ -34,7 +34,7 @@
<dependency>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>testapps_common</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down Expand Up @@ -107,7 +107,7 @@
<projectId>srirammahavadi-dev</projectId>
<version>GCLOUD_CONFIG</version>
<automaticRestart>true</automaticRestart>
<artifact>${project.build.directory}/jetty11_testapp-3.0.0-beta-SNAPSHOT-jar-with-dependencies.jar</artifact>
<artifact>${project.build.directory}/jetty11_testapp-3.0.0-SNAPSHOT-jar-with-dependencies.jar</artifact>
</configuration>
</plugin>

Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/testapps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>appengine_setup</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appengine_setup/testapps/springboot_testapp/HELP.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
For further reference, please consider the following sections:

* [Official Apache Maven documentation](https://maven.apache.org/guides/index.html)
* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.0.0-beta-SNAPSHOT/maven-plugin/reference/html/)
* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.0.0-beta-SNAPSHOT/maven-plugin/reference/html/#build-image)
* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/docs/3.0.0-SNAPSHOT/maven-plugin/reference/html/)
* [Create an OCI image](https://docs.spring.io/spring-boot/docs/3.0.0-SNAPSHOT/maven-plugin/reference/html/#build-image)

6 changes: 3 additions & 3 deletions appengine_setup/testapps/springboot_testapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</parent>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>springboot_testapp</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<name>springboot_testapp</name>
<url>https://github.com/GoogleCloudPlatform/appengine-java-standard/</url>
<description>Demo project for Spring Boot</description>
Expand All @@ -45,12 +45,12 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>testapps_common</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/testapps/testapps_common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<artifactId>testapps</artifactId>
<groupId>com.google.appengine</groupId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine.setup.testapps</groupId>
Expand Down
2 changes: 1 addition & 1 deletion appengine_testing/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_testing_tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
4 changes: 2 additions & 2 deletions applications/guestbook/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>com.google.appengine.demos</groupId>
<artifactId>guestbook</artifactId>
Expand All @@ -38,7 +38,7 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<appengine.target.version>3.0.0-beta-SNAPSHOT</appengine.target.version>
<appengine.target.version>3.0.0-SNAPSHOT</appengine.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
4 changes: 2 additions & 2 deletions applications/guestbook_jakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>com.google.appengine.demos</groupId>
<artifactId>guestbook_jakarta</artifactId>
Expand All @@ -38,7 +38,7 @@

<properties>
<maven.deploy.skip>true</maven.deploy.skip>
<appengine.target.version>3.0.0-beta-SNAPSHOT</appengine.target.version>
<appengine.target.version>3.0.0-SNAPSHOT</appengine.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
Expand Down
2 changes: 1 addition & 1 deletion applications/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<properties>
Expand Down
6 changes: 3 additions & 3 deletions applications/proberapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<properties>
Expand All @@ -40,7 +40,7 @@
<DB_REGION>us-central1</DB_REGION>
<DB_USER>prober-user</DB_USER>
<DB_PASSOWRD>prober_connectivity_test_database</DB_PASSOWRD>
<gax.version>2.70.1</gax.version>
<gax.version>2.70.2</gax.version>
<appengine.target.version>${project.version}</appengine.target.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
Expand Down Expand Up @@ -123,7 +123,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-core</artifactId>
<version>2.60.1</version>
<version>2.60.2</version>
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
Expand Down
2 changes: 1 addition & 1 deletion applications/servletasyncapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>com.google.appengine.demos</groupId>
<artifactId>servletasyncapp</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion applications/servletasyncappjakarta/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<groupId>com.google.appengine.demos</groupId>
<artifactId>servletasyncappjakarta</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion applications/springboot/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/devappservertests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>e2etests</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion e2etests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>3.0.0-beta-SNAPSHOT</version>
<version>3.0.0-SNAPSHOT</version>
</parent>
<name>AppEngine :: e2e tests</name>
<url>https://github.com/GoogleCloudPlatform/appengine-java-standard/</url>
Expand Down
Loading
Loading