diff --git a/README.md b/README.md index 9cb5782ba..b3203f8ee 100644 --- a/README.md +++ b/README.md @@ -13,11 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> -[![Java8/11/17](https://github.com/GoogleCloudPlatform/appengine-java-standard/actions/workflows/maven.yml/badge.svg)](https://github.com/GoogleCloudPlatform/appengine-java-standard/actions/workflows/maven.yml) +[![Java8/11/17/21](https://github.com/GoogleCloudPlatform/appengine-java-standard/actions/workflows/maven.yml/badge.svg)](https://github.com/GoogleCloudPlatform/appengine-java-standard/actions/workflows/maven.yml) [![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 8, Java 11 and Java 17. +# Google App Engine Standard Environment Source Code for Java 8, Java 11, Java 17, Java 21. This repository contains the Java Source Code for [Google App Engine @@ -29,11 +29,11 @@ standard environment][ae-docs], the production runtime, the AppEngine APIs, and ### Use a JDK8 environment, so it can build the Java8 GAE runtime. -[jdk8](https://adoptium.net/), but using a JDK11 or JDK17 is also possible. +[jdk8](https://adoptium.net/), but using a JDK11 or JDK17 of JDK21 is also possible. -The shared code base is also used for GAE Java 11 and Java 17 build and test targets, using GitHub actions: +The shared code base is also used for GAE Java 11, Java 17 and Java 21 build and test targets, using GitHub actions: -- [Java 8/11/17 Continuous Integration](https://github.com/GoogleCloudPlatform/appengine-java-standard/actions/workflows/maven.yml) +- [Java 17/21 Continuous Integration](https://github.com/GoogleCloudPlatform/appengine-java-standard/actions/workflows/maven.yml) ## Releases @@ -64,12 +64,12 @@ Source code for all public APIs for com.google.appengine.api.* packages. ``` war - ... + ... com.google.appengine appengine-api-1.0-sdk - 2.0.22 + 2.0.23 javax.servlet @@ -77,9 +77,50 @@ Source code for all public APIs for com.google.appengine.api.* packages. 3.1 provided - ... + ... ``` +* Maven Java 21 with Jarkata EE 10 support pom.xml + + ``` + war + ... + + + com.google.appengine + appengine-api-1.0-sdk + 2.0.23 + + + javax.servlet + jakarta.servlet-api + 6.0.0 + provided + + ... + ``` + +* Java 21 with Jakarta or javax appengine-web.xml + + ``` + + + java21 + true + + + + ``` + + +- [Public Java 21 Documentation](https://cloud.google.com/appengine/docs/standard/java-gen2/runtime) +- [How to upgrade to Java21](https://cloud.google.com/appengine/docs/standard/java-gen2/upgrade-java-runtime) + * Java 17 appengine-web.xml ``` @@ -125,13 +166,29 @@ Source code for remote APIs for App Engine. ``` -* Maven pom.xml + +* Servlet Jarkata EE10 web.xml + +``` + + Remote API Servlet + RemoteApiServlet + com.google.apphosting.utils.remoteapi.EE10RemoteApiServlet + 1 + + + RemoteApiServlet + /remote_api + +``` + +* Maven javax and jakarta API pom.xml ``` com.google.appengine appengine-remote-api - 2.0.22 + 2.0.23 ``` @@ -154,11 +211,11 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency com.google.appengine appengine-api-legacy.jar/artifactId> - 2.0.22 + 2.0.23 ``` -### Local Unit Testing for Java 8, 11, 17 +### Local Unit Testing for Java 8, 11, 17, 21 - [Code Sample](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/main/unittests) - [Latest javadoc.io Javadocs from this repository](https://javadoc.io/doc/com.google.appengine/appengine-testing) @@ -169,19 +226,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency com.google.appengine appengine-testing - 2.0.22 + 2.0.23 test com.google.appengine appengine-api-stubs - 2.0.22 + 2.0.23 test com.google.appengine appengine-tools-sdk - 2.0.22 + 2.0.23 test ``` @@ -219,9 +276,9 @@ Source code for the App Engine production application server and utilities. It i - [End-to-End tests](https://github.com/GoogleCloudPlatform/appengine-java-standard/tree/master/runtime/test) - [Source Code for runtime utilities](https://github.com/GoogleCloudPlatform/appengine-java-standard/tree/master/runtime/util) -## Default entrypoint used by Java11 and Java17 +## Default entrypoint used by Java11, Java17 and Java21 -The Java 11, Java 17 runtimes can benefit from extra user configuration when starting the JVM for web apps. +The Java 11, Java 17 and 21 runtimes can benefit from extra user configuration when starting the JVM for web apps. The default entrypoint used to boot the JVM is generated by App Engine Buildpacks. Essentially, it is equivalent to define this entrypoint in the `appengine-web.xml` file. For example: @@ -235,7 +292,7 @@ By default, we use `--add-opens java.base/java.lang=ALL-UNNAMED --add-opens jav ## Entry Point Features -The entry point for the Java 11, Java 17 runtimes can be customized with user-defined environment variables added in the `appengine-web.xml` configuration file. +The entry point for the Java 11, Java 17, 21 runtimes can be customized with user-defined environment variables added in the `appengine-web.xml` configuration file. The following table indicates the environment variables that can be used to enable/disable/configure features, and the default values if they are not set: diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index c67ded713..7ea5cb733 100644 --- a/TRYLATESTBITSINPROD.md +++ b/TRYLATESTBITSINPROD.md @@ -29,11 +29,14 @@ pom.xml file. First, you need to decide which App Engine Java runtime jars version you want to use. There are 3 runtime jars that are bundled as a Maven assembly under `runtime-deployment`: - * runtime-impl.jar - * runtime-shared.jar + * runtime-impl-jetty9.jar + * runtime-impl-jetty12.jar + * runtime-shared-jetty9.jar + * runtime-shared-jetty12.jar + * runtime-shared-jetty12-ee10.jar * runtime-main.jar -Let's say you want the latest from head in this github repository. You could built the 3 jars, add them at the +Let's say you want the latest from head in this github repository. You could built the 6 jars, add them at the top of your web application and change the entrypoint to boot with these jars instead of the one maintained in production. @@ -43,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.23-SNAPSHOT`. +Let's assume the current built version is `2.0.24-SNAPSHOT`. Add the dependency for the GAE runtime jars in your application pom.xml file: ``` - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT ${appengine.runtime.location} ... @@ -78,12 +81,24 @@ deployed web application. - ${appengine.runtime.location}/WEB-INF/lib/runtime-impl-${appengine.runtime.version}.jar - ${appengine.runtime.location}/runtime-impl.jar + ${appengine.runtime.location}/WEB-INF/lib/runtime-impl-jetty9-${appengine.runtime.version}.jar + ${appengine.runtime.location}/runtime-impl-jetty9.jar - ${appengine.runtime.location}/WEB-INF/lib/runtime-shared-${appengine.runtime.version}.jar - ${appengine.runtime.location}/runtime-shared.jar + ${appengine.runtime.location}/WEB-INF/lib/runtime-shared-jetty9-${appengine.runtime.version}.jar + ${appengine.runtime.location}/runtime-shared-jetty9.jar + + + ${appengine.runtime.location}/WEB-INF/lib/runtime-impl-jetty12-${appengine.runtime.version}.jar + ${appengine.runtime.location}/runtime-impl-jetty12.jar + + + ${appengine.runtime.location}/WEB-INF/lib/runtime-shared-jetty12-${appengine.runtime.version}.jar + ${appengine.runtime.location}/runtime-shared-jetty12.jar + + + ${appengine.runtime.location}/WEB-INF/lib/runtime-shared-jetty12-ee10-${appengine.runtime.version}.jar + ${appengine.runtime.location}/runtime-shared-jetty12-ee10.jar ${appengine.runtime.location}/WEB-INF/lib/runtime-main-${appengine.runtime.version}.jar diff --git a/api/pom.xml b/api/pom.xml index 4d5824be2..214e9fbc7 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index 2d528cc5b..f88c520fc 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 813f0a8d9..1e2f40437 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 084863b49..474f5636c 100644 --- a/appengine-api-1.0-sdk/pom.xml +++ b/appengine-api-1.0-sdk/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index 95f3cf785..8f0af1f5a 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml index a3fb6c331..04bf2d507 100644 --- a/appengine_init/pom.xml +++ b/appengine_init/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index c117f3519..a10ba40aa 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index 51ef7d866..6cb218be6 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index 7a7226af4..09dabb721 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 15f81d88c..90c69deab 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/applications/pom.xml b/applications/pom.xml index cabcf04a4..9248d6a06 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index c20c7bd34..fbfb88dd5 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -14,9 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war @@ -27,7 +25,7 @@ com.google.appengine applications - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index d4649ac2e..b0982aa69 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine applications - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml index 1f0e31025..c852d54a4 100644 --- a/e2etests/devappservertests/pom.xml +++ b/e2etests/devappservertests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java b/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java index 070ad4b79..f79a77139 100644 --- a/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java +++ b/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java @@ -56,7 +56,7 @@ static File createApp(String directoryName) { File appRoot = new File( currentDirectory, - "../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.23-SNAPSHOT"); + "../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.24-SNAPSHOT"); return appRoot; } diff --git a/e2etests/pom.xml b/e2etests/pom.xml index 0ae1fe4db..673fc28c8 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT AppEngine :: e2e tests pom diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index bc668213a..b3ae6db4c 100644 --- a/e2etests/stagingtests/pom.xml +++ b/e2etests/stagingtests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java index 035a417b0..3d807e5db 100644 --- a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java +++ b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/ApplicationTest.java @@ -189,7 +189,7 @@ private static String getWarPath(String directoryName) { + directoryName + "/target/" + directoryName - + "-2.0.23-SNAPSHOT") + + "-2.0.24-SNAPSHOT") .getAbsolutePath(); // assertThat(appRoot.isDirectory()).isTrue(); diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/EE10Test.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/EE10Test.java index 4ff435a81..ff6a1e3bd 100644 --- a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/EE10Test.java +++ b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/admin/EE10Test.java @@ -56,7 +56,7 @@ private static String getWarPath(String directoryName) { + directoryName + "/target/" + directoryName - + "-2.0.23-SNAPSHOT") + + "-2.0.24-SNAPSHOT") .getAbsolutePath(); return appRoot; diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml index e146d9b95..15fcf7749 100644 --- a/e2etests/testlocalapps/allinone/pom.xml +++ b/e2etests/testlocalapps/allinone/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/allinone_jakarta/pom.xml b/e2etests/testlocalapps/allinone_jakarta/pom.xml index cb2a06f61..b0127a94f 100644 --- a/e2etests/testlocalapps/allinone_jakarta/pom.xml +++ b/e2etests/testlocalapps/allinone_jakarta/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index f37008a34..b7b6e5282 100644 --- a/e2etests/testlocalapps/badcron/pom.xml +++ b/e2etests/testlocalapps/badcron/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index c98814c63..ec62b5581 100644 --- a/e2etests/testlocalapps/bundle_standard/pom.xml +++ b/e2etests/testlocalapps/bundle_standard/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml index fdb6f644c..b9a3b3445 100644 --- a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml @@ -16,8 +16,7 @@ --> - + 4.0.0 com.google.appengine.demos @@ -25,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml index 897a0f9a8..98fcb4699 100644 --- a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml index 3c397f906..9e2e42c25 100644 --- a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml index 03d9c8a65..e6c6e628c 100644 --- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml +++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index 4d1e46e53..4b5de0cdd 100644 --- a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml +++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml index d8f4e9d7d..43ec783e3 100644 --- a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml +++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml index 133543e13..b5c3693fb 100644 --- a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml +++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml index 498e736f4..dbe004248 100644 --- a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml +++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index f175f8b6b..2976d9cc1 100644 --- a/e2etests/testlocalapps/http-headers/pom.xml +++ b/e2etests/testlocalapps/http-headers/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index c7e510800..4c1220c38 100644 --- a/e2etests/testlocalapps/java8-jar/pom.xml +++ b/e2etests/testlocalapps/java8-jar/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index b047f2298..d28259a9a 100644 --- a/e2etests/testlocalapps/java8-no-webxml/pom.xml +++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index e2af51430..d32be39d0 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT pom diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index 2b4a75dd0..2abfd311a 100644 --- a/e2etests/testlocalapps/sample-badaeweb/pom.xml +++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index 5c076c952..b3ca36fb8 100644 --- a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index 16afe6e37..8a996c6b6 100644 --- a/e2etests/testlocalapps/sample-baddispatch/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml index bcdbe261c..e5cf5d3d2 100644 --- a/e2etests/testlocalapps/sample-badentrypoint/pom.xml +++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 412240e94..26e249927 100644 --- a/e2etests/testlocalapps/sample-badindexes/pom.xml +++ b/e2etests/testlocalapps/sample-badindexes/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml index 95e4f2273..5314fd0dc 100644 --- a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml +++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index bfb5c43fa..94de33c64 100644 --- a/e2etests/testlocalapps/sample-badweb/pom.xml +++ b/e2etests/testlocalapps/sample-badweb/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml index 4b9f66e39..e6d6c6ab0 100644 --- a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml index 19ed494e9..649d8a3ef 100644 --- a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml +++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index af558bb47..701c2c554 100644 --- a/e2etests/testlocalapps/sample-java11/pom.xml +++ b/e2etests/testlocalapps/sample-java11/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index ed6403dfd..f46a93fbf 100644 --- a/e2etests/testlocalapps/sample-java17/pom.xml +++ b/e2etests/testlocalapps/sample-java17/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 4003a03a5..163ea9e7b 100644 --- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml +++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index 15a613060..141234ac1 100644 --- a/e2etests/testlocalapps/sample-jspx/pom.xml +++ b/e2etests/testlocalapps/sample-jspx/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml index 0a866ac79..fccdb944c 100644 --- a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index 73aa8676c..c40f04b73 100644 --- a/e2etests/testlocalapps/sample-missingappid/pom.xml +++ b/e2etests/testlocalapps/sample-missingappid/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index 47b1c1f45..de936d184 100644 --- a/e2etests/testlocalapps/sample-nojsps/pom.xml +++ b/e2etests/testlocalapps/sample-nojsps/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml index 0c42a69e3..d2c6047ae 100644 --- a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index ad0e6d58d..a84d06dfc 100644 --- a/e2etests/testlocalapps/sample-with-classes/pom.xml +++ b/e2etests/testlocalapps/sample-with-classes/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index 8e3253554..6387fc179 100644 --- a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index 77a54ea20..56bf6d6a4 100644 --- a/e2etests/testlocalapps/sampleapp-backends/pom.xml +++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war AppEngine :: sampleapp-backends diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml index 32a26b4c4..c13f9690b 100644 --- a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index ffe6a4d73..4441e7230 100644 --- a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index cec9491ad..0f900b4ed 100644 --- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml +++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index 64f9249e8..12d3f04b0 100644 --- a/e2etests/testlocalapps/sampleapp/pom.xml +++ b/e2etests/testlocalapps/sampleapp/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -25,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT AppEngine :: sampleapp diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index 9b930e65d..88b243dc5 100644 --- a/e2etests/testlocalapps/stage-sampleapp/pom.xml +++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml index 2dffd7ca2..3f3dc7c3d 100644 --- a/e2etests/testlocalapps/stage-with-staging-options/pom.xml +++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index 2be6705b8..aba4b7d1c 100644 --- a/e2etests/testlocalapps/xmlorder/pom.xml +++ b/e2etests/testlocalapps/xmlorder/pom.xml @@ -15,8 +15,7 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos @@ -24,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT war AppEngine :: xmlorder diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index f7166dd3f..b2331a723 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,14 +22,14 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT ../../pom.xml geronimo-javamail_1.4_spec jar AppEngine :: JavaMail 1.4 - 1.4.4-${project.parent.version} + 1.4.4-3.0.24-SNAPSHOT Javamail 1.4 Specification with AppEngine updates. diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml index 3d16689be..d675b7b2c 100644 --- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml +++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT jar diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java index d567971ad..cff61b865 100644 --- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java +++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/NoSerializeImmutableTest.java @@ -86,7 +86,7 @@ public class NoSerializeImmutableTest { public void serializableCollectionFieldsAreNotGuavaImmutable() throws Exception { File appengineApiJar = new File( - "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.23-SNAPSHOT.jar"); + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.24-SNAPSHOT.jar"); assertThat(appengineApiJar.exists()).isTrue(); ClassLoader apiJarClassLoader = new URLClassLoader(new URL[] {appengineApiJar.toURI().toURL()}); Class messageLite = diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java index 7e1897ff7..8a3a9a653 100644 --- a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java +++ b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/src/test/java/com/google/appengine/apicompat/usage/ApiExhaustiveUsageTestCase.java @@ -54,7 +54,7 @@ public abstract class ApiExhaustiveUsageTestCase { /** The path to the sdk api jar. */ private static final String API_JAR_PATH = - "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.23-SNAPSHOT.jar"; + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.24-SNAPSHOT.jar"; private boolean isExhaustiveUsageClass(String clsName) { return clsName.startsWith("com.google.appengine.apicompat.usage"); diff --git a/jetty12_assembly/pom.xml b/jetty12_assembly/pom.xml index d43a2cf46..b7a406939 100644 --- a/jetty12_assembly/pom.xml +++ b/jetty12_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT 4.0.0 jetty12-assembly diff --git a/lib/pom.xml b/lib/pom.xml index 93e5ac5f5..cc8534738 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 666656b66..b1f92074a 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -23,7 +23,7 @@ com.google.appengine lib-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 75f75f311..4d9889113 100644 --- a/lib/xml_validator/pom.xml +++ b/lib/xml_validator/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index bcbb9a9d2..12c25569f 100644 --- a/lib/xml_validator_test/pom.xml +++ b/lib/xml_validator_test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml index b6f54c0cf..22b4708fb 100644 --- a/local_runtime_shared_jetty12/pom.xml +++ b/local_runtime_shared_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty12 diff --git a/local_runtime_shared_jetty9/pom.xml b/local_runtime_shared_jetty9/pom.xml index a28249cc3..b3531c2bc 100644 --- a/local_runtime_shared_jetty9/pom.xml +++ b/local_runtime_shared_jetty9/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index 2ec4765d0..4eaaf7643 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT pom AppEngine :: Parent project @@ -63,7 +63,7 @@ 1.8 UTF-8 9.4.53.v20231009 - 12.0.4 + 12.0.5 2.0.9 https://oss.sonatype.org/content/repositories/google-snapshots/ sonatype-nexus-snapshots @@ -234,7 +234,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.2 + 3.2.2 ../deployment/target/runtime-deployment-${project.version} @@ -468,12 +468,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.108.0 + 0.108.5 com.google.api.grpc proto-google-common-protos - 2.28.0 + 2.29.0 com.google.code.findbugs @@ -615,7 +615,7 @@ org.jsoup jsoup - 1.16.2 + 1.17.1 org.apache.lucene @@ -645,22 +645,22 @@ io.grpc grpc-api - 1.59.0 + 1.59.1 io.grpc grpc-stub - 1.59.0 + 1.59.1 io.grpc grpc-protobuf - 1.59.0 + 1.59.1 io.grpc grpc-netty - 1.59.0 + 1.59.1 @@ -770,7 +770,7 @@ com.google.cloud google-cloud-logging - 3.15.8 + 3.15.13 @@ -925,7 +925,7 @@ org.codehaus.mojo versions-maven-plugin - 2.16.1 + 2.16.2 diff --git a/protobuf/pom.xml b/protobuf/pom.xml index e17e67bb6..8bbc337b6 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index ea246a9ab..266ba8f99 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index 5c2ee89ca..1d8493d31 100644 --- a/quickstartgenerator_jetty12/pom.xml +++ b/quickstartgenerator_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12_ee10/pom.xml b/quickstartgenerator_jetty12_ee10/pom.xml index a3891ade8..fd10fc64c 100644 --- a/quickstartgenerator_jetty12_ee10/pom.xml +++ b/quickstartgenerator_jetty12_ee10/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index db0b36ebb..ff8c625dd 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index a3582b0ab..865ec403f 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index 17ffb9b08..d52693e5e 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index a4d6740b6..2baaa701b 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index 88388ee62..37fee9b64 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml index 4ce9f1f9b..c5ae82616 100644 --- a/runtime/lite/pom.xml +++ b/runtime/lite/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT jar diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index c49bfe7e5..5a9adbb43 100644 --- a/runtime/local_jetty12/pom.xml +++ b/runtime/local_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/local_jetty12_ee10/pom.xml b/runtime/local_jetty12_ee10/pom.xml index 2c2ac2648..8ff5e24d7 100644 --- a/runtime/local_jetty12_ee10/pom.xml +++ b/runtime/local_jetty12_ee10/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index 4077d5bd1..a08807f3a 100644 --- a/runtime/local_jetty9/pom.xml +++ b/runtime/local_jetty9/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index c39e14a58..9a3fffd6b 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 48a755af0..450c62f29 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -14,16 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/pom.xml b/runtime/pom.xml index 0f332183b..ca8b2c6db 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT AppEngine :: runtime projects pom diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index 975962119..2b6568f9b 100644 --- a/runtime/runtime_impl_jetty12/pom.xml +++ b/runtime/runtime_impl_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar @@ -346,6 +346,11 @@ org.eclipse.jetty jetty-http ${jetty12.version} + + + org.eclipse.jetty + jetty-plus + ${jetty12.version} org.eclipse.jetty @@ -568,6 +573,7 @@ org.eclipse.jetty:jetty-http org.eclipse.jetty:jetty-io org.eclipse.jetty:jetty-jmx + org.eclipse.jetty:jetty-plus org.eclipse.jetty:jetty-server org.eclipse.jetty:jetty-session org.eclipse.jetty:jetty-security diff --git a/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/CoreSizeLimitHandler.java b/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/CoreSizeLimitHandler.java index 907720860..e1a52f4c6 100644 --- a/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/CoreSizeLimitHandler.java +++ b/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/CoreSizeLimitHandler.java @@ -16,21 +16,20 @@ package com.google.apphosting.runtime.jetty; -import java.nio.ByteBuffer; import org.eclipse.jetty.http.BadMessageException; import org.eclipse.jetty.http.HttpException; import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; -import org.eclipse.jetty.http.MetaData; +import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.io.Content; import org.eclipse.jetty.server.Handler; -import org.eclipse.jetty.server.HttpStream; import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Response; -import org.eclipse.jetty.util.BufferUtil; import org.eclipse.jetty.util.Callback; +import java.nio.ByteBuffer; + /** * A handler that can limit the size of message bodies in requests and responses. * @@ -46,8 +45,6 @@ public class CoreSizeLimitHandler extends Handler.Wrapper { private final long _requestLimit; private final long _responseLimit; - private long _read = 0; - private long _written = 0; /** * @param requestLimit The request body size limit in bytes or -1 for no limit @@ -66,85 +63,98 @@ public boolean handle(Request request, Response response, Callback callback) thr if (contentLengthField != null) { long contentLength = contentLengthField.getLongValue(); - if (_requestLimit > 0 && contentLength > _requestLimit) { - response.setStatus(413); + if (_requestLimit >= 0 && contentLength > _requestLimit) + { String s = "Request body is too large: " + contentLength + ">" + _requestLimit; - response.write(true, BufferUtil.toBuffer(s), callback); + Response.writeError(request, response, callback, HttpStatus.PAYLOAD_TOO_LARGE_413, s); return true; } } - HttpFields.Mutable.Wrapper httpFields = new HttpFields.Mutable.Wrapper(response.getHeaders()) + SizeLimitRequestWrapper wrappedRequest = new SizeLimitRequestWrapper(request); + SizeLimitResponseWrapper wrappedResponse = new SizeLimitResponseWrapper(wrappedRequest, response); + return super.handle(wrappedRequest, wrappedResponse, callback); + } + + private class SizeLimitRequestWrapper extends Request.Wrapper + { + private long _read = 0; + + public SizeLimitRequestWrapper(Request wrapped) { - @Override - public HttpField onAddField(HttpField field) + super(wrapped); + } + + @Override + public Content.Chunk read() + { + Content.Chunk chunk = super.read(); + if (chunk == null) + return null; + if (chunk.getFailure() != null) + return chunk; + + // Check request content limit. + ByteBuffer content = chunk.getByteBuffer(); + if (content != null && content.remaining() > 0) { - if ((field.getHeader()!=null) && (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString()))) + _read += content.remaining(); + if (_requestLimit >= 0 && _read > _requestLimit) { - long contentLength = field.getLongValue(); - if (_responseLimit > 0 && contentLength > _responseLimit) - throw new HttpException.RuntimeException(500, "Response body is too large: " + contentLength + ">" + _responseLimit); + BadMessageException e = new BadMessageException(HttpStatus.PAYLOAD_TOO_LARGE_413, "Request body is too large: " + _read + ">" + _requestLimit); + getWrapped().fail(e); + return null; } - return super.onAddField(field); } - }; - response = new Response.Wrapper(request, response) - { - @Override - public HttpFields.Mutable getHeaders() - { - return httpFields; - } - }; + return chunk; + } + } - request.addHttpStreamWrapper(httpStream -> new HttpStream.Wrapper(httpStream) - { - @Override - public Content.Chunk read() - { - Content.Chunk chunk = super.read(); - if (chunk == null) - return null; - if (chunk.getFailure() != null) - return chunk; + private class SizeLimitResponseWrapper extends Response.Wrapper + { + private final HttpFields.Mutable _httpFields; + private long _written = 0; - // Check request content limit. - ByteBuffer content = chunk.getByteBuffer(); - if (content != null && content.remaining() > 0) - { - _read += content.remaining(); - if (_requestLimit >= 0 && _read > _requestLimit) - { - System.err.println("we actually read too much content in coreSizeLimitHandler for request size limit"); - BadMessageException e = new BadMessageException(413, "Request body is too large: " + _read + ">" + _requestLimit); - request.fail(e); - return null; - } - } + public SizeLimitResponseWrapper(Request request, Response wrapped) { + super(request, wrapped); - return chunk; - } + _httpFields = + new HttpFields.Mutable.Wrapper(wrapped.getHeaders()) { + @Override + public HttpField onAddField(HttpField field) { + if (HttpHeader.CONTENT_LENGTH.is(field.getName())) { + long contentLength = field.getLongValue(); + if (_responseLimit >= 0 && contentLength > _responseLimit) + throw new HttpException.RuntimeException( + HttpStatus.INTERNAL_SERVER_ERROR_500, + "Response body is too large: " + contentLength + ">" + _responseLimit); + } + return super.onAddField(field); + } + }; + } + + @Override + public HttpFields.Mutable getHeaders() { + return _httpFields; + } - @Override - public void send(MetaData.Request request, MetaData.Response response, boolean last, ByteBuffer content, Callback callback) + @Override + public void write(boolean last, ByteBuffer content, Callback callback) + { + if (content != null && content.remaining() > 0) { - // Check response content limit. - if (content != null && content.remaining() > 0) + if (_responseLimit >= 0 && (_written + content.remaining()) > _responseLimit) { - if (_responseLimit >= 0 && (_written + content.remaining()) > _responseLimit) - { - callback.failed(new HttpException.RuntimeException(500, "Response body is too large: " + - _written + content.remaining() + ">" + _responseLimit)); - return; - } - _written += content.remaining(); + callback.failed(new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500, "Response body is too large: " + + _written + content.remaining() + ">" + _responseLimit)); + return; } - - super.send(request, response, last, content, callback); + _written += content.remaining(); } - }); - return super.handle(request, response, callback); + super.write(last, content, callback); + } } } diff --git a/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/impl/ContentChunk.java b/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/impl/ContentChunk.java index ec39ee7f7..48ead32cf 100644 --- a/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/impl/ContentChunk.java +++ b/runtime/runtime_impl_jetty12/src/main/java/com/google/apphosting/runtime/jetty/delegate/impl/ContentChunk.java @@ -18,17 +18,15 @@ import java.nio.ByteBuffer; import java.util.Objects; + import org.eclipse.jetty.io.Content; +import org.eclipse.jetty.io.Retainable; import org.eclipse.jetty.util.BufferUtil; -public class ContentChunk implements Content.Chunk { +public class ContentChunk extends Retainable.ReferenceCounter implements Content.Chunk { private final ByteBuffer byteBuffer; private final boolean last; - public ContentChunk(ByteBuffer byteBuffer) { - this(byteBuffer, true); - } - public ContentChunk(byte[] bytes) { this(BufferUtil.toBuffer(bytes), true); } @@ -48,16 +46,6 @@ public boolean isLast() { return last; } - @Override - public void retain() { - throw new UnsupportedOperationException(); - } - - @Override - public boolean release() { - return true; - } - @Override public String toString() { diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index 73e74d13b..0084e8dec 100644 --- a/runtime/runtime_impl_jetty9/pom.xml +++ b/runtime/runtime_impl_jetty9/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index 6964defb2..5c72b0280 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java index b27ea849a..f6cdcd7c4 100644 --- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java +++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/AnnotationScanningTest.java @@ -61,7 +61,7 @@ public static void beforeClass() throws IOException, InterruptedException { appRoot = new File( currentDirectory, - "../annotationscanningwebapp/target/annotationscanningwebapp-2.0.23-SNAPSHOT"); + "../annotationscanningwebapp/target/annotationscanningwebapp-2.0.24-SNAPSHOT"); assertThat(appRoot.isDirectory()).isTrue(); } diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java index c45c3ac24..9640bf9f8 100644 --- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java +++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/FailureFilterTest.java @@ -35,7 +35,7 @@ public static void beforeClass() throws IOException, InterruptedException { appRoot = new File( currentDirectory, - "../failinitfilterwebapp/target/failinitfilterwebapp-2.0.23-SNAPSHOT"); + "../failinitfilterwebapp/target/failinitfilterwebapp-2.0.24-SNAPSHOT"); assertThat(appRoot.isDirectory()).isTrue(); } diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java index c7f3ea126..e52cf7095 100644 --- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java +++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/NoGaeApisTest.java @@ -62,7 +62,7 @@ public NoGaeApisTest(String version) { public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); appRoot = - new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.23-SNAPSHOT"); + new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.24-SNAPSHOT"); assertThat(appRoot.isDirectory()).isTrue(); } diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index ab5eb814e..f80b6a23d 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index ed5fd5e09..707bc5fa2 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 0fc804dd9..bfb782c16 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 78c700c24..b39b8f225 100644 --- a/runtime_shared_jetty12/pom.xml +++ b/runtime_shared_jetty12/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared_jetty12_ee10/pom.xml b/runtime_shared_jetty12_ee10/pom.xml index c1d32d0e4..9acf84548 100644 --- a/runtime_shared_jetty12_ee10/pom.xml +++ b/runtime_shared_jetty12_ee10/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index 79ff70abc..a91709cfe 100644 --- a/runtime_shared_jetty9/pom.xml +++ b/runtime_shared_jetty9/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index e2d91c50a..fcf3233ee 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT 4.0.0 appengine-java-sdk @@ -349,8 +349,8 @@ - - + + diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index add72cc23..cfa6efe26 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index 3e52ace40..cfdaab5fb 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index b253eeb61..9ca6fca40 100644 --- a/shared_sdk_jetty12/pom.xml +++ b/shared_sdk_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index 6b0cd5ec4..96a476610 100644 --- a/shared_sdk_jetty9/pom.xml +++ b/shared_sdk_jetty9/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index d26f9d499..413ba651c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.25-SNAPSHOT true