From 57c171615c2a32602eeb0ac9d69b107244871569 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Wed, 6 Dec 2023 09:57:24 -0800 Subject: [PATCH 01/13] Upgrade GAE Java version from 2.0.22 to 2.0.23 and prepare next version 2.0.24-SNAPSHOT. PiperOrigin-RevId: 588461293 Change-Id: I1589d68d581440d1d2b152148d894e4925b9b444 --- README.md | 12 ++++++------ TRYLATESTBITSINPROD.md | 4 ++-- api/pom.xml | 2 +- api_dev/pom.xml | 2 +- api_legacy/pom.xml | 2 +- appengine-api-1.0-sdk/pom.xml | 2 +- appengine-api-stubs/pom.xml | 2 +- appengine_init/pom.xml | 2 +- appengine_jsr107/pom.xml | 2 +- appengine_resources/pom.xml | 2 +- appengine_testing/pom.xml | 2 +- appengine_testing_tests/pom.xml | 2 +- applications/pom.xml | 2 +- applications/proberapp/pom.xml | 2 +- applications/springboot/pom.xml | 2 +- e2etests/devappservertests/pom.xml | 2 +- .../tools/development/DevAppServerTestBase.java | 2 +- e2etests/pom.xml | 2 +- e2etests/stagingtests/pom.xml | 2 +- .../appengine/tools/admin/ApplicationTest.java | 2 +- .../com/google/appengine/tools/admin/EE10Test.java | 2 +- e2etests/testlocalapps/allinone/pom.xml | 2 +- e2etests/testlocalapps/allinone_jakarta/pom.xml | 2 +- e2etests/testlocalapps/badcron/pom.xml | 2 +- e2etests/testlocalapps/bundle_standard/pom.xml | 2 +- .../pom.xml | 2 +- .../bundle_standard_with_no_jsp/pom.xml | 2 +- .../pom.xml | 2 +- .../testlocalapps/cron-bad-job-age-limit/pom.xml | 2 +- .../testlocalapps/cron-good-retry-parameters/pom.xml | 2 +- .../testlocalapps/cron-negative-max-backoff/pom.xml | 2 +- .../testlocalapps/cron-negative-retry-limit/pom.xml | 2 +- .../testlocalapps/cron-two-max-doublings/pom.xml | 2 +- e2etests/testlocalapps/http-headers/pom.xml | 2 +- e2etests/testlocalapps/java8-jar/pom.xml | 2 +- e2etests/testlocalapps/java8-no-webxml/pom.xml | 2 +- e2etests/testlocalapps/pom.xml | 2 +- e2etests/testlocalapps/sample-badaeweb/pom.xml | 2 +- .../testlocalapps/sample-baddispatch-yaml/pom.xml | 2 +- e2etests/testlocalapps/sample-baddispatch/pom.xml | 2 +- e2etests/testlocalapps/sample-badentrypoint/pom.xml | 2 +- e2etests/testlocalapps/sample-badindexes/pom.xml | 2 +- .../testlocalapps/sample-badruntimechannel/pom.xml | 2 +- e2etests/testlocalapps/sample-badweb/pom.xml | 2 +- .../testlocalapps/sample-default-auto-ids/pom.xml | 2 +- .../testlocalapps/sample-error-in-tag-file/pom.xml | 2 +- e2etests/testlocalapps/sample-java11/pom.xml | 2 +- e2etests/testlocalapps/sample-java17/pom.xml | 2 +- e2etests/testlocalapps/sample-jsptaglibrary/pom.xml | 2 +- e2etests/testlocalapps/sample-jspx/pom.xml | 2 +- .../testlocalapps/sample-legacy-auto-ids/pom.xml | 2 +- e2etests/testlocalapps/sample-missingappid/pom.xml | 2 +- e2etests/testlocalapps/sample-nojsps/pom.xml | 2 +- .../sample-unspecified-auto-ids/pom.xml | 2 +- e2etests/testlocalapps/sample-with-classes/pom.xml | 2 +- .../testlocalapps/sampleapp-automatic-module/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-backends/pom.xml | 2 +- .../testlocalapps/sampleapp-basic-module/pom.xml | 2 +- .../testlocalapps/sampleapp-manual-module/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-runtime/pom.xml | 2 +- e2etests/testlocalapps/sampleapp/pom.xml | 2 +- e2etests/testlocalapps/stage-sampleapp/pom.xml | 2 +- .../testlocalapps/stage-with-staging-options/pom.xml | 2 +- e2etests/testlocalapps/xmlorder/pom.xml | 2 +- external/geronimo_javamail/pom.xml | 2 +- .../api_compatibility_tests/pom.xml | 2 +- .../apicompat/NoSerializeImmutableTest.java | 2 +- .../apicompat/usage/ApiExhaustiveUsageTestCase.java | 2 +- jetty12_assembly/pom.xml | 2 +- lib/pom.xml | 2 +- lib/tools_api/pom.xml | 2 +- lib/xml_validator/pom.xml | 2 +- lib/xml_validator_test/pom.xml | 2 +- local_runtime_shared_jetty12/pom.xml | 2 +- local_runtime_shared_jetty9/pom.xml | 2 +- pom.xml | 2 +- protobuf/pom.xml | 2 +- quickstartgenerator/pom.xml | 2 +- quickstartgenerator_jetty12/pom.xml | 2 +- quickstartgenerator_jetty12_ee10/pom.xml | 2 +- remoteapi/pom.xml | 2 +- runtime/annotationscanningwebapp/pom.xml | 2 +- runtime/deployment/pom.xml | 2 +- runtime/failinitfilterwebapp/pom.xml | 2 +- runtime/impl/pom.xml | 2 +- runtime/lite/pom.xml | 2 +- runtime/local_jetty12/pom.xml | 2 +- runtime/local_jetty12_ee10/pom.xml | 2 +- runtime/local_jetty9/pom.xml | 2 +- runtime/main/pom.xml | 2 +- runtime/nogaeapiswebapp/pom.xml | 2 +- runtime/pom.xml | 2 +- runtime/runtime_impl_jetty12/pom.xml | 2 +- runtime/runtime_impl_jetty9/pom.xml | 2 +- runtime/test/pom.xml | 2 +- .../runtime/jetty9/AnnotationScanningTest.java | 2 +- .../apphosting/runtime/jetty9/FailureFilterTest.java | 2 +- .../apphosting/runtime/jetty9/NoGaeApisTest.java | 2 +- runtime/testapps/pom.xml | 2 +- runtime/util/pom.xml | 2 +- runtime_shared/pom.xml | 2 +- runtime_shared_jetty12/pom.xml | 2 +- runtime_shared_jetty12_ee10/pom.xml | 2 +- runtime_shared_jetty9/pom.xml | 2 +- sdk_assembly/pom.xml | 2 +- sessiondata/pom.xml | 2 +- shared_sdk/pom.xml | 2 +- shared_sdk_jetty12/pom.xml | 2 +- shared_sdk_jetty9/pom.xml | 2 +- utils/pom.xml | 2 +- 110 files changed, 116 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 9cb5782ba..27987b4b6 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Source code for all public APIs for com.google.appengine.api.* packages. com.google.appengine appengine-api-1.0-sdk - 2.0.22 + 2.0.23 javax.servlet @@ -131,7 +131,7 @@ Source code for remote APIs for App Engine. com.google.appengine appengine-remote-api - 2.0.22 + 2.0.23 ``` @@ -154,7 +154,7 @@ 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 ``` @@ -169,19 +169,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 ``` diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index c67ded713..698438f35 100644 --- a/TRYLATESTBITSINPROD.md +++ b/TRYLATESTBITSINPROD.md @@ -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.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} ... diff --git a/api/pom.xml b/api/pom.xml index 4d5824be2..c14ae3b69 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index 2d528cc5b..70c863cd9 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.24-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 813f0a8d9..9ee71854f 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.24-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 084863b49..3e40269a3 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.24-SNAPSHOT jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index 95f3cf785..9f58d6dad 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.24-SNAPSHOT jar diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml index a3fb6c331..15c8b4863 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.24-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index c117f3519..87bbc6ff2 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.24-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index 51ef7d866..41cfe39b4 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.24-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index 7a7226af4..6c6e30ca1 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.24-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 15f81d88c..412b3e69a 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.24-SNAPSHOT jar diff --git a/applications/pom.xml b/applications/pom.xml index cabcf04a4..47a0e5a43 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index c20c7bd34..d8f5aaf25 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -27,7 +27,7 @@ com.google.appengine applications - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index d4649ac2e..751b1a720 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml index 1f0e31025..95c179462 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.24-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..e4f6a570a 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT AppEngine :: e2e tests pom diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index bc668213a..c2b6b490d 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.24-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..d80bd9965 100644 --- a/e2etests/testlocalapps/allinone/pom.xml +++ b/e2etests/testlocalapps/allinone/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/allinone_jakarta/pom.xml b/e2etests/testlocalapps/allinone_jakarta/pom.xml index cb2a06f61..5fb982f6d 100644 --- a/e2etests/testlocalapps/allinone_jakarta/pom.xml +++ b/e2etests/testlocalapps/allinone_jakarta/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index f37008a34..85fd67c69 100644 --- a/e2etests/testlocalapps/badcron/pom.xml +++ b/e2etests/testlocalapps/badcron/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index c98814c63..f54b12230 100644 --- a/e2etests/testlocalapps/bundle_standard/pom.xml +++ b/e2etests/testlocalapps/bundle_standard/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-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..9dafcd086 100644 --- a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml @@ -25,7 +25,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-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..6b10c348f 100644 --- a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-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..c1c387b60 100644 --- a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-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..dc91077e2 100644 --- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml +++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index 4d1e46e53..a234cc8c1 100644 --- a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml +++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml index d8f4e9d7d..6864d43c9 100644 --- a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml +++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml index 133543e13..462cc0d00 100644 --- a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml +++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml index 498e736f4..5cbfa882b 100644 --- a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml +++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index f175f8b6b..0f7c96caa 100644 --- a/e2etests/testlocalapps/http-headers/pom.xml +++ b/e2etests/testlocalapps/http-headers/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index c7e510800..933b21b2e 100644 --- a/e2etests/testlocalapps/java8-jar/pom.xml +++ b/e2etests/testlocalapps/java8-jar/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index b047f2298..340d9a2d4 100644 --- a/e2etests/testlocalapps/java8-no-webxml/pom.xml +++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index e2af51430..1f9308e03 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.24-SNAPSHOT pom diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index 2b4a75dd0..eb27a1c9e 100644 --- a/e2etests/testlocalapps/sample-badaeweb/pom.xml +++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index 5c076c952..e49efb8df 100644 --- a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index 16afe6e37..38079aa46 100644 --- a/e2etests/testlocalapps/sample-baddispatch/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml index bcdbe261c..6956b2017 100644 --- a/e2etests/testlocalapps/sample-badentrypoint/pom.xml +++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 412240e94..754ee0649 100644 --- a/e2etests/testlocalapps/sample-badindexes/pom.xml +++ b/e2etests/testlocalapps/sample-badindexes/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml index 95e4f2273..bb7967017 100644 --- a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml +++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index bfb5c43fa..a935b40cf 100644 --- a/e2etests/testlocalapps/sample-badweb/pom.xml +++ b/e2etests/testlocalapps/sample-badweb/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml index 4b9f66e39..b8392c38c 100644 --- a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-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..37a5f5cf2 100644 --- a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml +++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index af558bb47..cd79c72ba 100644 --- a/e2etests/testlocalapps/sample-java11/pom.xml +++ b/e2etests/testlocalapps/sample-java11/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index ed6403dfd..075f74698 100644 --- a/e2etests/testlocalapps/sample-java17/pom.xml +++ b/e2etests/testlocalapps/sample-java17/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 4003a03a5..4bc287907 100644 --- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml +++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index 15a613060..57c7621ee 100644 --- a/e2etests/testlocalapps/sample-jspx/pom.xml +++ b/e2etests/testlocalapps/sample-jspx/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml index 0a866ac79..ea09dd732 100644 --- a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index 73aa8676c..c863e98e0 100644 --- a/e2etests/testlocalapps/sample-missingappid/pom.xml +++ b/e2etests/testlocalapps/sample-missingappid/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index 47b1c1f45..f280525ca 100644 --- a/e2etests/testlocalapps/sample-nojsps/pom.xml +++ b/e2etests/testlocalapps/sample-nojsps/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml index 0c42a69e3..a8711648a 100644 --- a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index ad0e6d58d..484c55951 100644 --- a/e2etests/testlocalapps/sample-with-classes/pom.xml +++ b/e2etests/testlocalapps/sample-with-classes/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index 8e3253554..67ee520cc 100644 --- a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index 77a54ea20..1c8453fad 100644 --- a/e2etests/testlocalapps/sampleapp-backends/pom.xml +++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-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..ed84e2680 100644 --- a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index ffe6a4d73..7fbd38788 100644 --- a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index cec9491ad..d36291fe4 100644 --- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml +++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index 64f9249e8..f8958a207 100644 --- a/e2etests/testlocalapps/sampleapp/pom.xml +++ b/e2etests/testlocalapps/sampleapp/pom.xml @@ -25,7 +25,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT AppEngine :: sampleapp diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index 9b930e65d..7962882ca 100644 --- a/e2etests/testlocalapps/stage-sampleapp/pom.xml +++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml index 2dffd7ca2..94902a463 100644 --- a/e2etests/testlocalapps/stage-with-staging-options/pom.xml +++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index 2be6705b8..375d1b54f 100644 --- a/e2etests/testlocalapps/xmlorder/pom.xml +++ b/e2etests/testlocalapps/xmlorder/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT war AppEngine :: xmlorder diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index f7166dd3f..a025af5f1 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT ../../pom.xml 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..ad10517de 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.24-SNAPSHOT 4.0.0 jetty12-assembly diff --git a/lib/pom.xml b/lib/pom.xml index 93e5ac5f5..087748b23 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 666656b66..b51d41522 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.24-SNAPSHOT jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 75f75f311..57f9e8807 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.24-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index bcbb9a9d2..3172ff30f 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.24-SNAPSHOT jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml index b6f54c0cf..14864a0e4 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.24-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..7356f613e 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.24-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index 2ec4765d0..ce6c05d59 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT pom AppEngine :: Parent project diff --git a/protobuf/pom.xml b/protobuf/pom.xml index e17e67bb6..f2a20f6e9 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index ea246a9ab..52df26d29 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index 5c2ee89ca..eb5d92956 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.24-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12_ee10/pom.xml b/quickstartgenerator_jetty12_ee10/pom.xml index a3891ade8..4396afa66 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.24-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index db0b36ebb..f6e61ff03 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index a3582b0ab..eccf6eac0 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index 17ffb9b08..79170bbad 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.24-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index a4d6740b6..6dff486b2 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index 88388ee62..22f5766fc 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.24-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..613451583 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.24-SNAPSHOT jar diff --git a/runtime/local_jetty12_ee10/pom.xml b/runtime/local_jetty12_ee10/pom.xml index 2c2ac2648..5681baa90 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.24-SNAPSHOT jar diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index 4077d5bd1..b8e175371 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.24-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index c39e14a58..de970cb97 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.24-SNAPSHOT jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 48a755af0..bb49f18d1 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/pom.xml b/runtime/pom.xml index 0f332183b..a8173b1f8 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT AppEngine :: runtime projects pom diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index 975962119..9aae69c63 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.24-SNAPSHOT jar diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index 73e74d13b..01dcb0bcf 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.24-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index 6964defb2..af8c31a4d 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.24-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..5a44241f2 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.24-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index ed5fd5e09..d58b4255a 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.24-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 0fc804dd9..a713c4b50 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.24-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 78c700c24..16bf019d4 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.24-SNAPSHOT jar diff --git a/runtime_shared_jetty12_ee10/pom.xml b/runtime_shared_jetty12_ee10/pom.xml index c1d32d0e4..688a73f5c 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.24-SNAPSHOT jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index 79ff70abc..92703918f 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.24-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index e2d91c50a..3fd67a71b 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.24-SNAPSHOT 4.0.0 appengine-java-sdk diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index add72cc23..e30706605 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index 3e52ace40..1486cd4ad 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.24-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index b253eeb61..26752b032 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.24-SNAPSHOT jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index 6b0cd5ec4..202aa6d91 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.24-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index d26f9d499..c4cbf90d1 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.23-SNAPSHOT + 2.0.24-SNAPSHOT true From 9289340702633318a714402d155f9d7c1e6a5e96 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Wed, 6 Dec 2023 15:16:41 -0800 Subject: [PATCH 02/13] Java 21 README documentation. PiperOrigin-RevId: 588558235 Change-Id: I8aa5282d9dfd7d7b0b1cb6400f3815e3b103f3a6 --- README.md | 72 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 27987b4b6..8e0d11c65 100644 --- a/README.md +++ b/README.md @@ -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 @@ -79,6 +79,46 @@ Source code for all public APIs for com.google.appengine.api.* packages. ... ``` +* Maven Java 21 with Jarkata EE 10 support pom.xml + +- [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) + + ``` + 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 + + ``` + + + java11 + true + + + + ``` + * Java 17 appengine-web.xml @@ -125,7 +165,23 @@ 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 pom.xml ``` @@ -158,7 +214,7 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency ``` -### 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) @@ -219,9 +275,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 +291,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: From 20959dc5650c780af95c287e71797a642125ad3b Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Fri, 8 Dec 2023 09:43:36 -0800 Subject: [PATCH 03/13] Java 21 README documentation. PiperOrigin-RevId: 589159336 Change-Id: Ib88d82fd83af81ab3c06878d7cb5940b776b0fa2 --- README.md | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 8e0d11c65..2e4793353 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 @@ -64,7 +64,7 @@ Source code for all public APIs for com.google.appengine.api.* packages. ``` war - ... + ... com.google.appengine @@ -77,16 +77,14 @@ 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 -- [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) +* Maven Java 21 with Jarkata EE 10 support pom.xml ``` war - ... + ... com.google.appengine @@ -99,7 +97,7 @@ Source code for all public APIs for com.google.appengine.api.* packages. 6.0.0 provided - ... + ... ``` * Java 21 with Jakarta or javax appengine-web.xml @@ -107,10 +105,10 @@ Source code for all public APIs for com.google.appengine.api.* packages. ``` - java11 + java21 true - From 453d0979bd573c9c56dab1483fed7656f07c1fa5 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 13 Dec 2023 09:37:03 +1100 Subject: [PATCH 05/13] Issue #85 - fixes to the CoreSizeLimitHandler Signed-off-by: Lachlan Roberts --- .../runtime/jetty/CoreSizeLimitHandler.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) 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..b9b8ecae0 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 @@ -22,13 +22,13 @@ import org.eclipse.jetty.http.HttpField; import org.eclipse.jetty.http.HttpFields; import org.eclipse.jetty.http.HttpHeader; +import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.MetaData; 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; /** @@ -46,8 +46,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,10 +64,10 @@ 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; } } @@ -79,11 +77,11 @@ public boolean handle(Request request, Response response, Callback callback) thr @Override public HttpField onAddField(HttpField field) { - if ((field.getHeader()!=null) && (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString()))) + if (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString())) { long contentLength = field.getLongValue(); - if (_responseLimit > 0 && contentLength > _responseLimit) - throw new HttpException.RuntimeException(500, "Response body is too large: " + contentLength + ">" + _responseLimit); + 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); } @@ -100,6 +98,9 @@ public HttpFields.Mutable getHeaders() request.addHttpStreamWrapper(httpStream -> new HttpStream.Wrapper(httpStream) { + private long _read = 0; + private long _written = 0; + @Override public Content.Chunk read() { @@ -116,8 +117,7 @@ public Content.Chunk read() _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); + BadMessageException e = new BadMessageException(HttpStatus.PAYLOAD_TOO_LARGE_413, "Request body is too large: " + _read + ">" + _requestLimit); request.fail(e); return null; } @@ -134,7 +134,7 @@ public void send(MetaData.Request request, MetaData.Response response, boolean l { if (_responseLimit >= 0 && (_written + content.remaining()) > _responseLimit) { - callback.failed(new HttpException.RuntimeException(500, "Response body is too large: " + + callback.failed(new HttpException.RuntimeException(HttpStatus.INTERNAL_SERVER_ERROR_500, "Response body is too large: " + _written + content.remaining() + ">" + _responseLimit)); return; } From 37e4578cbfb08f30bbbab0075faf3ed553e3217e Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 13 Dec 2023 11:31:28 +1100 Subject: [PATCH 06/13] Issue #85 - rewrite SizeLimitHandler to use request/response wrappers Signed-off-by: Lachlan Roberts --- .../runtime/jetty/CoreSizeLimitHandler.java | 124 ++++++++++-------- 1 file changed, 67 insertions(+), 57 deletions(-) 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 b9b8ecae0..9868d5230 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.HttpStatus; -import org.eclipse.jetty.http.MetaData; 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.Callback; +import java.nio.ByteBuffer; + /** * A handler that can limit the size of message bodies in requests and responses. * @@ -72,79 +71,90 @@ public boolean handle(Request request, Response response, Callback callback) thr } } - 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) + { + super(wrapped); + } + + @Override + public Content.Chunk read() { - @Override - public HttpField onAddField(HttpField field) + 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().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(HttpStatus.INTERNAL_SERVER_ERROR_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) - { - private long _read = 0; - private long _written = 0; + private class SizeLimitResponseWrapper extends Response.Wrapper + { + private final HttpFields.Mutable _httpFields; + private long _written = 0; - @Override - public Content.Chunk read() - { - Content.Chunk chunk = super.read(); - if (chunk == null) - return null; - if (chunk.getFailure() != null) - return chunk; + public SizeLimitResponseWrapper(Request request, Response wrapped) { + super(request, wrapped); - // Check request content limit. - ByteBuffer content = chunk.getByteBuffer(); - if (content != null && content.remaining() > 0) + _httpFields = new HttpFields.Mutable.Wrapper(wrapped.getHeaders()) + { + @Override + public HttpField onAddField(HttpField field) { - _read += content.remaining(); - if (_requestLimit >= 0 && _read > _requestLimit) + if (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString())) { - BadMessageException e = new BadMessageException(HttpStatus.PAYLOAD_TOO_LARGE_413, "Request body is too large: " + _read + ">" + _requestLimit); - request.fail(e); - return null; + 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); } + }; + } - return chunk; - } + @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(HttpStatus.INTERNAL_SERVER_ERROR_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); + } } } From 6765b66613c00a777227d901741614a705abc354 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 12 Dec 2023 17:16:04 -0800 Subject: [PATCH 07/13] Update instructions to accommodate the new runtime jars. PiperOrigin-RevId: 590388955 Change-Id: Ic58ce86bc88366524d03aa1d4449415052671227 --- TRYLATESTBITSINPROD.md | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index 698438f35..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. @@ -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 From 61d6e669db5057355a9fdea2c36666bb24978e22 Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Tue, 19 Dec 2023 13:59:07 +1100 Subject: [PATCH 08/13] make ContentChunk retainable so multipart can use the chunks Signed-off-by: Lachlan Roberts --- .../jetty/delegate/impl/ContentChunk.java | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) 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() { From 99d8fbdf7e8161cdeaa6fd2bc836b767976c9cd1 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 19 Dec 2023 11:06:39 -0800 Subject: [PATCH 09/13] Bump some Maven dependencies to latest. PiperOrigin-RevId: 592288455 Change-Id: Ifcabf5bdc3176f413294b564389d158bf75b1170 --- pom.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index ce6c05d59..2b13a3985 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 508addb6b1dad52cd05e2299084346a0f6858b38 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Wed, 27 Dec 2023 17:24:45 -0800 Subject: [PATCH 10/13] Upgrade to Jetty 12.0.5 PiperOrigin-RevId: 594125823 Change-Id: Id06b43114a8cea402bf34fb669d9c802f59bfc67 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2b13a3985..2cc304719 100644 --- a/pom.xml +++ b/pom.xml @@ -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 From 78beb63b9da434d9ed5e37a7a6814086e6517de7 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Thu, 28 Dec 2023 15:05:26 -0800 Subject: [PATCH 11/13] Fix missing jetty-plus jar added recently in 12.0.5. PiperOrigin-RevId: 594321940 Change-Id: Iadf4b07f30f72a4af322718a8cfc2a32f7715bbe --- runtime/runtime_impl_jetty12/pom.xml | 6 ++++ .../runtime/jetty/CoreSizeLimitHandler.java | 28 +++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index 9aae69c63..c7ad6a917 100644 --- a/runtime/runtime_impl_jetty12/pom.xml +++ b/runtime/runtime_impl_jetty12/pom.xml @@ -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 9868d5230..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 @@ -119,20 +119,20 @@ private class SizeLimitResponseWrapper extends Response.Wrapper public SizeLimitResponseWrapper(Request request, Response wrapped) { super(request, wrapped); - _httpFields = new HttpFields.Mutable.Wrapper(wrapped.getHeaders()) - { - @Override - public HttpField onAddField(HttpField field) - { - if (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString())) - { - 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); - } - }; + _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 From 0e382b24668d3da5ecdd6cee9f2a7e34c36f14bc Mon Sep 17 00:00:00 2001 From: gae-java-bot Date: Wed, 3 Jan 2024 17:08:08 -0500 Subject: [PATCH 12/13] [maven-release-plugin] prepare release parent-2.0.24 --- api/pom.xml | 2 +- api_dev/pom.xml | 2 +- api_legacy/pom.xml | 2 +- appengine-api-1.0-sdk/pom.xml | 2 +- appengine-api-stubs/pom.xml | 2 +- appengine_init/pom.xml | 2 +- appengine_jsr107/pom.xml | 2 +- appengine_resources/pom.xml | 2 +- appengine_testing/pom.xml | 2 +- appengine_testing_tests/pom.xml | 2 +- applications/pom.xml | 2 +- applications/proberapp/pom.xml | 6 ++---- applications/springboot/pom.xml | 5 ++--- e2etests/devappservertests/pom.xml | 2 +- e2etests/pom.xml | 2 +- e2etests/stagingtests/pom.xml | 2 +- e2etests/testlocalapps/allinone/pom.xml | 5 ++--- e2etests/testlocalapps/allinone_jakarta/pom.xml | 5 ++--- e2etests/testlocalapps/badcron/pom.xml | 5 ++--- e2etests/testlocalapps/bundle_standard/pom.xml | 5 ++--- .../bundle_standard_with_container_initializer/pom.xml | 5 ++--- e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml | 5 ++--- .../bundle_standard_with_weblistener_memcache/pom.xml | 5 ++--- e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml | 5 ++--- e2etests/testlocalapps/cron-good-retry-parameters/pom.xml | 5 ++--- e2etests/testlocalapps/cron-negative-max-backoff/pom.xml | 5 ++--- e2etests/testlocalapps/cron-negative-retry-limit/pom.xml | 5 ++--- e2etests/testlocalapps/cron-two-max-doublings/pom.xml | 5 ++--- e2etests/testlocalapps/http-headers/pom.xml | 5 ++--- e2etests/testlocalapps/java8-jar/pom.xml | 5 ++--- e2etests/testlocalapps/java8-no-webxml/pom.xml | 5 ++--- e2etests/testlocalapps/pom.xml | 2 +- e2etests/testlocalapps/sample-badaeweb/pom.xml | 5 ++--- e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml | 5 ++--- e2etests/testlocalapps/sample-baddispatch/pom.xml | 5 ++--- e2etests/testlocalapps/sample-badentrypoint/pom.xml | 5 ++--- e2etests/testlocalapps/sample-badindexes/pom.xml | 5 ++--- e2etests/testlocalapps/sample-badruntimechannel/pom.xml | 5 ++--- e2etests/testlocalapps/sample-badweb/pom.xml | 5 ++--- e2etests/testlocalapps/sample-default-auto-ids/pom.xml | 5 ++--- e2etests/testlocalapps/sample-error-in-tag-file/pom.xml | 5 ++--- e2etests/testlocalapps/sample-java11/pom.xml | 5 ++--- e2etests/testlocalapps/sample-java17/pom.xml | 5 ++--- e2etests/testlocalapps/sample-jsptaglibrary/pom.xml | 5 ++--- e2etests/testlocalapps/sample-jspx/pom.xml | 5 ++--- e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml | 5 ++--- e2etests/testlocalapps/sample-missingappid/pom.xml | 5 ++--- e2etests/testlocalapps/sample-nojsps/pom.xml | 5 ++--- e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml | 5 ++--- e2etests/testlocalapps/sample-with-classes/pom.xml | 5 ++--- e2etests/testlocalapps/sampleapp-automatic-module/pom.xml | 5 ++--- e2etests/testlocalapps/sampleapp-backends/pom.xml | 5 ++--- e2etests/testlocalapps/sampleapp-basic-module/pom.xml | 5 ++--- e2etests/testlocalapps/sampleapp-manual-module/pom.xml | 5 ++--- e2etests/testlocalapps/sampleapp-runtime/pom.xml | 5 ++--- e2etests/testlocalapps/sampleapp/pom.xml | 5 ++--- e2etests/testlocalapps/stage-sampleapp/pom.xml | 5 ++--- e2etests/testlocalapps/stage-with-staging-options/pom.xml | 5 ++--- e2etests/testlocalapps/xmlorder/pom.xml | 5 ++--- external/geronimo_javamail/pom.xml | 4 ++-- jetty12_assembly/pom.xml | 2 +- lib/pom.xml | 2 +- lib/tools_api/pom.xml | 2 +- lib/xml_validator/pom.xml | 2 +- lib/xml_validator_test/pom.xml | 2 +- local_runtime_shared_jetty12/pom.xml | 2 +- local_runtime_shared_jetty9/pom.xml | 2 +- pom.xml | 4 ++-- protobuf/pom.xml | 2 +- quickstartgenerator/pom.xml | 2 +- quickstartgenerator_jetty12/pom.xml | 2 +- quickstartgenerator_jetty12_ee10/pom.xml | 2 +- remoteapi/pom.xml | 2 +- runtime/annotationscanningwebapp/pom.xml | 6 ++---- runtime/deployment/pom.xml | 2 +- runtime/failinitfilterwebapp/pom.xml | 6 ++---- runtime/impl/pom.xml | 2 +- runtime/local_jetty12/pom.xml | 2 +- runtime/local_jetty12_ee10/pom.xml | 2 +- runtime/local_jetty9/pom.xml | 2 +- runtime/main/pom.xml | 2 +- runtime/nogaeapiswebapp/pom.xml | 6 ++---- runtime/pom.xml | 2 +- runtime/runtime_impl_jetty12/pom.xml | 2 +- runtime/runtime_impl_jetty9/pom.xml | 2 +- runtime/test/pom.xml | 2 +- runtime/testapps/pom.xml | 2 +- runtime/util/pom.xml | 2 +- runtime_shared/pom.xml | 2 +- runtime_shared_jetty12/pom.xml | 2 +- runtime_shared_jetty12_ee10/pom.xml | 2 +- runtime_shared_jetty9/pom.xml | 2 +- sdk_assembly/pom.xml | 6 +++--- sessiondata/pom.xml | 2 +- shared_sdk/pom.xml | 2 +- shared_sdk_jetty12/pom.xml | 2 +- shared_sdk_jetty9/pom.xml | 2 +- utils/pom.xml | 2 +- 98 files changed, 149 insertions(+), 200 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index c14ae3b69..cdeaf7afc 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index 70c863cd9..16e893c52 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 9ee71854f..7304604bd 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 3e40269a3..890f5ffa3 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.24-SNAPSHOT + 2.0.24 jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index 9f58d6dad..704e1f28b 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml index 15c8b4863..22ebe6d53 100644 --- a/appengine_init/pom.xml +++ b/appengine_init/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index 87bbc6ff2..4db97c47c 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index 41cfe39b4..74eb3621b 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index 6c6e30ca1..393c68d54 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 412b3e69a..5cb92c406 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/applications/pom.xml b/applications/pom.xml index 47a0e5a43..5fac1c238 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index d8f5aaf25..38d9af0c7 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.24-SNAPSHOT + 2.0.24 diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index 751b1a720..a487e9f9f 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml index 95c179462..b96ca6b8f 100644 --- a/e2etests/devappservertests/pom.xml +++ b/e2etests/devappservertests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/e2etests/pom.xml b/e2etests/pom.xml index e4f6a570a..ed497fca8 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 AppEngine :: e2e tests pom diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index c2b6b490d..97e2922cb 100644 --- a/e2etests/stagingtests/pom.xml +++ b/e2etests/stagingtests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml index d80bd9965..40cd35492 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/allinone_jakarta/pom.xml b/e2etests/testlocalapps/allinone_jakarta/pom.xml index 5fb982f6d..c45b1543c 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index 85fd67c69..efa818f58 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index f54b12230..b3d5d85e4 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml index 9dafcd086..68d2e93e2 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml index 6b10c348f..9666d8e14 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml index c1c387b60..be86efa5e 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml index dc91077e2..d750f73ac 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index a234cc8c1..8fbc3b9d3 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml index 6864d43c9..7de8f2ddf 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml index 462cc0d00..b1a6d53e8 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml index 5cbfa882b..ad2219ccd 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index 0f7c96caa..c79977fd9 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index 933b21b2e..14f656659 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index 340d9a2d4..a7a589893 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index 1f9308e03..6bd90baf4 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.24-SNAPSHOT + 2.0.24 pom diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index eb27a1c9e..e7dc44ce8 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index e49efb8df..4ed43987f 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index 38079aa46..ab33afa2d 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml index 6956b2017..f8137e00d 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 754ee0649..7337e61d6 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml index bb7967017..df1370ace 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index a935b40cf..3c700301d 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml index b8392c38c..462e7b9ef 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml index 37a5f5cf2..50d9778b5 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index cd79c72ba..fe165d9d1 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index 075f74698..bf644d125 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 4bc287907..133863146 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index 57c7621ee..22d3fdaf6 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml index ea09dd732..746ff1a33 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index c863e98e0..0ec587c03 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index f280525ca..d8a79aceb 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml index a8711648a..9de4fffa5 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index 484c55951..1f368a202 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index 67ee520cc..fb29719cc 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index 1c8453fad..c322154cb 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.24-SNAPSHOT + 2.0.24 war AppEngine :: sampleapp-backends diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml index ed84e2680..55b135a95 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index 7fbd38788..e1ca4261e 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index d36291fe4..89e00c49a 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index f8958a207..7bd77b012 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.24-SNAPSHOT + 2.0.24 AppEngine :: sampleapp diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index 7962882ca..ba4d7552c 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml index 94902a463..fbbac3e34 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.24-SNAPSHOT + 2.0.24 war diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index 375d1b54f..5169495f7 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.24-SNAPSHOT + 2.0.24 war AppEngine :: xmlorder diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index a025af5f1..349835ccc 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,14 +22,14 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 ../../pom.xml geronimo-javamail_1.4_spec jar AppEngine :: JavaMail 1.4 - 1.4.4-${project.parent.version} + 1.4.4-2.0.24 Javamail 1.4 Specification with AppEngine updates. diff --git a/jetty12_assembly/pom.xml b/jetty12_assembly/pom.xml index ad10517de..95f48b545 100644 --- a/jetty12_assembly/pom.xml +++ b/jetty12_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 4.0.0 jetty12-assembly diff --git a/lib/pom.xml b/lib/pom.xml index 087748b23..c6ecd04bc 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index b51d41522..821cb57f7 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -23,7 +23,7 @@ com.google.appengine lib-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 57f9e8807..3d201cb24 100644 --- a/lib/xml_validator/pom.xml +++ b/lib/xml_validator/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 2.0.24-SNAPSHOT + 2.0.24 jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index 3172ff30f..a7c807c01 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.24-SNAPSHOT + 2.0.24 jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml index 14864a0e4..b79862c84 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.24-SNAPSHOT + 2.0.24 jar AppEngine :: appengine-local-runtime-shared Jetty12 diff --git a/local_runtime_shared_jetty9/pom.xml b/local_runtime_shared_jetty9/pom.xml index 7356f613e..7a23f99cf 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.24-SNAPSHOT + 2.0.24 jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index 2cc304719..a2766f6de 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 pom AppEngine :: Parent project @@ -74,7 +74,7 @@ scm:git:git://github.com/GoogleCloudPlatform/appengine-java-standard.git https://github.com/GoogleCloudPlatform/appengine-java-standard scm:git:ssh://git@github.com/GoogleCloudPlatform/appengine-java-standard.git - HEAD + parent-2.0.24 diff --git a/protobuf/pom.xml b/protobuf/pom.xml index f2a20f6e9..21db30842 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index 52df26d29..7c8c7ae31 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index eb5d92956..a3ff95c46 100644 --- a/quickstartgenerator_jetty12/pom.xml +++ b/quickstartgenerator_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/quickstartgenerator_jetty12_ee10/pom.xml b/quickstartgenerator_jetty12_ee10/pom.xml index 4396afa66..fdc80dd54 100644 --- a/quickstartgenerator_jetty12_ee10/pom.xml +++ b/quickstartgenerator_jetty12_ee10/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index f6e61ff03..256667e8f 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index eccf6eac0..5faedad0a 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.24-SNAPSHOT + 2.0.24 com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index 79170bbad..3038a105d 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index 6dff486b2..aef06bf20 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.24-SNAPSHOT + 2.0.24 com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index 22f5766fc..e4d80e6b5 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index 613451583..a14c61938 100644 --- a/runtime/local_jetty12/pom.xml +++ b/runtime/local_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/local_jetty12_ee10/pom.xml b/runtime/local_jetty12_ee10/pom.xml index 5681baa90..7337781e1 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.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index b8e175371..1f6fef8f4 100644 --- a/runtime/local_jetty9/pom.xml +++ b/runtime/local_jetty9/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index de970cb97..cd03f8188 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index bb49f18d1..4bbf1edb9 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.24-SNAPSHOT + 2.0.24 com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/pom.xml b/runtime/pom.xml index a8173b1f8..50bcd3ee2 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 AppEngine :: runtime projects pom diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index c7ad6a917..e34e471d4 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.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index 01dcb0bcf..03a417b8f 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.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index af8c31a4d..ae649eba5 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 5a44241f2..8378e4d2b 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index d58b4255a..a0d89ae9d 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index a713c4b50..5288ceeeb 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 16bf019d4..0d1cd67bc 100644 --- a/runtime_shared_jetty12/pom.xml +++ b/runtime_shared_jetty12/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime_shared_jetty12_ee10/pom.xml b/runtime_shared_jetty12_ee10/pom.xml index 688a73f5c..88ee6c3dd 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.24-SNAPSHOT + 2.0.24 jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index 92703918f..31e987d4c 100644 --- a/runtime_shared_jetty9/pom.xml +++ b/runtime_shared_jetty9/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index 3fd67a71b..00d4dae11 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 4.0.0 appengine-java-sdk @@ -349,8 +349,8 @@ - - + + diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index e30706605..d5c8583ba 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index 1486cd4ad..5c41a544c 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index 26752b032..0706e6270 100644 --- a/shared_sdk_jetty12/pom.xml +++ b/shared_sdk_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index 202aa6d91..5e1eb619e 100644 --- a/shared_sdk_jetty9/pom.xml +++ b/shared_sdk_jetty9/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 jar diff --git a/utils/pom.xml b/utils/pom.xml index c4cbf90d1..2ee063a00 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24-SNAPSHOT + 2.0.24 true From 95c86a51700de2628af4e5bf840101dd6956a357 Mon Sep 17 00:00:00 2001 From: gae-java-bot Date: Wed, 3 Jan 2024 17:08:08 -0500 Subject: [PATCH 13/13] [maven-release-plugin] prepare for next development iteration --- api/pom.xml | 2 +- api_dev/pom.xml | 2 +- api_legacy/pom.xml | 2 +- appengine-api-1.0-sdk/pom.xml | 2 +- appengine-api-stubs/pom.xml | 2 +- appengine_init/pom.xml | 2 +- appengine_jsr107/pom.xml | 2 +- appengine_resources/pom.xml | 2 +- appengine_testing/pom.xml | 2 +- appengine_testing_tests/pom.xml | 2 +- applications/pom.xml | 2 +- applications/proberapp/pom.xml | 2 +- applications/springboot/pom.xml | 2 +- e2etests/devappservertests/pom.xml | 2 +- e2etests/pom.xml | 2 +- e2etests/stagingtests/pom.xml | 2 +- e2etests/testlocalapps/allinone/pom.xml | 2 +- e2etests/testlocalapps/allinone_jakarta/pom.xml | 2 +- e2etests/testlocalapps/badcron/pom.xml | 2 +- e2etests/testlocalapps/bundle_standard/pom.xml | 2 +- .../bundle_standard_with_container_initializer/pom.xml | 2 +- e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml | 2 +- .../bundle_standard_with_weblistener_memcache/pom.xml | 2 +- e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml | 2 +- e2etests/testlocalapps/cron-good-retry-parameters/pom.xml | 2 +- e2etests/testlocalapps/cron-negative-max-backoff/pom.xml | 2 +- e2etests/testlocalapps/cron-negative-retry-limit/pom.xml | 2 +- e2etests/testlocalapps/cron-two-max-doublings/pom.xml | 2 +- e2etests/testlocalapps/http-headers/pom.xml | 2 +- e2etests/testlocalapps/java8-jar/pom.xml | 2 +- e2etests/testlocalapps/java8-no-webxml/pom.xml | 2 +- e2etests/testlocalapps/pom.xml | 2 +- e2etests/testlocalapps/sample-badaeweb/pom.xml | 2 +- e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml | 2 +- e2etests/testlocalapps/sample-baddispatch/pom.xml | 2 +- e2etests/testlocalapps/sample-badentrypoint/pom.xml | 2 +- e2etests/testlocalapps/sample-badindexes/pom.xml | 2 +- e2etests/testlocalapps/sample-badruntimechannel/pom.xml | 2 +- e2etests/testlocalapps/sample-badweb/pom.xml | 2 +- e2etests/testlocalapps/sample-default-auto-ids/pom.xml | 2 +- e2etests/testlocalapps/sample-error-in-tag-file/pom.xml | 2 +- e2etests/testlocalapps/sample-java11/pom.xml | 2 +- e2etests/testlocalapps/sample-java17/pom.xml | 2 +- e2etests/testlocalapps/sample-jsptaglibrary/pom.xml | 2 +- e2etests/testlocalapps/sample-jspx/pom.xml | 2 +- e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml | 2 +- e2etests/testlocalapps/sample-missingappid/pom.xml | 2 +- e2etests/testlocalapps/sample-nojsps/pom.xml | 2 +- e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml | 2 +- e2etests/testlocalapps/sample-with-classes/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-automatic-module/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-backends/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-basic-module/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-manual-module/pom.xml | 2 +- e2etests/testlocalapps/sampleapp-runtime/pom.xml | 2 +- e2etests/testlocalapps/sampleapp/pom.xml | 2 +- e2etests/testlocalapps/stage-sampleapp/pom.xml | 2 +- e2etests/testlocalapps/stage-with-staging-options/pom.xml | 2 +- e2etests/testlocalapps/xmlorder/pom.xml | 2 +- external/geronimo_javamail/pom.xml | 4 ++-- jetty12_assembly/pom.xml | 2 +- lib/pom.xml | 2 +- lib/tools_api/pom.xml | 2 +- lib/xml_validator/pom.xml | 2 +- lib/xml_validator_test/pom.xml | 2 +- local_runtime_shared_jetty12/pom.xml | 2 +- local_runtime_shared_jetty9/pom.xml | 2 +- pom.xml | 4 ++-- protobuf/pom.xml | 2 +- quickstartgenerator/pom.xml | 2 +- quickstartgenerator_jetty12/pom.xml | 2 +- quickstartgenerator_jetty12_ee10/pom.xml | 2 +- remoteapi/pom.xml | 2 +- runtime/annotationscanningwebapp/pom.xml | 2 +- runtime/deployment/pom.xml | 2 +- runtime/failinitfilterwebapp/pom.xml | 2 +- runtime/impl/pom.xml | 2 +- runtime/local_jetty12/pom.xml | 2 +- runtime/local_jetty12_ee10/pom.xml | 2 +- runtime/local_jetty9/pom.xml | 2 +- runtime/main/pom.xml | 2 +- runtime/nogaeapiswebapp/pom.xml | 2 +- runtime/pom.xml | 2 +- runtime/runtime_impl_jetty12/pom.xml | 2 +- runtime/runtime_impl_jetty9/pom.xml | 2 +- runtime/test/pom.xml | 2 +- runtime/testapps/pom.xml | 2 +- runtime/util/pom.xml | 2 +- runtime_shared/pom.xml | 2 +- runtime_shared_jetty12/pom.xml | 2 +- runtime_shared_jetty12_ee10/pom.xml | 2 +- runtime_shared_jetty9/pom.xml | 2 +- sdk_assembly/pom.xml | 2 +- sessiondata/pom.xml | 2 +- shared_sdk/pom.xml | 2 +- shared_sdk_jetty12/pom.xml | 2 +- shared_sdk_jetty9/pom.xml | 2 +- utils/pom.xml | 2 +- 98 files changed, 100 insertions(+), 100 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index cdeaf7afc..214e9fbc7 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index 16e893c52..f88c520fc 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 7304604bd..1e2f40437 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 890f5ffa3..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.24 + 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 704e1f28b..8f0af1f5a 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml index 22ebe6d53..04bf2d507 100644 --- a/appengine_init/pom.xml +++ b/appengine_init/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index 4db97c47c..a10ba40aa 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index 74eb3621b..6cb218be6 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index 393c68d54..09dabb721 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 5cb92c406..90c69deab 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/applications/pom.xml b/applications/pom.xml index 5fac1c238..9248d6a06 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index 38d9af0c7..fbfb88dd5 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -25,7 +25,7 @@ com.google.appengine applications - 2.0.24 + 2.0.25-SNAPSHOT diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index a487e9f9f..b0982aa69 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -23,7 +23,7 @@ com.google.appengine applications - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml index b96ca6b8f..c852d54a4 100644 --- a/e2etests/devappservertests/pom.xml +++ b/e2etests/devappservertests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/e2etests/pom.xml b/e2etests/pom.xml index ed497fca8..673fc28c8 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT AppEngine :: e2e tests pom diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index 97e2922cb..b3ae6db4c 100644 --- a/e2etests/stagingtests/pom.xml +++ b/e2etests/stagingtests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml index 40cd35492..15fcf7749 100644 --- a/e2etests/testlocalapps/allinone/pom.xml +++ b/e2etests/testlocalapps/allinone/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/allinone_jakarta/pom.xml b/e2etests/testlocalapps/allinone_jakarta/pom.xml index c45b1543c..b0127a94f 100644 --- a/e2etests/testlocalapps/allinone_jakarta/pom.xml +++ b/e2etests/testlocalapps/allinone_jakarta/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index efa818f58..b7b6e5282 100644 --- a/e2etests/testlocalapps/badcron/pom.xml +++ b/e2etests/testlocalapps/badcron/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index b3d5d85e4..ec62b5581 100644 --- a/e2etests/testlocalapps/bundle_standard/pom.xml +++ b/e2etests/testlocalapps/bundle_standard/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 68d2e93e2..b9a3b3445 100644 --- a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 9666d8e14..98fcb4699 100644 --- a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 be86efa5e..9e2e42c25 100644 --- a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 d750f73ac..e6c6e628c 100644 --- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml +++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 8fbc3b9d3..4b5de0cdd 100644 --- a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml +++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 7de8f2ddf..43ec783e3 100644 --- a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml +++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 b1a6d53e8..b5c3693fb 100644 --- a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml +++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 ad2219ccd..dbe004248 100644 --- a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml +++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index c79977fd9..2976d9cc1 100644 --- a/e2etests/testlocalapps/http-headers/pom.xml +++ b/e2etests/testlocalapps/http-headers/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index 14f656659..4c1220c38 100644 --- a/e2etests/testlocalapps/java8-jar/pom.xml +++ b/e2etests/testlocalapps/java8-jar/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index a7a589893..d28259a9a 100644 --- a/e2etests/testlocalapps/java8-no-webxml/pom.xml +++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index 6bd90baf4..d32be39d0 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.24 + 2.0.25-SNAPSHOT pom diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index e7dc44ce8..2abfd311a 100644 --- a/e2etests/testlocalapps/sample-badaeweb/pom.xml +++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index 4ed43987f..b3ca36fb8 100644 --- a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index ab33afa2d..8a996c6b6 100644 --- a/e2etests/testlocalapps/sample-baddispatch/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml index f8137e00d..e5cf5d3d2 100644 --- a/e2etests/testlocalapps/sample-badentrypoint/pom.xml +++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 7337e61d6..26e249927 100644 --- a/e2etests/testlocalapps/sample-badindexes/pom.xml +++ b/e2etests/testlocalapps/sample-badindexes/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml index df1370ace..5314fd0dc 100644 --- a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml +++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index 3c700301d..94de33c64 100644 --- a/e2etests/testlocalapps/sample-badweb/pom.xml +++ b/e2etests/testlocalapps/sample-badweb/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 462e7b9ef..e6d6c6ab0 100644 --- a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 50d9778b5..649d8a3ef 100644 --- a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml +++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index fe165d9d1..701c2c554 100644 --- a/e2etests/testlocalapps/sample-java11/pom.xml +++ b/e2etests/testlocalapps/sample-java11/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index bf644d125..f46a93fbf 100644 --- a/e2etests/testlocalapps/sample-java17/pom.xml +++ b/e2etests/testlocalapps/sample-java17/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 133863146..163ea9e7b 100644 --- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml +++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index 22d3fdaf6..141234ac1 100644 --- a/e2etests/testlocalapps/sample-jspx/pom.xml +++ b/e2etests/testlocalapps/sample-jspx/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 746ff1a33..fccdb944c 100644 --- a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index 0ec587c03..c40f04b73 100644 --- a/e2etests/testlocalapps/sample-missingappid/pom.xml +++ b/e2etests/testlocalapps/sample-missingappid/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index d8a79aceb..de936d184 100644 --- a/e2etests/testlocalapps/sample-nojsps/pom.xml +++ b/e2etests/testlocalapps/sample-nojsps/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 9de4fffa5..d2c6047ae 100644 --- a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index 1f368a202..a84d06dfc 100644 --- a/e2etests/testlocalapps/sample-with-classes/pom.xml +++ b/e2etests/testlocalapps/sample-with-classes/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index fb29719cc..6387fc179 100644 --- a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index c322154cb..56bf6d6a4 100644 --- a/e2etests/testlocalapps/sampleapp-backends/pom.xml +++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 55b135a95..c13f9690b 100644 --- a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index e1ca4261e..4441e7230 100644 --- a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index 89e00c49a..0f900b4ed 100644 --- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml +++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index 7bd77b012..12d3f04b0 100644 --- a/e2etests/testlocalapps/sampleapp/pom.xml +++ b/e2etests/testlocalapps/sampleapp/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT AppEngine :: sampleapp diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index ba4d7552c..88b243dc5 100644 --- a/e2etests/testlocalapps/stage-sampleapp/pom.xml +++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 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 fbbac3e34..3f3dc7c3d 100644 --- a/e2etests/testlocalapps/stage-with-staging-options/pom.xml +++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index 5169495f7..aba4b7d1c 100644 --- a/e2etests/testlocalapps/xmlorder/pom.xml +++ b/e2etests/testlocalapps/xmlorder/pom.xml @@ -23,7 +23,7 @@ com.google.appengine testlocalapps - 2.0.24 + 2.0.25-SNAPSHOT war AppEngine :: xmlorder diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index 349835ccc..b2331a723 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,14 +22,14 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT ../../pom.xml geronimo-javamail_1.4_spec jar AppEngine :: JavaMail 1.4 - 1.4.4-2.0.24 + 1.4.4-3.0.24-SNAPSHOT Javamail 1.4 Specification with AppEngine updates. diff --git a/jetty12_assembly/pom.xml b/jetty12_assembly/pom.xml index 95f48b545..b7a406939 100644 --- a/jetty12_assembly/pom.xml +++ b/jetty12_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT 4.0.0 jetty12-assembly diff --git a/lib/pom.xml b/lib/pom.xml index c6ecd04bc..cc8534738 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 821cb57f7..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.24 + 2.0.25-SNAPSHOT jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 3d201cb24..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.24 + 2.0.25-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index a7c807c01..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.24 + 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 b79862c84..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.24 + 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 7a23f99cf..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.24 + 2.0.25-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index a2766f6de..4eaaf7643 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT pom AppEngine :: Parent project @@ -74,7 +74,7 @@ scm:git:git://github.com/GoogleCloudPlatform/appengine-java-standard.git https://github.com/GoogleCloudPlatform/appengine-java-standard scm:git:ssh://git@github.com/GoogleCloudPlatform/appengine-java-standard.git - parent-2.0.24 + HEAD diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 21db30842..8bbc337b6 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index 7c8c7ae31..266ba8f99 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index a3ff95c46..1d8493d31 100644 --- a/quickstartgenerator_jetty12/pom.xml +++ b/quickstartgenerator_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12_ee10/pom.xml b/quickstartgenerator_jetty12_ee10/pom.xml index fdc80dd54..fd10fc64c 100644 --- a/quickstartgenerator_jetty12_ee10/pom.xml +++ b/quickstartgenerator_jetty12_ee10/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index 256667e8f..ff8c625dd 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index 5faedad0a..865ec403f 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -21,7 +21,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index 3038a105d..d52693e5e 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index aef06bf20..2baaa701b 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -21,7 +21,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index e4d80e6b5..37fee9b64 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index a14c61938..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.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/local_jetty12_ee10/pom.xml b/runtime/local_jetty12_ee10/pom.xml index 7337781e1..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.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index 1f6fef8f4..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.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index cd03f8188..9a3fffd6b 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 4bbf1edb9..450c62f29 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -21,7 +21,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/pom.xml b/runtime/pom.xml index 50bcd3ee2..ca8b2c6db 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 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 e34e471d4..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.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index 03a417b8f..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.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index ae649eba5..5c72b0280 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 8378e4d2b..f80b6a23d 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index a0d89ae9d..707bc5fa2 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 5288ceeeb..bfb782c16 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 0d1cd67bc..b39b8f225 100644 --- a/runtime_shared_jetty12/pom.xml +++ b/runtime_shared_jetty12/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared_jetty12_ee10/pom.xml b/runtime_shared_jetty12_ee10/pom.xml index 88ee6c3dd..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.24 + 2.0.25-SNAPSHOT jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index 31e987d4c..a91709cfe 100644 --- a/runtime_shared_jetty9/pom.xml +++ b/runtime_shared_jetty9/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index 00d4dae11..fcf3233ee 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT 4.0.0 appengine-java-sdk diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index d5c8583ba..cfa6efe26 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index 5c41a544c..cfdaab5fb 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index 0706e6270..9ca6fca40 100644 --- a/shared_sdk_jetty12/pom.xml +++ b/shared_sdk_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index 5e1eb619e..96a476610 100644 --- a/shared_sdk_jetty9/pom.xml +++ b/shared_sdk_jetty9/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index 2ee063a00..413ba651c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.24 + 2.0.25-SNAPSHOT true