Skip to content

Commit

Permalink
Upgrade GAE Java version from 2.0.26 to 2.0.27 and prepare next versi…
Browse files Browse the repository at this point in the history 
…on 2.0.28-SNAPSHOT.

PiperOrigin-RevId: 632201622
Change-Id: Ib399466bcbf31425c49f59e81b7a735f837f7e6a
  • Loading branch information
@ludoch @gae-java-bot
ludoch authored and gae-java-bot committed May 9, 2024
1 parent 931a6b3 commit 9e9649b
Show file tree
Hide file tree
Showing 112 changed files with 125 additions and 126 deletions.
14 changes: 7 additions & 7 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,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.26</version><!-- or later-->
<version>2.0.27</version><!-- or later-->
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand All @@ -89,7 +89,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.26</version><!-- or later-->
<version>2.0.27</version><!-- or later-->
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -188,7 +188,7 @@ Source code for remote APIs for App Engine.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-remote-api</artifactId>
<version>2.0.26</version><!-- Or later-->
<version>2.0.27</version><!-- Or later-->
</dependency>
```

Expand All @@ -211,7 +211,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-legacy.jar/artifactId>
<version>2.0.26</version><!-- Or later-->
<version>2.0.27</version><!-- Or later-->
</dependency>
```

Expand All @@ -226,19 +226,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-testing</artifactId>
<version>2.0.26</version><!-- Or later-->
<version>2.0.27</version><!-- Or later-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>2.0.26</version><!-- Or later-->
<version>2.0.27</version><!-- Or later-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>2.0.26</version><!-- Or later-->
<version>2.0.27</version><!-- Or later-->
<scope>test</scope>
</dependency>
```
Expand Down
4 changes: 2 additions & 2 deletions TRYLATESTBITSINPROD.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ top of your web application and change the entrypoint to boot with these jars in
mvn clean install
```

Let's assume the current built version is `2.0.27-SNAPSHOT`.
Let's assume the current built version is `2.0.28-SNAPSHOT`.
Add the dependency for the GAE runtime jars in your application pom.xml file:

```
<properties>
<appengine.runtime.version>2.0.27-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.version>2.0.28-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
<properties>
...
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-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
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion api_legacy/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine-api-1.0-sdk/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-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
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_init/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_jsr107/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine_resources/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-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
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<modules>
<module>apiserver_local</module>
Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/test/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine</groupId>
Expand Down
4 changes: 2 additions & 2 deletions appengine_setup/test/src/test/java/com/google/appengine/setup/test/Jetty12TestAppTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ protected String appName() {

@Override
protected String relativePathForUserApplicationJar() {
return "../testapps/jetty12_testapp/target/"
+ "jetty12_testapp-2.0.27-SNAPSHOT-jar-with-dependencies.jar";
return "../testapps/jetty12_testapp/target/"
+ "jetty12_testapp-2.0.28-SNAPSHOT-jar-with-dependencies.jar";
}
}
3 changes: 1 addition & 2 deletions ...ngine_setup/test/src/test/java/com/google/appengine/setup/test/SpringBootTestAppTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ protected String appName() {

@Override
protected String relativePathForUserApplicationJar() {
return "../testapps/springboot_testapp/target/"
+ "springboot_testapp-2.0.27-SNAPSHOT.jar";
return "../testapps/springboot_testapp/target/" + "springboot_testapp-2.0.28-SNAPSHOT.jar";
}
}
4 changes: 2 additions & 2 deletions appengine_setup/test/src/test/java/com/google/appengine/setup/test/util/TestUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ public static HttpClient initializeHttpClient(int timeoutMillis) {

@SneakyThrows
public static Process initializeHttpApiServer() {
String apiServerRelativeJarPath = "../apiserver_local/target/"
+ "apiserver_local-2.0.27-SNAPSHOT-jar-with-dependencies.jar";
String apiServerRelativeJarPath =
"../apiserver_local/target/" + "apiserver_local-2.0.28-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
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine.setup.testapps</groupId>
Expand All @@ -32,7 +32,7 @@
<dependency>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>testapps_common</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
Expand Down Expand Up @@ -105,7 +105,7 @@
<projectId>srirammahavadi-dev</projectId>
<version>GCLOUD_CONFIG</version>
<automaticRestart>true</automaticRestart>
<artifact>${project.build.directory}/jetty11_testapp-2.0.27-SNAPSHOT-jar-with-dependencies.jar</artifact>
<artifact>${project.build.directory}/jetty11_testapp-2.0.28-SNAPSHOT-jar-with-dependencies.jar</artifact>
</configuration>
</plugin>

Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/testapps/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.appengine</groupId>
Expand Down
6 changes: 3 additions & 3 deletions appengine_setup/testapps/springboot_testapp/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
<name>springboot_testapp</name>
<description>Demo project for Spring Boot</description>
<properties>
Expand All @@ -44,12 +44,12 @@
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-1.0-sdk</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.google.appengine.setup.testapps</groupId>
<artifactId>testapps_common</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
<type>jar</type>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine_setup/testapps/testapps_common/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-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
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_testing_tests/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion applications/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion applications/proberapp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion applications/springboot/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/devappservertests/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion e2etests/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<name>AppEngine :: e2e tests</name>
<packaging>pom</packaging>
Expand Down
2 changes: 1 addition & 1 deletion e2etests/stagingtests/pom.xml
View file
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>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/allinone/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/allinone_jakarta/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/badcron/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/bundle_standard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.27-SNAPSHOT</version>
<version>2.0.28-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down

0 comments on commit 9e9649b

Please sign in to comment.