From 9e3ab48e23e355f786b0d39b650dcefee40848be Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 3 Oct 2023 15:17:53 -0700 Subject: [PATCH 01/15] No public description PiperOrigin-RevId: 570511723 Change-Id: If1e4b989e63941093a73d9f89fe30e807f9bb541 --- 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_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 +- e2etests/pom.xml | 2 +- e2etests/stagingtests/pom.xml | 2 +- e2etests/testlocalapps/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 +- remoteapi/pom.xml | 2 +- runtime/deployment/pom.xml | 2 +- runtime/impl/pom.xml | 2 +- runtime/lite/pom.xml | 2 +- runtime/local_jetty12/pom.xml | 2 +- runtime/local_jetty9/pom.xml | 2 +- runtime/main/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_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 +- 53 files changed, 59 insertions(+), 59 deletions(-) diff --git a/README.md b/README.md index 1d5351e99..de13ee454 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.19 + 2.0.20 javax.servlet @@ -131,7 +131,7 @@ Source code for remote APIs for App Engine. com.google.appengine appengine-remote-api - 2.0.19 + 2.0.20 ``` @@ -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.19 + 2.0.20 ``` @@ -169,19 +169,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency com.google.appengine appengine-testing - 2.0.19 + 2.0.20 test com.google.appengine appengine-api-stubs - 2.0.19 + 2.0.20 test com.google.appengine appengine-tools-sdk - 2.0.19 + 2.0.20 test ``` diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index 3e62caf79..fef191614 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.20-SNAPSHOT`. +Let's assume the current built version is `2.0.21-SNAPSHOT`. Add the dependency for the GAE runtime jars in your application pom.xml file: ``` - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT ${appengine.runtime.location} ... diff --git a/api/pom.xml b/api/pom.xml index fc1864cb6..0e85be361 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index f26e31800..b7a6da267 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 02245185c..5590fa8b9 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 04e3e24a5..e5b7642ac 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.20-SNAPSHOT + 2.0.21-SNAPSHOT jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index 2247931ee..64e82e537 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index 92cd06bd5..7e0727970 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index c0e5a6d7e..c7d3a5e0a 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index cf40ea245..6be262904 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 14a830bce..749f6e047 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/applications/pom.xml b/applications/pom.xml index e2a89e2bd..f4c2f1d7f 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index d12b18ac5..57255f01f 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -27,7 +27,7 @@ com.google.appengine applications - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT diff --git a/e2etests/pom.xml b/e2etests/pom.xml index de83404b5..180133f89 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT AppEngine :: e2e tests pom diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index 88c999c4e..12c686cdc 100644 --- a/e2etests/stagingtests/pom.xml +++ b/e2etests/stagingtests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index 1979f4edc..34b873c2b 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT pom diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index 3908e615d..6eb4a4500 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-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 112aa7af2..d214b3220 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.20-SNAPSHOT + 2.0.21-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 c067cac30..de8bc1545 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.20-SNAPSHOT.jar"); + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.21-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 5169568e6..6284a8b47 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.20-SNAPSHOT.jar"; + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.21-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 9988e5486..fcbab2aca 100644 --- a/jetty12_assembly/pom.xml +++ b/jetty12_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT 4.0.0 jetty12-assembly diff --git a/lib/pom.xml b/lib/pom.xml index dff76bcd2..2bbbacd68 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 75be90da3..fe1582f83 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -23,7 +23,7 @@ com.google.appengine lib-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 715b545af..f942f8c36 100644 --- a/lib/xml_validator/pom.xml +++ b/lib/xml_validator/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index 5f30b5266..51688c449 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.20-SNAPSHOT + 2.0.21-SNAPSHOT jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml index 8d1b4d30d..fb47d3e88 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.20-SNAPSHOT + 2.0.21-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 c74e5761a..c5c790d69 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.20-SNAPSHOT + 2.0.21-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index 534790efc..1d57bea3f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT pom AppEngine :: Parent project diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 306024c54..5fa6b346e 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index 5111f9761..37fc0883d 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index 68cacd49e..29351c264 100644 --- a/quickstartgenerator_jetty12/pom.xml +++ b/quickstartgenerator_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index 60b6e08b7..932638d90 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index d54fc8552..73e503af2 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT pom diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index 87f565ab9..7006df928 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml index 3b1b7c866..a5bc2d894 100644 --- a/runtime/lite/pom.xml +++ b/runtime/lite/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index d75272edc..789fa4316 100644 --- a/runtime/local_jetty12/pom.xml +++ b/runtime/local_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index 31d803584..4305fda44 100644 --- a/runtime/local_jetty9/pom.xml +++ b/runtime/local_jetty9/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index f3082c622..7f8ba4470 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/pom.xml b/runtime/pom.xml index b1c055b76..f176f33b0 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT AppEngine :: runtime projects pom diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index 832d82d18..80046a720 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.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index b79294fce..19b0ca74b 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.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index c43114b96..483a76d12 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 346d6a032..5d7215ea0 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index 431eec15a..567464548 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 99d099299..611879d98 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 88dd7d7b2..89689b409 100644 --- a/runtime_shared_jetty12/pom.xml +++ b/runtime_shared_jetty12/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index 574dccc52..c609a6528 100644 --- a/runtime_shared_jetty9/pom.xml +++ b/runtime_shared_jetty9/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index c1593de2d..16d042a65 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT 4.0.0 appengine-java-sdk diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index 67e8fded7..cf0d38e35 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index a91eea4a8..ce8ae03d7 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index 9739c05ba..90b5d9776 100644 --- a/shared_sdk_jetty12/pom.xml +++ b/shared_sdk_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index db8a904f3..6215a6685 100644 --- a/shared_sdk_jetty9/pom.xml +++ b/shared_sdk_jetty9/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index 8eeed9136..49a955477 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.21-SNAPSHOT true From cc409ba4c83db9fd38e391af02ab9be467e35b72 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 3 Oct 2023 16:36:54 -0700 Subject: [PATCH 02/15] GAE_RUNTIME is an env var, not a system property. PiperOrigin-RevId: 570531680 Change-Id: Ib93d16c0418c0c17c5828f55be6157a6fafc65ec --- .../java/com/google/apphosting/runtime/JavaRuntimeMain.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/main/src/main/java/com/google/apphosting/runtime/JavaRuntimeMain.java b/runtime/main/src/main/java/com/google/apphosting/runtime/JavaRuntimeMain.java index adf554d5c..a2aa06fcf 100644 --- a/runtime/main/src/main/java/com/google/apphosting/runtime/JavaRuntimeMain.java +++ b/runtime/main/src/main/java/com/google/apphosting/runtime/JavaRuntimeMain.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Method; +import java.util.Objects; import java.util.Properties; import java.util.logging.Level; import java.util.logging.Logger; @@ -76,7 +77,7 @@ public void load(String[] args) { // Process user defined properties as soon as possible, in the simple main Classpath. processOptionalProperties(args); - if ("java21".equals(System.getProperty("GAE_RUNTIME"))) { + if (Objects.equals(System.getenv("GAE_RUNTIME"), "java21")) { System.setProperty(USE_JETTY12, "true"); } String appsRoot = getApplicationRoot(args); From 7d14b32df909250b5047c11dee1cb9b2c17c385f Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Mon, 9 Oct 2023 10:51:17 -0700 Subject: [PATCH 03/15] Test for null value before using field.getHeader(). PiperOrigin-RevId: 571982690 Change-Id: Idd85927ec333a12fa36d44bfc922c2c2f8aeb7b0 --- .../google/apphosting/runtime/jetty/CoreSizeLimitHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 513818f5f..907720860 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 @@ -79,7 +79,7 @@ public boolean handle(Request request, Response response, Callback callback) thr @Override public HttpField onAddField(HttpField field) { - if (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString())) + if ((field.getHeader()!=null) && (field.getHeader().is(HttpHeader.CONTENT_LENGTH.asString()))) { long contentLength = field.getLongValue(); if (_responseLimit > 0 && contentLength > _responseLimit) From a296343364e15f799ba62d506cda06217620641a Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Mon, 9 Oct 2023 10:57:23 -0700 Subject: [PATCH 04/15] No public description PiperOrigin-RevId: 571984657 Change-Id: Ie5edda6c6c358f35dd0c2f36f60985df4a223984 --- .github/workflows/maven.yml | 6 +++--- kokoro/gcp_ubuntu/publish_javadoc.sh | 2 +- kokoro/gcp_ubuntu/release.sh | 5 +---- .../google/apphosting/runtime/jetty9/SpringBootTest.java | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index af812de52..388266584 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,9 +21,9 @@ on: pull_request: branches: - main - -permissions: - contents: read + push: + branches-ignore: + - 'dependabot/**' jobs: build: diff --git a/kokoro/gcp_ubuntu/publish_javadoc.sh b/kokoro/gcp_ubuntu/publish_javadoc.sh index 479e3f061..ebf01fceb 100644 --- a/kokoro/gcp_ubuntu/publish_javadoc.sh +++ b/kokoro/gcp_ubuntu/publish_javadoc.sh @@ -19,7 +19,7 @@ set -e shopt -s globstar setup_docuploader() { - curl -fsSL --retry 10 -o /tmp/jar1.jar https://github.com/googleapis/java-docfx-doclet/releases/download/1.8.0/docfx-doclet-1.8.0-jar-with-dependencies.jar + curl -fsSL --retry 10 -o /tmp/jar1.jar https://github.com/googleapis/java-docfx-doclet/releases/download/1.9.0/docfx-doclet-1.9.0-jar-with-dependencies.jar # Update Python 3 and Maven sudo apt-get update sudo apt-get install -y python3 python3-pip maven diff --git a/kokoro/gcp_ubuntu/release.sh b/kokoro/gcp_ubuntu/release.sh index 10c8b23b6..a8bdbdf57 100644 --- a/kokoro/gcp_ubuntu/release.sh +++ b/kokoro/gcp_ubuntu/release.sh @@ -106,12 +106,9 @@ export JAVA_HOME="$(update-java-alternatives -l | grep "1.17" | head -n 1 | tr - # Make sure `JAVA_HOME` is set. echo "JAVA_HOME = $JAVA_HOME" -# Install Maven. -sudo apt-get -qq update && sudo apt-get -qq install -y maven - # compile all packages echo "Calling release:prepare and release:perform." -mvn release:prepare release:perform -B -q --settings=../settings.xml -DskipTests -Darguments=-DskipTests -Dgpg.homedir=${GNUPGHOME} -Dgpg.passphrase=${GPG_PASSPHRASE} +./mvnw release:prepare release:perform -B -q --settings=../settings.xml -DskipTests -Darguments=-DskipTests -Dgpg.homedir=${GNUPGHOME} -Dgpg.passphrase=${GPG_PASSPHRASE} git remote set-url origin https://gae-java-bot:${GAE_JAVA_BOT_GITHUB_TOKEN}@github.com/GoogleCloudPlatform/appengine-java-standard echo "Doing git tag and push." diff --git a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java index 500f0e475..ced7aa959 100644 --- a/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java +++ b/runtime/test/src/test/java/com/google/apphosting/runtime/jetty9/SpringBootTest.java @@ -39,7 +39,7 @@ public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); Process process = new ProcessBuilder( - "mvn", + "../../mvnw", "install", "appengine:stage", "-f", From 4209be6b1b1e57395d5b14ad074dcce93db5e0d3 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Mon, 9 Oct 2023 14:06:02 -0700 Subject: [PATCH 05/15] Include JDK21 and above in the plugin configuration range. trying to address https://github.com/raphw/byte-buddy/issues/1396 as well. PiperOrigin-RevId: 572035592 Change-Id: I9f6fe1ad19c78384ac5be7a4a147420aaf7363a5 --- appengine_testing_tests/pom.xml | 7 +++++-- pom.xml | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 749f6e047..caec95a8e 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -73,7 +73,7 @@ surefire-newerjava - [11,20) + [11,) @@ -85,7 +85,10 @@ -Duser.timezone=CST --add-opens java.base/java.lang=ALL-UNNAMED - + + true + + diff --git a/pom.xml b/pom.xml index 1d57bea3f..f420e3719 100644 --- a/pom.xml +++ b/pom.xml @@ -235,8 +235,9 @@ ../deployment/target/runtime-deployment-${project.version} true + true - + --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio.charset=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED From 57662fd4204028f9ca89ce3533f6c61d02f5b775 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Mon, 9 Oct 2023 17:39:19 -0700 Subject: [PATCH 06/15] Adding SBOM generation phase in master pom.xml project. PiperOrigin-RevId: 572086820 Change-Id: I8d7ec0a8b0f72d4542aa881323b36976a2940c61 --- kokoro/gcp_ubuntu/build.sh | 7 ++++++- pom.xml | 13 +++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/kokoro/gcp_ubuntu/build.sh b/kokoro/gcp_ubuntu/build.sh index 0c2b7438a..7bd371de8 100644 --- a/kokoro/gcp_ubuntu/build.sh +++ b/kokoro/gcp_ubuntu/build.sh @@ -30,7 +30,7 @@ export JAVA_HOME="$(update-java-alternatives -l | grep "1.17" | head -n 1 | tr - echo "JAVA_HOME = $JAVA_HOME" ./mvnw -v -./mvnw -e clean install +./mvnw -e clean install cyclonedx:makeAggregateBom # The artifacts under `${KOKORO_ARTIFACTS_DIR}/maven-artifacts` will be uploaded as a zip file named maven_jars.binary TMP_STAGING_LOCATION=${KOKORO_ARTIFACTS_DIR}/tmp @@ -68,6 +68,11 @@ cp -rf sdk_assembly/target/appengine-java-sdk ${TMP_STAGING_LOCATION}/ chmod a+x ${TMP_STAGING_LOCATION}/appengine-java-sdk/bin/* # LINT.ThenChange(//depot/google3/third_party/java_src/appengine_standard/check_build.sh) cp sdk_assembly/target/google_appengine_java_delta*.zip ${TMP_STAGING_LOCATION}/google_appengine_java_delta_from_maven.zip + +# Add SBOM files: +cp target/bom.json ${TMP_STAGING_LOCATION}/ +cp target/bom.xml ${TMP_STAGING_LOCATION}/ + cd ${TMP_STAGING_LOCATION} zip -r ${PUBLISHED_LOCATION}/maven_jars.binary . # cleanup staging area diff --git a/pom.xml b/pom.xml index f420e3719..79f5b0244 100644 --- a/pom.xml +++ b/pom.xml @@ -888,6 +888,19 @@ ${project.basedir}/licenses/resources/third-party-file-template.ftl + + org.cyclonedx + cyclonedx-maven-plugin + 2.7.9 + + + package + + makeAggregateBom + + + + From 86a22c4fe3af888782ba447fb2582c64ec7c55c1 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 10 Oct 2023 08:29:34 -0700 Subject: [PATCH 07/15] Fix a JDK21 restriction compilation issue. PiperOrigin-RevId: 572258070 Change-Id: If4855683f8b5164e9f632b6800e919de187ae617 --- .../google/apphosting/utils/remoteapi/RemoteApiServlet.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/google/apphosting/utils/remoteapi/RemoteApiServlet.java b/api/src/main/java/com/google/apphosting/utils/remoteapi/RemoteApiServlet.java index 826898d37..745837d2b 100644 --- a/api/src/main/java/com/google/apphosting/utils/remoteapi/RemoteApiServlet.java +++ b/api/src/main/java/com/google/apphosting/utils/remoteapi/RemoteApiServlet.java @@ -36,6 +36,7 @@ import com.google.apphosting.utils.remoteapi.RemoteApiPb.ApplicationError; import com.google.apphosting.utils.remoteapi.RemoteApiPb.Request; import com.google.apphosting.utils.remoteapi.RemoteApiPb.Response; +import com.google.apphosting.utils.remoteapi.RemoteApiPb.TransactionQueryResult; import com.google.apphosting.utils.remoteapi.RemoteApiPb.TransactionRequest; import com.google.apphosting.utils.remoteapi.RemoteApiPb.TransactionRequest.Precondition; import com.google.io.protocol.ProtocolMessage; @@ -267,7 +268,7 @@ private byte[] executeRunQuery(Request request) { } private byte[] executeTxQuery(Request request) { - RemoteApiPb.TransactionQueryResult result = new RemoteApiPb.TransactionQueryResult(); + TransactionQueryResult result = new TransactionQueryResult(); Query query = new Query(); parseFromBytes(query, request.getRequestAsBytes()); From 712733c9508330085439eb263afa7e626f381bec Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 10 Oct 2023 08:43:38 -0700 Subject: [PATCH 08/15] Changing all projects to depend on parent so we can generate a full SBOM file. --- applications/proberapp/pom.xml | 6 +-- applications/springboot/pom.xml | 17 +++---- .../tools/admin/ApplicationTest.java | 2 +- .../development/DevAppServerTestBase.java | 2 +- e2etests/testlocalapps/allinone/pom.xml | 11 ++-- e2etests/testlocalapps/badcron/pom.xml | 14 ++--- .../testlocalapps/bundle_standard/pom.xml | 14 ++--- .../pom.xml | 13 ++--- .../bundle_standard_with_no_jsp/pom.xml | 14 ++--- .../pom.xml | 14 ++--- .../cron-bad-job-age-limit/pom.xml | 13 ++--- .../cron-good-retry-parameters/pom.xml | 13 ++--- .../cron-negative-max-backoff/pom.xml | 13 ++--- .../cron-negative-retry-limit/pom.xml | 13 ++--- .../cron-two-max-doublings/pom.xml | 13 ++--- e2etests/testlocalapps/http-headers/pom.xml | 14 ++--- e2etests/testlocalapps/java8-jar/pom.xml | 14 ++--- .../testlocalapps/java8-no-webxml/pom.xml | 14 ++--- e2etests/testlocalapps/pom.xml | 13 ++++- .../testlocalapps/sample-badaeweb/pom.xml | 14 ++--- .../sample-baddispatch-yaml/pom.xml | 14 ++--- .../testlocalapps/sample-baddispatch/pom.xml | 14 ++--- .../sample-badentrypoint/pom.xml | 14 ++--- .../testlocalapps/sample-badindexes/pom.xml | 14 ++--- .../sample-badruntimechannel/pom.xml | 14 ++--- e2etests/testlocalapps/sample-badweb/pom.xml | 14 ++--- .../sample-default-auto-ids/pom.xml | 14 ++--- .../sample-error-in-tag-file/pom.xml | 14 ++--- e2etests/testlocalapps/sample-java11/pom.xml | 14 ++--- e2etests/testlocalapps/sample-java17/pom.xml | 14 ++--- .../sample-jsptaglibrary/pom.xml | 30 ++--------- e2etests/testlocalapps/sample-jspx/pom.xml | 14 ++--- .../sample-legacy-auto-ids/pom.xml | 14 ++--- .../testlocalapps/sample-missingappid/pom.xml | 15 ++---- e2etests/testlocalapps/sample-nojsps/pom.xml | 14 ++--- .../sample-unspecified-auto-ids/pom.xml | 14 ++--- .../testlocalapps/sample-with-classes/pom.xml | 14 ++--- .../sampleapp-automatic-module/pom.xml | 14 ++--- .../testlocalapps/sampleapp-backends/pom.xml | 15 ++---- .../sampleapp-basic-module/pom.xml | 14 ++--- .../sampleapp-manual-module/pom.xml | 14 ++--- .../testlocalapps/sampleapp-runtime/pom.xml | 14 ++--- e2etests/testlocalapps/sampleapp/pom.xml | 15 ++---- .../testlocalapps/stage-sampleapp/pom.xml | 14 ++--- .../stage-with-staging-options/pom.xml | 14 ++--- e2etests/testlocalapps/xmlorder/pom.xml | 15 ++---- pom.xml | 32 +++++++----- runtime/annotationscanningwebapp/pom.xml | 7 ++- runtime/failinitfilterwebapp/pom.xml | 13 +++-- runtime/nogaeapiswebapp/pom.xml | 9 ++-- .../jetty9/AnnotationScanningTest.java | 2 +- .../runtime/jetty9/FailureFilterTest.java | 2 +- .../runtime/jetty9/NoGaeApisTest.java | 2 +- .../runtime/VirtualThreadSetup.java | 51 +++++++++++++++++++ 54 files changed, 323 insertions(+), 420 deletions(-) create mode 100644 sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index 57255f01f..4bce3d7d9 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -243,7 +243,7 @@ com.google.cloud.tools appengine-maven-plugin - 2.4.1 + 2.4.4 ludo-in-in liveruntimejava8maven @@ -253,7 +253,7 @@ maven-compiler-plugin - 3.10.1 + 3.11.0 8 @@ -261,7 +261,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.4.0 enforce-maven diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index d35ad917d..fa6d48b4f 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos springboot - 0.0.1-SNAPSHOT + + com.google.appengine + applications + 2.0.21-SNAPSHOT + war AppEngine :: springboot @@ -31,7 +35,7 @@ UTF-8 true UTF-8 - 2.7.2 + 2.7.15 1.8 1.8 @@ -40,7 +44,6 @@ org.springframework.boot spring-boot-starter-web - ${spring.boot.version} @@ -54,7 +57,6 @@ org.slf4j jul-to-slf4j - 1.7.30 provided @@ -62,20 +64,17 @@ javax.servlet javax.servlet-api - 3.1.0 provided org.springframework.boot spring-boot-starter-test - ${spring.boot.version} test junit junit - 4.13.2 test @@ -103,7 +102,7 @@ com.google.cloud.tools appengine-maven-plugin - 2.4.3 + 2.4.4 ludo-in-in @@ -114,7 +113,7 @@ maven-war-plugin - 3.3.1 + 3.4.0 false 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 c6306a50c..5fdd5e767 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 @@ -177,7 +177,7 @@ private static String getWarPath(String directoryName) { + directoryName + "/target/" + directoryName - + "-0.0.1-SNAPSHOT") + + "-2.0.21-SNAPSHOT") .getAbsolutePath(); // assertThat(appRoot.isDirectory()).isTrue(); diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java b/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java index c24e3a612..8d4c90985 100644 --- a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java +++ b/e2etests/stagingtests/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 + "-0.0.1-SNAPSHOT"); + "../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.21-SNAPSHOT"); return appRoot; } diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml index 77d4917bd..42f5c7049 100644 --- a/e2etests/testlocalapps/allinone/pom.xml +++ b/e2etests/testlocalapps/allinone/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos allinone - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: allinone test application @@ -39,18 +43,15 @@ javax.servlet javax.servlet-api - 3.1.0 provided com.google.appengine appengine-api-1.0-sdk - 2.0.19 com.google.guava guava - 32.1.2-jre jar @@ -71,7 +72,7 @@ maven-war-plugin - 3.3.1 + 3.4.0 false diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index 39c877ade..8a2a735ec 100644 --- a/e2etests/testlocalapps/badcron/pom.xml +++ b/e2etests/testlocalapps/badcron/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos badcron - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: badcron @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index 1563c0c87..91a1af538 100644 --- a/e2etests/testlocalapps/bundle_standard/pom.xml +++ b/e2etests/testlocalapps/bundle_standard/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos bundle_standard - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: bundle_standard @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml index a48e36e92..5f44e4c5c 100644 --- a/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer/pom.xml @@ -22,7 +22,11 @@ com.google.appengine.demos bundle_standard_with_container_initializer - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: bundle_standard_with_container_initializer @@ -69,13 +73,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml index 38299e0cd..622f727c1 100644 --- a/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_no_jsp/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos bundle_standard_with_no_jsp - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: bundle_standard_with_no_jsp @@ -30,7 +34,6 @@ UTF-8 true UTF-8 - 2.7.2 1.8 1.8 @@ -59,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml index 412feb0e4..5151455aa 100644 --- a/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_weblistener_memcache/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos bundle_standard_with_weblistener_memcache - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: bundle_standard_with_weblistener_memcache @@ -30,7 +34,6 @@ UTF-8 true UTF-8 - 2.7.2 1.8 1.8 @@ -64,13 +67,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml index 467b45ee8..62560cd22 100644 --- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml +++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos cron-bad-job-age-limit - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: cron-bad-job-age-limit @@ -58,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index 8e9d7c79d..2213ccd47 100644 --- a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml +++ b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos cron-good-retry-parameters - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: cron-good-retry-parameters @@ -58,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml index 1056d48a9..423dd536b 100644 --- a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml +++ b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos cron-negative-max-backoff - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: cron-negative-max-backoff @@ -58,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml index 66b828c15..4ce62cc4e 100644 --- a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml +++ b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos cron-negative-retry-limit - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: cron-negative-retry-limit @@ -58,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml index 6157f4d47..462784ab7 100644 --- a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml +++ b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos cron-two-max-doublings - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: cron-two-max-doublings @@ -58,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index d7a54f21e..c362eadbe 100644 --- a/e2etests/testlocalapps/http-headers/pom.xml +++ b/e2etests/testlocalapps/http-headers/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos http-headers - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: http-headers @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index b71bbfa75..8569a333c 100644 --- a/e2etests/testlocalapps/java8-jar/pom.xml +++ b/e2etests/testlocalapps/java8-jar/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos java8-jar - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: java8-jar @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index 0948a3d34..d2f0dc210 100644 --- a/e2etests/testlocalapps/java8-no-webxml/pom.xml +++ b/e2etests/testlocalapps/java8-no-webxml/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos java8-no-webxml - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: java8-no-webxml @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index 34b873c2b..a23b59ce9 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -17,7 +17,7 @@ 4.0.0 - testlocalapss + testlocalapps AppEngine :: Test local applications com.google.appengine @@ -71,4 +71,15 @@ bundle_standard_with_weblistener_memcache allinone + + + + maven-war-plugin + 3.4.0 + + false + + + + diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index b63affb50..3abeb14d5 100644 --- a/e2etests/testlocalapps/sample-badaeweb/pom.xml +++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-badaeweb - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-badaeweb @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index 5f8e11bfb..0cd22f2ae 100644 --- a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-baddispatch-yaml - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-baddispatch-yaml @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index 0e8eb8850..eb6d1dab0 100644 --- a/e2etests/testlocalapps/sample-baddispatch/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-baddispatch - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-baddispatch @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml index 46af394cd..6c5d5d1a6 100644 --- a/e2etests/testlocalapps/sample-badentrypoint/pom.xml +++ b/e2etests/testlocalapps/sample-badentrypoint/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-badentrypoint - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-badentrypoint @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 765687d48..1b9db0bbb 100644 --- a/e2etests/testlocalapps/sample-badindexes/pom.xml +++ b/e2etests/testlocalapps/sample-badindexes/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-badindexes - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-badindexes @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml index 317690dba..ea8131492 100644 --- a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml +++ b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-badruntimechannel - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-badruntimechannel @@ -40,7 +44,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -59,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index be1486dff..5dc8b97b9 100644 --- a/e2etests/testlocalapps/sample-badweb/pom.xml +++ b/e2etests/testlocalapps/sample-badweb/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-badweb - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-badweb @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml index 0899475f7..c31df6817 100644 --- a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-default-auto-ids - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-default-auto-ids @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml index 34ca1c9ef..65bfef19d 100644 --- a/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml +++ b/e2etests/testlocalapps/sample-error-in-tag-file/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-error-in-tag-file - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-error-in-tag-file @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index 23c6a0c15..18ffbab8e 100644 --- a/e2etests/testlocalapps/sample-java11/pom.xml +++ b/e2etests/testlocalapps/sample-java11/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-java11 - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-java11 @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index adddb06fe..cbd228a1d 100644 --- a/e2etests/testlocalapps/sample-java17/pom.xml +++ b/e2etests/testlocalapps/sample-java17/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-java17 - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-java17 @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 07aa9b40e..82efab373 100644 --- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml +++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml @@ -15,29 +15,17 @@ limitations under the License. --> - - 4.0.0 com.google.appengine.demos sample-jsptaglibrary - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-jsptaglibrary @@ -55,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -74,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index 9ad92ff87..8aa5c3029 100644 --- a/e2etests/testlocalapps/sample-jspx/pom.xml +++ b/e2etests/testlocalapps/sample-jspx/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-jspx - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-jspx @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml index afdd85b24..15081f8e6 100644 --- a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-legacy-auto-ids - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-legacy-auto-ids @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index 2e4810e7a..96b4234de 100644 --- a/e2etests/testlocalapps/sample-missingappid/pom.xml +++ b/e2etests/testlocalapps/sample-missingappid/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-missingappid - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-missingappid @@ -30,7 +34,6 @@ UTF-8 true UTF-8 - 2.7.2 1.8 1.8 @@ -40,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -59,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index 3a7aeb335..c0fd181c0 100644 --- a/e2etests/testlocalapps/sample-nojsps/pom.xml +++ b/e2etests/testlocalapps/sample-nojsps/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-nojsps - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-nojsps @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml index 24f1d0d52..88f359b20 100644 --- a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml +++ b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-unspecified-auto-ids - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-unspecified-auto-ids @@ -40,7 +44,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -59,13 +62,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index a708af40d..867b99c2e 100644 --- a/e2etests/testlocalapps/sample-with-classes/pom.xml +++ b/e2etests/testlocalapps/sample-with-classes/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sample-with-classes - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sample-with-classes @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index 1f0fac21e..c544c408e 100644 --- a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sampleapp-automatic-module - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sampleapp-automatic-module @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index 82be059ea..824b99afb 100644 --- a/e2etests/testlocalapps/sampleapp-backends/pom.xml +++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml @@ -21,9 +21,12 @@ com.google.appengine.demos sampleapp-backends - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war - AppEngine :: sampleapp-backends @@ -39,7 +42,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +60,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml index 052de12df..0643f6cea 100644 --- a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sampleapp-basic-module - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sampleapp-basic-module @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index 4058efdcf..8525e0aa2 100644 --- a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml +++ b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sampleapp-manual-module - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sampleapp-manual-module @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index 11cf1eb55..d5a17f92e 100644 --- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml +++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos sampleapp-runtime - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: sampleapp-runtime @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index 8d0165930..5e3793665 100644 --- a/e2etests/testlocalapps/sampleapp/pom.xml +++ b/e2etests/testlocalapps/sampleapp/pom.xml @@ -21,9 +21,12 @@ com.google.appengine.demos sampleapp - 0.0.1-SNAPSHOT war - + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + AppEngine :: sampleapp @@ -39,7 +42,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +60,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index e5a04a865..a121f8115 100644 --- a/e2etests/testlocalapps/stage-sampleapp/pom.xml +++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos stage-sampleapp - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: stage-sampleapp @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml index fc6531661..51f7e6765 100644 --- a/e2etests/testlocalapps/stage-with-staging-options/pom.xml +++ b/e2etests/testlocalapps/stage-with-staging-options/pom.xml @@ -21,7 +21,11 @@ com.google.appengine.demos stage-with-staging-options - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war AppEngine :: stage-with-staging-options @@ -39,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +61,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index 7dabab748..445e2c6da 100644 --- a/e2etests/testlocalapps/xmlorder/pom.xml +++ b/e2etests/testlocalapps/xmlorder/pom.xml @@ -21,9 +21,12 @@ com.google.appengine.demos xmlorder - 0.0.1-SNAPSHOT + + com.google.appengine + testlocalapps + 2.0.21-SNAPSHOT + war - AppEngine :: xmlorder @@ -39,7 +42,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided @@ -58,13 +60,6 @@ - - maven-war-plugin - 3.3.1 - - false - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 79f5b0244..3083efae3 100644 --- a/pom.xml +++ b/pom.xml @@ -888,19 +888,25 @@ ${project.basedir}/licenses/resources/third-party-file-template.ftl - - org.cyclonedx - cyclonedx-maven-plugin - 2.7.9 - - - package - - makeAggregateBom - - - - + + org.spdx + spdx-maven-plugin + + 0.7.0 + + + build-spdx + + createSPDX + + + + + + *.spdx + + + diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index ea6434bb2..41acfdd5a 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -20,8 +20,11 @@ 4.0.0 war - 1.0 - + + com.google.appengine + runtime-parent + 2.0.21-SNAPSHOT + com.google.appengine.demos annotationscanningwebapp AppEngine :: annotationscanningwebapp diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index 497f4ca0a..5a7bd2ebf 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -20,8 +20,11 @@ 4.0.0 war - 1.0 - + + com.google.appengine + runtime-parent + 2.0.21-SNAPSHOT + com.google.appengine.demos failinitfilterwebapp AppEngine :: failinitfilterwebapp @@ -46,7 +49,7 @@ org.apache.maven.plugins maven-war-plugin - 3.3.2 + 3.4.0 true @@ -61,7 +64,7 @@ maven-compiler-plugin - 3.10.1 + 3.11.0 8 @@ -69,7 +72,7 @@ com.google.cloud.tools appengine-maven-plugin - 2.4.1 + 2.4.4 ludo-in-in failinitfilter diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 46cd76e44..0707a83f3 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -20,8 +20,11 @@ 4.0.0 war - 1.0 - + + com.google.appengine + runtime-parent + 2.0.21-SNAPSHOT + com.google.appengine.demos nogaeapiswebapp AppEngine :: nogaeapiswebapp @@ -61,7 +64,7 @@ maven-compiler-plugin - 3.10.1 + 3.11.0 8 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 98c914ea4..aa554c684 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 @@ -45,7 +45,7 @@ public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); appRoot = new File( - currentDirectory, "../annotationscanningwebapp/target/annotationscanningwebapp-1.0"); + currentDirectory, "../annotationscanningwebapp/target/annotationscanningwebapp-2.0.21-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 4292ef75d..2ce669f78 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 @@ -32,7 +32,7 @@ public final class FailureFilterTest extends JavaRuntimeViaHttpBase { @BeforeClass public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); - appRoot = new File(currentDirectory, "../failinitfilterwebapp/target/failinitfilterwebapp-1.0"); + appRoot = new File(currentDirectory, "../failinitfilterwebapp/target/failinitfilterwebapp-2.0.21-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 49986aaa6..b65c8d1f5 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 @@ -42,7 +42,7 @@ public NoGaeApisTest(Boolean useJetty12) { @BeforeClass public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); - appRoot = new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-1.0"); + appRoot = new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.21-SNAPSHOT"); assertThat(appRoot.isDirectory()).isTrue(); } diff --git a/sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java b/sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java new file mode 100644 index 000000000..806ee59d5 --- /dev/null +++ b/sessiondata/src/main/java/com/google/apphosting/runtime/VirtualThreadSetup.java @@ -0,0 +1,51 @@ +/* + * Copyright 2021 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.apphosting.runtime; + +import java.lang.reflect.Method; +import java.util.concurrent.Executor; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Try to setup a Jetty QueuedThreadPool to use JDK21 virtual threads via + * introspection. No op if this cannot be done (i.e running with old JDKs. + */ +public class VirtualThreadSetup { + + private static final Logger logger = Logger.getLogger(VirtualThreadSetup.class.getName()); + + /* + * Try to setup a Jetty QueuedThreadPool to use JDK21 virtual threads via + * introspection. No op if this cannot be done (i.e running with old JDKs. + Object should be a Jetty QueuedThreadPool. + */ + public static Object tryToSetVirtualThread(Object threadPool) { + try { + Method newVirtualThreadPerTaskExecutor = Executor.class.getMethod("newVirtualThreadPerTaskExecutor"); + Method setVirtualThreadsExecutor = threadPool.getClass().getMethod("setVirtualThreadsExecutor", + Class.forName("org.eclipse.jetty.util.thread.QueuedThreadPool")); + setVirtualThreadsExecutor.invoke(threadPool, newVirtualThreadPerTaskExecutor.invoke(null)); + } catch (Exception e) { + logger.log(Level.INFO, "Could not configure JDK21 virtual threads in Jetty runtime.", e); + } + return threadPool; + } + + private VirtualThreadSetup() { + + } +} From fccfc1f3960c084ed5b5b25566da3bc1b8369837 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 10 Oct 2023 08:52:53 -0700 Subject: [PATCH 09/15] Removing redundant entries. --- e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml index 62560cd22..129f4d599 100644 --- a/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml +++ b/e2etests/testlocalapps/cron-bad-job-age-limit/pom.xml @@ -43,7 +43,6 @@ javax.servlet javax.servlet-api - 3.1.0 provided From 3f068ae73c0758b6b6d960e9864d19c2add7b4c5 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 10 Oct 2023 10:43:31 -0700 Subject: [PATCH 10/15] Upgrade to jetty-9.4.53.v20231009 #10679 - backport HTTP/2 rate control from Jetty 10.0.x #10573 - backport hpack improvements from Jetty 10.0.x #10546 - backport jetty-http Huffman encoders/decoders from Jetty 10.0.x Addresses CVE-2023-44487 and CVE-2023-36478 which have to do with HTTP/2. see https://github.com/eclipse/jetty.project/releases/tag/jetty-9.4.53.v20231009 PiperOrigin-RevId: 572300688 Change-Id: Ic60a19d425798ccbe171a57191895dd803672541 --- kokoro/gcp_ubuntu/build.sh | 5 ++--- pom.xml | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/kokoro/gcp_ubuntu/build.sh b/kokoro/gcp_ubuntu/build.sh index 7bd371de8..1aeb73d98 100644 --- a/kokoro/gcp_ubuntu/build.sh +++ b/kokoro/gcp_ubuntu/build.sh @@ -30,7 +30,7 @@ export JAVA_HOME="$(update-java-alternatives -l | grep "1.17" | head -n 1 | tr - echo "JAVA_HOME = $JAVA_HOME" ./mvnw -v -./mvnw -e clean install cyclonedx:makeAggregateBom +./mvnw -e clean install spdx:createSPDX # The artifacts under `${KOKORO_ARTIFACTS_DIR}/maven-artifacts` will be uploaded as a zip file named maven_jars.binary TMP_STAGING_LOCATION=${KOKORO_ARTIFACTS_DIR}/tmp @@ -70,8 +70,7 @@ chmod a+x ${TMP_STAGING_LOCATION}/appengine-java-sdk/bin/* cp sdk_assembly/target/google_appengine_java_delta*.zip ${TMP_STAGING_LOCATION}/google_appengine_java_delta_from_maven.zip # Add SBOM files: -cp target/bom.json ${TMP_STAGING_LOCATION}/ -cp target/bom.xml ${TMP_STAGING_LOCATION}/ +cp target/site/com.google.appengine_parent-*.json ${TMP_STAGING_LOCATION}/com.google.appengine_parent.spdx.json cd ${TMP_STAGING_LOCATION} zip -r ${PUBLISHED_LOCATION}/maven_jars.binary . diff --git a/pom.xml b/pom.xml index 3083efae3..0f150b713 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 1.8 1.8 UTF-8 - 9.4.52.v20230823 + 9.4.53.v20231009 12.0.1 https://oss.sonatype.org/content/repositories/google-snapshots/ sonatype-nexus-snapshots From ff2327ead0fef51ab86c9b9441dbfd812e217d27 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Thu, 12 Oct 2023 09:45:18 -0700 Subject: [PATCH 11/15] No public description PiperOrigin-RevId: 572933192 Change-Id: Ic6bef4d0faeaa7a830405854549cdff9bb5f42c5 --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 0f150b713..e4aa6da95 100644 --- a/pom.xml +++ b/pom.xml @@ -657,42 +657,42 @@ io.netty netty-buffer - 4.1.97.Final + 4.1.100.Final io.netty netty-codec - 4.1.97.Final + 4.1.100.Final io.netty netty-codec-http - 4.1.97.Final + 4.1.100.Final io.netty netty-codec-http2 - 4.1.97.Final + 4.1.100.Final io.netty netty-common - 4.1.94.Final + 4.1.100.Final io.netty netty-handler - 4.1.97.Final + 4.1.100.Final io.netty netty-transport - 4.1.97.Final + 4.1.100.Final io.netty netty-transport-native-unix-common - 4.1.97.Final + 4.1.100.Final org.apache.tomcat From 557b7faf8141ae83b4b3328441afb9d723d479ba Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Thu, 12 Oct 2023 10:20:01 -0700 Subject: [PATCH 12/15] Fix a regression with SessionStore missing class in dev appserver area. PiperOrigin-RevId: 572943212 Change-Id: Ie3d0b41a93e83677f3c9451a7e32947218f5b2bb --- e2etests/devappservertests/pom.xml | 62 +++++++++++++++++++ .../development/DevAppServerMainTest.java | 0 .../development/DevAppServerTestBase.java | 0 e2etests/pom.xml | 1 + lib/tools_api/pom.xml | 6 ++ 5 files changed, 69 insertions(+) create mode 100644 e2etests/devappservertests/pom.xml rename e2etests/{stagingtests => devappservertests}/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java (100%) rename e2etests/{stagingtests => devappservertests}/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java (100%) diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml new file mode 100644 index 000000000..074404212 --- /dev/null +++ b/e2etests/devappservertests/pom.xml @@ -0,0 +1,62 @@ + + + + + 4.0.0 + + devappservertests + + com.google.appengine + e2etests + 2.0.21-SNAPSHOT + + + jar + AppEngine :: e2e devappserver tests + + + true + + + + com.google.truth + truth + test + + + junit + junit + test + + + org.mockito + mockito-all + 2.0.2-beta + test + + + com.google.appengine + appengine-utils + test + + + org.apache.httpcomponents + httpclient + test + + + diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java b/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java similarity index 100% rename from e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java rename to e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerMainTest.java diff --git a/e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java b/e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java similarity index 100% rename from e2etests/stagingtests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java rename to e2etests/devappservertests/src/test/java/com/google/appengine/tools/development/DevAppServerTestBase.java diff --git a/e2etests/pom.xml b/e2etests/pom.xml index 180133f89..fe3ee2d65 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -31,5 +31,6 @@ testlocalapps stagingtests + devappservertests diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index fe1582f83..3156426a6 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -81,6 +81,11 @@ commons-codec true + + com.google.appengine + shared-sdk + + com.google.truth @@ -281,6 +286,7 @@ com.contrastsecurity:yamlbeans com.google.appengine:appengine-apis com.google.appengine:appengine-apis-dev + com.google.appengine:shared-sdk com.google.appengine:protos com.google.appengine:proto1:* com.google.appengine:appengine-utils From d766774eed4aea77ffb6aaa3a46ae183402445dc Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Fri, 13 Oct 2023 09:33:19 -0700 Subject: [PATCH 13/15] Upgrade to Jetty 12.0.2 PiperOrigin-RevId: 573242214 Change-Id: I25bed6a75b98ae6606ef61a56f80b122effe4564 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4aa6da95..f60ccc880 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 1.8 UTF-8 9.4.53.v20231009 - 12.0.1 + 12.0.2 https://oss.sonatype.org/content/repositories/google-snapshots/ sonatype-nexus-snapshots https://oss.sonatype.org/service/local/staging/deploy/maven2/ From 88603d0eab0c5049554508c8899011dc8e0f166d Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Sun, 15 Oct 2023 11:46:00 -0700 Subject: [PATCH 14/15] Complete shared sdk classes for SessionStore. Moved build to JDK21 GA and newer json library (due to a cve). PiperOrigin-RevId: 573642257 Change-Id: Ide77d0dd663d0dd366aa1cf29977dba552b84852 --- .github/workflows/maven.yml | 2 +- pom.xml | 2 +- runtime/local_jetty12/pom.xml | 1 + runtime/local_jetty9/pom.xml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 388266584..6c5421841 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -31,7 +31,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - java: [17, 21-ea] + java: [17, 21] jdk: [temurin] fail-fast: false diff --git a/pom.xml b/pom.xml index f60ccc880..80521670d 100644 --- a/pom.xml +++ b/pom.xml @@ -712,7 +712,7 @@ org.json json - 20230618 + 20231013 commons-codec diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index 789fa4316..c0f92feb1 100644 --- a/runtime/local_jetty12/pom.xml +++ b/runtime/local_jetty12/pom.xml @@ -298,6 +298,7 @@ com.google.appengine:appengine-tools-sdk com.google.appengine:appengine-utils com.google.appengine:sessiondata + com.google.appengine:shared-sdk com.google.appengine:shared-sdk-jetty12 com.google.flogger:google-extensions com.google.flogger:flogger-system-backend diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index 4305fda44..8d6c80ec0 100644 --- a/runtime/local_jetty9/pom.xml +++ b/runtime/local_jetty9/pom.xml @@ -247,6 +247,7 @@ com.google.appengine:appengine-tools-sdk com.google.appengine:appengine-utils com.google.appengine:sessiondata + com.google.appengine:shared-sdk com.google.appengine:shared-sdk-jetty9 com.google.flogger:google-extensions com.google.flogger:flogger-system-backend From 8c30696b5479aa6ae5fe07b563ba278c8762d7c4 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 17 Oct 2023 01:22:43 -0700 Subject: [PATCH 15/15] Upgrade GAE Java version from 2.0.20 to 2.0.21 and prepare next version 2.0.22-SNAPSHOT. PiperOrigin-RevId: 574061093 Change-Id: I036fd8fb93c910421a84541c510b3acd3acc9b58 --- 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_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 +- e2etests/testlocalapps/allinone/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 | 4 ++-- protobuf/pom.xml | 2 +- quickstartgenerator/pom.xml | 2 +- quickstartgenerator_jetty12/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_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 | 3 ++- .../apphosting/runtime/jetty9/FailureFilterTest.java | 5 ++++- .../apphosting/runtime/jetty9/NoGaeApisTest.java | 3 ++- runtime/testapps/pom.xml | 2 +- runtime/util/pom.xml | 2 +- runtime_shared/pom.xml | 2 +- runtime_shared_jetty12/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 +- 104 files changed, 116 insertions(+), 111 deletions(-) diff --git a/README.md b/README.md index de13ee454..7885ddc5e 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.20 + 2.0.21 javax.servlet @@ -131,7 +131,7 @@ Source code for remote APIs for App Engine. com.google.appengine appengine-remote-api - 2.0.20 + 2.0.21 ``` @@ -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.20 + 2.0.21 ``` @@ -169,19 +169,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency com.google.appengine appengine-testing - 2.0.20 + 2.0.21 test com.google.appengine appengine-api-stubs - 2.0.20 + 2.0.21 test com.google.appengine appengine-tools-sdk - 2.0.20 + 2.0.21 test ``` diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index fef191614..dc9919911 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.21-SNAPSHOT`. +Let's assume the current built version is `2.0.22-SNAPSHOT`. Add the dependency for the GAE runtime jars in your application pom.xml file: ``` - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT ${appengine.runtime.location} ... diff --git a/api/pom.xml b/api/pom.xml index 0e85be361..649c67599 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index b7a6da267..8264b580a 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 5590fa8b9..68e0d10d2 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index e5b7642ac..33f2f708b 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.21-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index 64e82e537..ad868e2f5 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index 7e0727970..d957077a1 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index c7d3a5e0a..47bee7694 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index 6be262904..3e359fef4 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index caec95a8e..8422b048d 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/applications/pom.xml b/applications/pom.xml index f4c2f1d7f..c4d05e4b6 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index 4bce3d7d9..bd75dc407 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -27,7 +27,7 @@ com.google.appengine applications - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index fa6d48b4f..08ead3221 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml index 074404212..76bdb2735 100644 --- a/e2etests/devappservertests/pom.xml +++ b/e2etests/devappservertests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.21-SNAPSHOT + 2.0.22-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 8d4c90985..5551b08ab 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.21-SNAPSHOT"); + "../testlocalapps/" + directoryName + "/target/" + directoryName + "-2.0.22-SNAPSHOT"); return appRoot; } diff --git a/e2etests/pom.xml b/e2etests/pom.xml index fe3ee2d65..366a7ee24 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT AppEngine :: e2e tests pom diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index 12c686cdc..a9db0fe95 100644 --- a/e2etests/stagingtests/pom.xml +++ b/e2etests/stagingtests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.21-SNAPSHOT + 2.0.22-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 5fdd5e767..80ef29f60 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 @@ -177,7 +177,7 @@ private static String getWarPath(String directoryName) { + directoryName + "/target/" + directoryName - + "-2.0.21-SNAPSHOT") + + "-2.0.22-SNAPSHOT") .getAbsolutePath(); // assertThat(appRoot.isDirectory()).isTrue(); diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml index 42f5c7049..8f9a937a6 100644 --- a/e2etests/testlocalapps/allinone/pom.xml +++ b/e2etests/testlocalapps/allinone/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index 8a2a735ec..39a900fe8 100644 --- a/e2etests/testlocalapps/badcron/pom.xml +++ b/e2etests/testlocalapps/badcron/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index 91a1af538..c109283e1 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.21-SNAPSHOT + 2.0.22-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 5f44e4c5c..2418c5a3d 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.21-SNAPSHOT + 2.0.22-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 622f727c1..0113dbdea 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.21-SNAPSHOT + 2.0.22-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 5151455aa..08555c531 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.21-SNAPSHOT + 2.0.22-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 129f4d599..7fc78ee0e 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index 2213ccd47..1b633f23b 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml index 423dd536b..b363a2141 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml index 4ce62cc4e..498ea575b 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml index 462784ab7..c99cdb6c6 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index c362eadbe..def693521 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index 8569a333c..9f0b495b3 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index d2f0dc210..727e6d2e2 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index a23b59ce9..2c5717d75 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT pom diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index 3abeb14d5..e9d60a644 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index 0cd22f2ae..51e489ec5 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index eb6d1dab0..7ca9964cc 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badentrypoint/pom.xml b/e2etests/testlocalapps/sample-badentrypoint/pom.xml index 6c5d5d1a6..143ef8821 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 1b9db0bbb..a763e30ca 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badruntimechannel/pom.xml b/e2etests/testlocalapps/sample-badruntimechannel/pom.xml index ea8131492..af24c7c93 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index 5dc8b97b9..66c6dc902 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml index c31df6817..7a3992069 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.21-SNAPSHOT + 2.0.22-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 65bfef19d..15de69b2a 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index 18ffbab8e..ec40c024f 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index cbd228a1d..510bae107 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 82efab373..271ffc065 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index 8aa5c3029..198cc662f 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml index 15081f8e6..af8979489 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index 96b4234de..83c90c7f4 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index c0fd181c0..176da4846 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml index 88f359b20..431dd2713 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index 867b99c2e..8ffe5c3ca 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index c544c408e..72344616b 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index 824b99afb..91f622c0b 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war AppEngine :: sampleapp-backends diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml index 0643f6cea..97fc62fbc 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index 8525e0aa2..55854e851 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index d5a17f92e..839ffbc9f 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index 5e3793665..d8982557a 100644 --- a/e2etests/testlocalapps/sampleapp/pom.xml +++ b/e2etests/testlocalapps/sampleapp/pom.xml @@ -25,7 +25,7 @@ com.google.appengine testlocalapps - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT AppEngine :: sampleapp diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index a121f8115..8e9eca76f 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml index 51f7e6765..f0605a971 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.21-SNAPSHOT + 2.0.22-SNAPSHOT war diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index 445e2c6da..9b8bf9eff 100644 --- a/e2etests/testlocalapps/xmlorder/pom.xml +++ b/e2etests/testlocalapps/xmlorder/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT war AppEngine :: xmlorder diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index 6eb4a4500..3a69e55cb 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-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 d214b3220..49f792a3f 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.21-SNAPSHOT + 2.0.22-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 de8bc1545..a710d13fd 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.21-SNAPSHOT.jar"); + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.22-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 6284a8b47..8f5860ad6 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.21-SNAPSHOT.jar"; + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.22-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 fcbab2aca..e9fa14b8d 100644 --- a/jetty12_assembly/pom.xml +++ b/jetty12_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT 4.0.0 jetty12-assembly diff --git a/lib/pom.xml b/lib/pom.xml index 2bbbacd68..6839d910b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 3156426a6..d999472f8 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -23,7 +23,7 @@ com.google.appengine lib-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index f942f8c36..7a95ead78 100644 --- a/lib/xml_validator/pom.xml +++ b/lib/xml_validator/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index 51688c449..ce9ad3b12 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.21-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml index fb47d3e88..b78fd3051 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.21-SNAPSHOT + 2.0.22-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 c5c790d69..55ca73e3d 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.21-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index 80521670d..08d4e5e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT pom AppEngine :: Parent project @@ -808,7 +808,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 false none diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 5fa6b346e..123134164 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index 37fc0883d..8cfea49d3 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index 29351c264..81bf3b38e 100644 --- a/quickstartgenerator_jetty12/pom.xml +++ b/quickstartgenerator_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index 932638d90..efdd2e290 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index 41acfdd5a..d9644e7e3 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index 73e503af2..489d04a5f 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index 5a7bd2ebf..a33f95ea6 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index 7006df928..48cad455e 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml index a5bc2d894..8b333bc95 100644 --- a/runtime/lite/pom.xml +++ b/runtime/lite/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index c0f92feb1..074a3ad08 100644 --- a/runtime/local_jetty12/pom.xml +++ b/runtime/local_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/local_jetty9/pom.xml b/runtime/local_jetty9/pom.xml index 8d6c80ec0..2c11e0cde 100644 --- a/runtime/local_jetty9/pom.xml +++ b/runtime/local_jetty9/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index 7f8ba4470..557564485 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 0707a83f3..2688cf8d5 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/pom.xml b/runtime/pom.xml index f176f33b0..8503487a4 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT AppEngine :: runtime projects pom diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index 80046a720..eb7ac7193 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.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index 19b0ca74b..4aba6f2f4 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.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index 483a76d12..6e6f74d6e 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-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 aa554c684..92e47f187 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 @@ -45,7 +45,8 @@ public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); appRoot = new File( - currentDirectory, "../annotationscanningwebapp/target/annotationscanningwebapp-2.0.21-SNAPSHOT"); + currentDirectory, + "../annotationscanningwebapp/target/annotationscanningwebapp-2.0.22-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 2ce669f78..0bc47a6fa 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 @@ -32,7 +32,10 @@ public final class FailureFilterTest extends JavaRuntimeViaHttpBase { @BeforeClass public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); - appRoot = new File(currentDirectory, "../failinitfilterwebapp/target/failinitfilterwebapp-2.0.21-SNAPSHOT"); + appRoot = + new File( + currentDirectory, + "../failinitfilterwebapp/target/failinitfilterwebapp-2.0.22-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 b65c8d1f5..3e5defead 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 @@ -42,7 +42,8 @@ public NoGaeApisTest(Boolean useJetty12) { @BeforeClass public static void beforeClass() throws IOException, InterruptedException { File currentDirectory = new File("").getAbsoluteFile(); - appRoot = new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.21-SNAPSHOT"); + appRoot = + new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.22-SNAPSHOT"); assertThat(appRoot.isDirectory()).isTrue(); } diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 5d7215ea0..6b2d100c8 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index 567464548..0aa5e44ae 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 611879d98..8d916f89c 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 89689b409..9e5fb699d 100644 --- a/runtime_shared_jetty12/pom.xml +++ b/runtime_shared_jetty12/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index c609a6528..4a70e421b 100644 --- a/runtime_shared_jetty9/pom.xml +++ b/runtime_shared_jetty9/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index 16d042a65..76e2378d5 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT 4.0.0 appengine-java-sdk diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index cf0d38e35..724045399 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index ce8ae03d7..5b7f04752 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index 90b5d9776..de050e690 100644 --- a/shared_sdk_jetty12/pom.xml +++ b/shared_sdk_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index 6215a6685..8c28dded8 100644 --- a/shared_sdk_jetty9/pom.xml +++ b/shared_sdk_jetty9/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index 49a955477..856e4505c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.21-SNAPSHOT + 2.0.22-SNAPSHOT true