Skip to content

Commit

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

PiperOrigin-RevId: 574061093
Change-Id: I036fd8fb93c910421a84541c510b3acd3acc9b58
  • Loading branch information
@ludoch @gae-java-bot
ludoch authored and gae-java-bot committed Oct 17, 2023
1 parent 88603d0 commit 8c30696
Show file tree
Hide file tree
Showing 104 changed files with 116 additions and 111 deletions.
12 changes: 6 additions & 6 deletions README.md
View file
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.20</version><!-- or later-->
<version>2.0.21</version><!-- or later-->
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -131,7 +131,7 @@ Source code for remote APIs for App Engine.
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-remote-api</artifactId>
<version>2.0.20</version><!-- Or later-->
<version>2.0.21</version><!-- Or later-->
</dependency>
```

Expand All @@ -154,7 +154,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.20</version><!-- Or later-->
<version>2.0.21</version><!-- Or later-->
</dependency>
```

Expand All @@ -169,19 +169,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.20</version><!-- Or later-->
<version>2.0.21</version><!-- Or later-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-api-stubs</artifactId>
<version>2.0.20</version><!-- Or later-->
<version>2.0.21</version><!-- Or later-->
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>appengine-tools-sdk</artifactId>
<version>2.0.20</version><!-- Or later-->
<version>2.0.21</version><!-- Or later-->
<scope>test</scope>
</dependency>
```
Expand Down
4 changes: 2 additions & 2 deletions TRYLATESTBITSINPROD.md
View file
Expand Up @@ -43,12 +43,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.21-SNAPSHOT`.
Let's assume the current built version is `2.0.22-SNAPSHOT`.
Add the dependency for the GAE runtime jars in your application pom.xml file:

```
<properties>
<appengine.runtime.version>2.0.21-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.version>2.0.22-SNAPSHOT</appengine.runtime.version>
<appengine.runtime.location>${appengine.runtime.location}</appengine.runtime.location>
<properties>
...
Expand Down
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-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
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion api_legacy/pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine-api-1.0-sdk/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-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
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_jsr107/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion appengine_resources/pom.xml
View file
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>AppEngine :: appengine-resources</name>
Expand Down
2 changes: 1 addition & 1 deletion appengine_testing/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion appengine_testing_tests/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion applications/pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion applications/proberapp/pom.xml
View file
Expand Up @@ -27,7 +27,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<properties>
Expand Down
2 changes: 1 addition & 1 deletion applications/springboot/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>applications</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/devappservertests/pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>e2etests</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion ...ervertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java
View file
Expand Up @@ -56,7 +56,7 @@ static File createApp(String directoryName) {
File appRoot =
new File(
currentDirectory,
"../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.21-SNAPSHOT");
"../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.22-SNAPSHOT");
return appRoot;
}

Expand Down
2 changes: 1 addition & 1 deletion e2etests/pom.xml
View file
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>parent</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-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
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>e2etests</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>

<packaging>jar</packaging>
Expand Down
2 changes: 1 addition & 1 deletion e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java
View file
Expand Up @@ -177,7 +177,7 @@ private static String getWarPath(String directoryName) {
+ directoryName
+ "/target/"
+ directoryName
+ "-2.0.21-SNAPSHOT")
+ "-2.0.22-SNAPSHOT")
.getAbsolutePath();

// assertThat(appRoot.isDirectory()).isTrue();
Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/allinone/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

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

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/bundle_standard/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-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
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-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
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/cron-good-retry-parameters/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/cron-negative-max-backoff/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/cron-negative-retry-limit/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/cron-two-max-doublings/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/http-headers/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/java8-jar/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/java8-no-webxml/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/pom.xml
View file
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>e2etests</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<properties>
Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/sample-badaeweb/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/sample-baddispatch/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/sample-badentrypoint/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down
2 changes: 1 addition & 1 deletion e2etests/testlocalapps/sample-badindexes/pom.xml
View file
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>com.google.appengine</groupId>
<artifactId>testlocalapps</artifactId>
<version>2.0.21-SNAPSHOT</version>
<version>2.0.22-SNAPSHOT</version>
</parent>
<packaging>war</packaging>

Expand Down

0 comments on commit 8c30696

Please sign in to comment.