From a31ea2cd25750f0654d4c38e42004152bf05ef44 Mon Sep 17 00:00:00 2001 From: Ludovic Champenois Date: Tue, 19 May 2026 08:47:14 -0700 Subject: [PATCH 1/2] Rename GAE Java version 5.0.3-SNAPSHOT to 5.0.3-beta-SNAPSHOT --- TRYLATESTBITSINPROD.md | 16 ++++++++-------- api/pom.xml | 2 +- api_dev/pom.xml | 2 +- api_legacy/pom.xml | 2 +- appengine-api-1.0-sdk/pom.xml | 2 +- appengine-api-stubs/pom.xml | 2 +- appengine_init/pom.xml | 2 +- appengine_jsr107/pom.xml | 2 +- appengine_resources/pom.xml | 2 +- appengine_setup/apiserver_local/pom.xml | 2 +- appengine_setup/pom.xml | 2 +- appengine_setup/test/pom.xml | 2 +- appengine_setup/testapps/jetty12_testapp/pom.xml | 6 +++--- appengine_setup/testapps/pom.xml | 2 +- .../testapps/springboot_testapp/pom.xml | 6 +++--- appengine_setup/testapps/testapps_common/pom.xml | 2 +- appengine_testing/pom.xml | 2 +- appengine_testing_tests/pom.xml | 2 +- applications/guestbook/pom.xml | 4 ++-- applications/guestbook_jakarta/pom.xml | 4 ++-- applications/jaxrs/pom.xml | 4 ++-- applications/pom.xml | 2 +- applications/proberapp/pom.xml | 2 +- applications/proberapp_jakarta/pom.xml | 2 +- applications/servletasyncapp/pom.xml | 2 +- applications/servletasyncappjakarta/pom.xml | 2 +- applications/springboot/pom.xml | 2 +- e2etests/devappservertests/pom.xml | 2 +- e2etests/pom.xml | 2 +- e2etests/stagingtests/pom.xml | 2 +- e2etests/testlocalapps/allinone/pom.xml | 2 +- e2etests/testlocalapps/allinone_jakarta/pom.xml | 2 +- e2etests/testlocalapps/badcron/pom.xml | 2 +- e2etests/testlocalapps/bundle_standard/pom.xml | 2 +- .../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 +- .../cron-good-retry-parameters/pom.xml | 2 +- .../cron-negative-max-backoff/pom.xml | 2 +- .../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 +- .../sample-baddispatch-yaml/pom.xml | 2 +- .../testlocalapps/sample-baddispatch/pom.xml | 2 +- e2etests/testlocalapps/sample-badindexes/pom.xml | 2 +- e2etests/testlocalapps/sample-badweb/pom.xml | 2 +- .../sample-default-auto-ids/pom.xml | 2 +- .../sample-error-in-tag-file/pom.xml | 2 +- e2etests/testlocalapps/sample-java11/pom.xml | 2 +- e2etests/testlocalapps/sample-java17/pom.xml | 2 +- .../testlocalapps/sample-jsptaglibrary/pom.xml | 2 +- e2etests/testlocalapps/sample-jspx/pom.xml | 2 +- .../testlocalapps/sample-legacy-auto-ids/pom.xml | 2 +- .../testlocalapps/sample-missingappid/pom.xml | 2 +- e2etests/testlocalapps/sample-nojsps/pom.xml | 2 +- .../sample-unspecified-auto-ids/pom.xml | 2 +- .../testlocalapps/sample-with-classes/pom.xml | 2 +- .../sampleapp-automatic-module/pom.xml | 2 +- .../testlocalapps/sampleapp-backends/pom.xml | 2 +- .../testlocalapps/sampleapp-basic-module/pom.xml | 2 +- .../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 +- .../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 +- jetty121_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 +- pom.xml | 2 +- protobuf/pom.xml | 2 +- quickstartgenerator_jetty121_ee11/pom.xml | 2 +- quickstartgenerator_jetty121_ee8/pom.xml | 2 +- remoteapi/pom.xml | 2 +- runtime/annotationscanningwebapp/pom.xml | 2 +- runtime/annotationscanningwebappjakarta/pom.xml | 2 +- runtime/deployment/pom.xml | 2 +- runtime/failinitfilterwebapp/pom.xml | 2 +- runtime/failinitfilterwebappjakarta/pom.xml | 2 +- runtime/impl/pom.xml | 2 +- runtime/lite/pom.xml | 2 +- runtime/local_jetty121/pom.xml | 2 +- runtime/local_jetty121_ee11/pom.xml | 2 +- runtime/main/pom.xml | 2 +- runtime/nogaeapiswebapp/pom.xml | 2 +- runtime/nogaeapiswebappjakarta/pom.xml | 2 +- runtime/pom.xml | 2 +- runtime/runtime_impl_jetty12/pom.xml | 2 +- runtime/runtime_impl_jetty121/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_jetty121_ee11/pom.xml | 2 +- runtime_shared_jetty121_ee8/pom.xml | 2 +- runtime_shared_jetty12_ee10/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_jetty121/pom.xml | 2 +- utils/pom.xml | 2 +- 114 files changed, 128 insertions(+), 128 deletions(-) diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index fd6a34ab..4b858c28 100644 --- a/TRYLATESTBITSINPROD.md +++ b/TRYLATESTBITSINPROD.md @@ -47,7 +47,7 @@ top of your web application and change the entrypoint to boot with these jars in ./mvnw clean install ``` -Let's assume the current build version is `5.0.3-SNAPSHOT`. +Let's assume the current build version is `5.0.3-beta-SNAPSHOT`. See the output of the runtime deployment module which contains all the jars needed by the runtime: @@ -67,7 +67,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file: ``` - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT target/${project.artifactId}-${project.version} ... @@ -185,13 +185,13 @@ fi if grep -q "" "$POM_FILE"; then # Inserts the properties before the closing tag sed -i '/<\/properties>/i \ - 5.0.3-SNAPSHOT<\/appengine.runtime.version>\ + 5.0.3-beta-SNAPSHOT<\/appengine.runtime.version>\ target/${project.artifactId}-${project.version}<\/appengine.runtime.location>' "$POM_FILE" else # If no properties tag exists, insert it before dependencies sed -i '//i \ \ - 5.0.3-SNAPSHOT<\/appengine.runtime.version>\ + 5.0.3-beta-SNAPSHOT<\/appengine.runtime.version>\ target/${project.artifactId}-${project.version}<\/appengine.runtime.location>\ <\/properties>' "$POM_FILE" fi @@ -266,14 +266,14 @@ If you are using the Gradle build system, you can apply the following changes to These instructions configure the `war` task to do two important things: 1. **Move the jars to the top of the WAR directory:** The `into("")` (or `into('.')`) block combined with `eachFile { path = name }` extracts the jars and flattens the directory structure, placing them directly in the root of the generated WAR. -2. **Rename the jars:** The `rename` block strips the version string (e.g., `-5.0.3-SNAPSHOT`) from the extracted jars so their names exactly match the `-Djava.class.path=runtime-main.jar` argument specified in the `appengine-web.xml` entrypoint. +2. **Rename the jars:** The `rename` block strips the version string (e.g., `-5.0.3-beta-SNAPSHOT`) from the extracted jars so their names exactly match the `-Djava.class.path=runtime-main.jar` argument specified in the `appengine-web.xml` entrypoint. ### Kotlin ``` import org.gradle.api.tasks.bundling.War // 1. Define the target runtime version -val gaeRuntimeVersion = "5.0.3-SNAPSHOT" // Change this to your desired version +val gaeRuntimeVersion = "5.0.3-beta-SNAPSHOT" // Change this to your desired version // 2. Create a custom configuration for the runtime zip val gaeRuntimeZip by configurations.creating @@ -309,7 +309,7 @@ tasks.named("war") { ``` // 1. Define the target runtime version -def gaeRuntimeVersion = "5.0.3-SNAPSHOT" // Change this to your desired version +def gaeRuntimeVersion = "5.0.3-beta-SNAPSHOT" // Change this to your desired version // 2. Create a custom configuration for the runtime zip configurations { @@ -336,7 +336,7 @@ war { } // Strip the version number from the jar files - // (e.g., 'runtime-main-5.0.3-SNAPSHOT.jar' becomes 'runtime-main.jar') + // (e.g., 'runtime-main-5.0.3-beta-SNAPSHOT.jar' becomes 'runtime-main.jar') rename { String fileName -> fileName.replace("-${gaeRuntimeVersion}", "") } diff --git a/api/pom.xml b/api/pom.xml index 4da9ca5a..d09b17a8 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index bd4a09f4..4c98ca2f 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 7efca4cf..069b7e20 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 6177f119..939d8ae8 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index dfc7b79b..64b026c4 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/appengine_init/pom.xml b/appengine_init/pom.xml index 8ef1c423..c5067fa4 100644 --- a/appengine_init/pom.xml +++ b/appengine_init/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index 9b01d8d2..d14b0558 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -26,7 +26,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index c4fffd69..d7496793 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_setup/apiserver_local/pom.xml b/appengine_setup/apiserver_local/pom.xml index 4e9dd328..fc2b7024 100644 --- a/appengine_setup/apiserver_local/pom.xml +++ b/appengine_setup/apiserver_local/pom.xml @@ -20,7 +20,7 @@ com.google.appengine appengine_setup - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 diff --git a/appengine_setup/pom.xml b/appengine_setup/pom.xml index 382b01e1..73d3850a 100644 --- a/appengine_setup/pom.xml +++ b/appengine_setup/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT apiserver_local diff --git a/appengine_setup/test/pom.xml b/appengine_setup/test/pom.xml index 939fae66..57d60982 100644 --- a/appengine_setup/test/pom.xml +++ b/appengine_setup/test/pom.xml @@ -20,7 +20,7 @@ com.google.appengine appengine_setup - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 com.google.appengine diff --git a/appengine_setup/testapps/jetty12_testapp/pom.xml b/appengine_setup/testapps/jetty12_testapp/pom.xml index de168e5e..cca5a32b 100644 --- a/appengine_setup/testapps/jetty12_testapp/pom.xml +++ b/appengine_setup/testapps/jetty12_testapp/pom.xml @@ -20,7 +20,7 @@ testapps com.google.appengine - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 com.google.appengine.setup.testapps @@ -32,7 +32,7 @@ com.google.appengine.setup.testapps testapps_common - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT org.eclipse.jetty @@ -98,7 +98,7 @@ srirammahavadi-dev GCLOUD_CONFIG true - ${project.build.directory}/jetty11_testapp-5.0.3-SNAPSHOT-jar-with-dependencies.jar + ${project.build.directory}/jetty11_testapp-5.0.3-beta-SNAPSHOT-jar-with-dependencies.jar diff --git a/appengine_setup/testapps/pom.xml b/appengine_setup/testapps/pom.xml index 2c4b7bbf..ada12c05 100644 --- a/appengine_setup/testapps/pom.xml +++ b/appengine_setup/testapps/pom.xml @@ -20,7 +20,7 @@ com.google.appengine appengine_setup - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 com.google.appengine diff --git a/appengine_setup/testapps/springboot_testapp/pom.xml b/appengine_setup/testapps/springboot_testapp/pom.xml index f85f8dc3..b76e9d20 100644 --- a/appengine_setup/testapps/springboot_testapp/pom.xml +++ b/appengine_setup/testapps/springboot_testapp/pom.xml @@ -25,7 +25,7 @@ com.google.appengine.setup.testapps springboot_testapp - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT springboot_testapp https://github.com/GoogleCloudPlatform/appengine-java-standard/ Demo project for Spring Boot @@ -45,12 +45,12 @@ com.google.appengine appengine-api-1.0-sdk - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.setup.testapps testapps_common - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/appengine_setup/testapps/testapps_common/pom.xml b/appengine_setup/testapps/testapps_common/pom.xml index 09be7e9a..4e514a6d 100644 --- a/appengine_setup/testapps/testapps_common/pom.xml +++ b/appengine_setup/testapps/testapps_common/pom.xml @@ -20,7 +20,7 @@ testapps com.google.appengine - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 com.google.appengine.setup.testapps diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index 3f47ce13..37cab23b 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 3aac6f66..877e7328 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/applications/guestbook/pom.xml b/applications/guestbook/pom.xml index 3bd20070..b8b0f5d6 100644 --- a/applications/guestbook/pom.xml +++ b/applications/guestbook/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos guestbook @@ -34,7 +34,7 @@ true - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT UTF-8 1.8 1.8 diff --git a/applications/guestbook_jakarta/pom.xml b/applications/guestbook_jakarta/pom.xml index 80d0cfe9..536b4078 100644 --- a/applications/guestbook_jakarta/pom.xml +++ b/applications/guestbook_jakarta/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos guestbook_jakarta @@ -34,7 +34,7 @@ true - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT UTF-8 1.8 1.8 diff --git a/applications/jaxrs/pom.xml b/applications/jaxrs/pom.xml index 1872482c..cc1cd3c3 100644 --- a/applications/jaxrs/pom.xml +++ b/applications/jaxrs/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos jaxrs @@ -34,7 +34,7 @@ true - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT UTF-8 1.8 1.8 diff --git a/applications/pom.xml b/applications/pom.xml index 9f437815..1a7fa403 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index b2e1ffa3..428761b0 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -29,7 +29,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT diff --git a/applications/proberapp_jakarta/pom.xml b/applications/proberapp_jakarta/pom.xml index e4b46270..9fe33a87 100644 --- a/applications/proberapp_jakarta/pom.xml +++ b/applications/proberapp_jakarta/pom.xml @@ -29,7 +29,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT diff --git a/applications/servletasyncapp/pom.xml b/applications/servletasyncapp/pom.xml index f5ecfade..51fe40a4 100644 --- a/applications/servletasyncapp/pom.xml +++ b/applications/servletasyncapp/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos servletasyncapp diff --git a/applications/servletasyncappjakarta/pom.xml b/applications/servletasyncappjakarta/pom.xml index 1dad8b36..68dfe949 100644 --- a/applications/servletasyncappjakarta/pom.xml +++ b/applications/servletasyncappjakarta/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos servletasyncappjakarta diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index eec6d803..ced8600c 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -24,7 +24,7 @@ com.google.appengine applications - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml index ba61aee3..382d1d2e 100644 --- a/e2etests/devappservertests/pom.xml +++ b/e2etests/devappservertests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/e2etests/pom.xml b/e2etests/pom.xml index 725b1bca..322ee10e 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT AppEngine :: e2e tests https://github.com/GoogleCloudPlatform/appengine-java-standard/ diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index ae5910ef..6870fe98 100644 --- a/e2etests/stagingtests/pom.xml +++ b/e2etests/stagingtests/pom.xml @@ -22,7 +22,7 @@ com.google.appengine e2etests - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/e2etests/testlocalapps/allinone/pom.xml b/e2etests/testlocalapps/allinone/pom.xml index 66d1de21..538014fb 100644 --- a/e2etests/testlocalapps/allinone/pom.xml +++ b/e2etests/testlocalapps/allinone/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/allinone_jakarta/pom.xml b/e2etests/testlocalapps/allinone_jakarta/pom.xml index fb1e2021..8f3376e7 100644 --- a/e2etests/testlocalapps/allinone_jakarta/pom.xml +++ b/e2etests/testlocalapps/allinone_jakarta/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/badcron/pom.xml b/e2etests/testlocalapps/badcron/pom.xml index e729e5cd..07edd5ab 100644 --- a/e2etests/testlocalapps/badcron/pom.xml +++ b/e2etests/testlocalapps/badcron/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard/pom.xml b/e2etests/testlocalapps/bundle_standard/pom.xml index dc472132..71a6b26d 100644 --- a/e2etests/testlocalapps/bundle_standard/pom.xml +++ b/e2etests/testlocalapps/bundle_standard/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-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 7eb03506..f206948f 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/bundle_standard_with_container_initializer_jakarta/pom.xml b/e2etests/testlocalapps/bundle_standard_with_container_initializer_jakarta/pom.xml index 5042e403..44cb3b55 100644 --- a/e2etests/testlocalapps/bundle_standard_with_container_initializer_jakarta/pom.xml +++ b/e2etests/testlocalapps/bundle_standard_with_container_initializer_jakarta/pom.xml @@ -25,7 +25,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-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 0bdab2ce..bb837f81 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-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 b671172e..9dfa418e 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-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 86568546..6ef455f7 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index 5a5205a8..08239a0f 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml b/e2etests/testlocalapps/cron-negative-max-backoff/pom.xml index 5e512488..e7a2aab8 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml b/e2etests/testlocalapps/cron-negative-retry-limit/pom.xml index 0f15ae2a..a793b444 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/cron-two-max-doublings/pom.xml b/e2etests/testlocalapps/cron-two-max-doublings/pom.xml index 803d8139..2d5ec105 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/http-headers/pom.xml b/e2etests/testlocalapps/http-headers/pom.xml index 0bccf370..e58d4a41 100644 --- a/e2etests/testlocalapps/http-headers/pom.xml +++ b/e2etests/testlocalapps/http-headers/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-jar/pom.xml b/e2etests/testlocalapps/java8-jar/pom.xml index a786904c..e50a23f7 100644 --- a/e2etests/testlocalapps/java8-jar/pom.xml +++ b/e2etests/testlocalapps/java8-jar/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/java8-no-webxml/pom.xml b/e2etests/testlocalapps/java8-no-webxml/pom.xml index 2ea595a2..7663c578 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/pom.xml b/e2etests/testlocalapps/pom.xml index 937a5a19..c1215bee 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -24,7 +24,7 @@ com.google.appengine e2etests - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT pom diff --git a/e2etests/testlocalapps/sample-badaeweb/pom.xml b/e2etests/testlocalapps/sample-badaeweb/pom.xml index 62c13503..9a614b5f 100644 --- a/e2etests/testlocalapps/sample-badaeweb/pom.xml +++ b/e2etests/testlocalapps/sample-badaeweb/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml b/e2etests/testlocalapps/sample-baddispatch-yaml/pom.xml index 0155423e..09173b8e 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-baddispatch/pom.xml b/e2etests/testlocalapps/sample-baddispatch/pom.xml index 0e8c7117..82ad8ffc 100644 --- a/e2etests/testlocalapps/sample-baddispatch/pom.xml +++ b/e2etests/testlocalapps/sample-baddispatch/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badindexes/pom.xml b/e2etests/testlocalapps/sample-badindexes/pom.xml index 0467b04f..e567a4e3 100644 --- a/e2etests/testlocalapps/sample-badindexes/pom.xml +++ b/e2etests/testlocalapps/sample-badindexes/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-badweb/pom.xml b/e2etests/testlocalapps/sample-badweb/pom.xml index c790628c..48431067 100644 --- a/e2etests/testlocalapps/sample-badweb/pom.xml +++ b/e2etests/testlocalapps/sample-badweb/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-default-auto-ids/pom.xml b/e2etests/testlocalapps/sample-default-auto-ids/pom.xml index 58b82a62..4fe6fd06 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-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 a9aa053f..6a92219e 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java11/pom.xml b/e2etests/testlocalapps/sample-java11/pom.xml index a92f114f..b5b03a82 100644 --- a/e2etests/testlocalapps/sample-java11/pom.xml +++ b/e2etests/testlocalapps/sample-java11/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-java17/pom.xml b/e2etests/testlocalapps/sample-java17/pom.xml index c50042ef..4e7d69a1 100644 --- a/e2etests/testlocalapps/sample-java17/pom.xml +++ b/e2etests/testlocalapps/sample-java17/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml index 8909bcc9..5dc643c3 100644 --- a/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml +++ b/e2etests/testlocalapps/sample-jsptaglibrary/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-jspx/pom.xml b/e2etests/testlocalapps/sample-jspx/pom.xml index a87d7ce7..a5dcd77e 100644 --- a/e2etests/testlocalapps/sample-jspx/pom.xml +++ b/e2etests/testlocalapps/sample-jspx/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml b/e2etests/testlocalapps/sample-legacy-auto-ids/pom.xml index 82254ac6..22ff2c62 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-missingappid/pom.xml b/e2etests/testlocalapps/sample-missingappid/pom.xml index 2451df97..f3f0b0f1 100644 --- a/e2etests/testlocalapps/sample-missingappid/pom.xml +++ b/e2etests/testlocalapps/sample-missingappid/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-nojsps/pom.xml b/e2etests/testlocalapps/sample-nojsps/pom.xml index d6e91f20..38db72fe 100644 --- a/e2etests/testlocalapps/sample-nojsps/pom.xml +++ b/e2etests/testlocalapps/sample-nojsps/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml b/e2etests/testlocalapps/sample-unspecified-auto-ids/pom.xml index ff6f35d3..0f734bea 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sample-with-classes/pom.xml b/e2etests/testlocalapps/sample-with-classes/pom.xml index 1e07a7ef..4459a3ab 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml b/e2etests/testlocalapps/sampleapp-automatic-module/pom.xml index 8af4566c..41e30098 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-backends/pom.xml b/e2etests/testlocalapps/sampleapp-backends/pom.xml index d5731dd9..dd70c454 100644 --- a/e2etests/testlocalapps/sampleapp-backends/pom.xml +++ b/e2etests/testlocalapps/sampleapp-backends/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war AppEngine :: sampleapp-backends diff --git a/e2etests/testlocalapps/sampleapp-basic-module/pom.xml b/e2etests/testlocalapps/sampleapp-basic-module/pom.xml index ef66d3b0..06214f1f 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-manual-module/pom.xml b/e2etests/testlocalapps/sampleapp-manual-module/pom.xml index e2f3e4ef..4610586c 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp-runtime/pom.xml b/e2etests/testlocalapps/sampleapp-runtime/pom.xml index 136e69d5..394bc01a 100644 --- a/e2etests/testlocalapps/sampleapp-runtime/pom.xml +++ b/e2etests/testlocalapps/sampleapp-runtime/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/sampleapp/pom.xml b/e2etests/testlocalapps/sampleapp/pom.xml index 54c8e190..c031e53c 100644 --- a/e2etests/testlocalapps/sampleapp/pom.xml +++ b/e2etests/testlocalapps/sampleapp/pom.xml @@ -25,7 +25,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT AppEngine :: sampleapp https://github.com/GoogleCloudPlatform/appengine-java-standard/ diff --git a/e2etests/testlocalapps/stage-sampleapp/pom.xml b/e2etests/testlocalapps/stage-sampleapp/pom.xml index d3bb3588..27fff944 100644 --- a/e2etests/testlocalapps/stage-sampleapp/pom.xml +++ b/e2etests/testlocalapps/stage-sampleapp/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/stage-with-staging-options/pom.xml b/e2etests/testlocalapps/stage-with-staging-options/pom.xml index 10f2450e..e3a2eba1 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war diff --git a/e2etests/testlocalapps/xmlorder/pom.xml b/e2etests/testlocalapps/xmlorder/pom.xml index f0b0d675..1dfcece9 100644 --- a/e2etests/testlocalapps/xmlorder/pom.xml +++ b/e2etests/testlocalapps/xmlorder/pom.xml @@ -24,7 +24,7 @@ com.google.appengine testlocalapps - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT war AppEngine :: xmlorder diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index 66a5af3f..ecb96d2c 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-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 fd23276e..f18bb14e 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 - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/jetty121_assembly/pom.xml b/jetty121_assembly/pom.xml index 0a881afa..0076eee1 100644 --- a/jetty121_assembly/pom.xml +++ b/jetty121_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 jetty121-assembly diff --git a/lib/pom.xml b/lib/pom.xml index 04992851..784ff05b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 8afe7725..1a8da308 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -23,7 +23,7 @@ com.google.appengine lib-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index c7d93559..9ee556ac 100644 --- a/lib/xml_validator/pom.xml +++ b/lib/xml_validator/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index ff7a731a..d1ec100d 100644 --- a/lib/xml_validator_test/pom.xml +++ b/lib/xml_validator_test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared_jetty12/pom.xml b/local_runtime_shared_jetty12/pom.xml index 2b28bf61..5f7a1680 100644 --- a/local_runtime_shared_jetty12/pom.xml +++ b/local_runtime_shared_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jakarta diff --git a/pom.xml b/pom.xml index 14724dbd..50af7ff9 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT pom AppEngine :: Parent project https://github.com/GoogleCloudPlatform/appengine-java-standard/ diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 23f10099..01a3af71 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/quickstartgenerator_jetty121_ee11/pom.xml b/quickstartgenerator_jetty121_ee11/pom.xml index 125b2bb9..ce524351 100644 --- a/quickstartgenerator_jetty121_ee11/pom.xml +++ b/quickstartgenerator_jetty121_ee11/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/quickstartgenerator_jetty121_ee8/pom.xml b/quickstartgenerator_jetty121_ee8/pom.xml index 00d120c2..05d38fea 100644 --- a/quickstartgenerator_jetty121_ee8/pom.xml +++ b/quickstartgenerator_jetty121_ee8/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index 69719ff0..5866b90f 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index c3d29e77..084f22e4 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/annotationscanningwebappjakarta/pom.xml b/runtime/annotationscanningwebappjakarta/pom.xml index df4f9349..5d9b6798 100644 --- a/runtime/annotationscanningwebappjakarta/pom.xml +++ b/runtime/annotationscanningwebappjakarta/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos annotationscanningwebappjakarta diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index dda5fb88..5e289b65 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index 6c7ee25f..e18a1ae4 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/failinitfilterwebappjakarta/pom.xml b/runtime/failinitfilterwebappjakarta/pom.xml index a898df56..0714da0d 100644 --- a/runtime/failinitfilterwebappjakarta/pom.xml +++ b/runtime/failinitfilterwebappjakarta/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos failinitfilterwebappjakarta diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index 00c60e05..3d6b4a5d 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml index a3dae5ca..abba678d 100644 --- a/runtime/lite/pom.xml +++ b/runtime/lite/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/local_jetty121/pom.xml b/runtime/local_jetty121/pom.xml index f776097b..bce200e8 100644 --- a/runtime/local_jetty121/pom.xml +++ b/runtime/local_jetty121/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/local_jetty121_ee11/pom.xml b/runtime/local_jetty121_ee11/pom.xml index 1089f9bf..ce7900dd 100644 --- a/runtime/local_jetty121_ee11/pom.xml +++ b/runtime/local_jetty121_ee11/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index 667dd03b..f06bbf4b 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 39bdc10a..b5d6d7ee 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/nogaeapiswebappjakarta/pom.xml b/runtime/nogaeapiswebappjakarta/pom.xml index 1ca5670b..0fb3cc8e 100644 --- a/runtime/nogaeapiswebappjakarta/pom.xml +++ b/runtime/nogaeapiswebappjakarta/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT com.google.appengine.demos nogaeapiswebappjakarta diff --git a/runtime/pom.xml b/runtime/pom.xml index c341a074..0de2290c 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT AppEngine :: runtime projects https://github.com/GoogleCloudPlatform/appengine-java-standard/ diff --git a/runtime/runtime_impl_jetty12/pom.xml b/runtime/runtime_impl_jetty12/pom.xml index acde715e..f5e6ade7 100644 --- a/runtime/runtime_impl_jetty12/pom.xml +++ b/runtime/runtime_impl_jetty12/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/runtime_impl_jetty121/pom.xml b/runtime/runtime_impl_jetty121/pom.xml index acbb0235..0457b5d1 100644 --- a/runtime/runtime_impl_jetty121/pom.xml +++ b/runtime/runtime_impl_jetty121/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index d9935fb2..18fa2fdb 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 2d0e39c5..df8b8d09 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index 5735da12..e7f2b732 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 76d61a00..bf600875 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index c838f3fe..006cc3b9 100644 --- a/runtime_shared_jetty12/pom.xml +++ b/runtime_shared_jetty12/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime_shared_jetty121_ee11/pom.xml b/runtime_shared_jetty121_ee11/pom.xml index ab915e9e..ad4b4f44 100644 --- a/runtime_shared_jetty121_ee11/pom.xml +++ b/runtime_shared_jetty121_ee11/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime_shared_jetty121_ee8/pom.xml b/runtime_shared_jetty121_ee8/pom.xml index 29b45d97..c1ee48a0 100644 --- a/runtime_shared_jetty121_ee8/pom.xml +++ b/runtime_shared_jetty121_ee8/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/runtime_shared_jetty12_ee10/pom.xml b/runtime_shared_jetty12_ee10/pom.xml index a1054d7f..ece2a3ab 100644 --- a/runtime_shared_jetty12_ee10/pom.xml +++ b/runtime_shared_jetty12_ee10/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index 5082ac21..519469b9 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT 4.0.0 appengine-java-sdk diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index 7fc5ef07..53b63d9e 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index d0ae4280..67fcd736 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index a456edc3..a33f71b3 100644 --- a/shared_sdk_jetty12/pom.xml +++ b/shared_sdk_jetty12/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/shared_sdk_jetty121/pom.xml b/shared_sdk_jetty121/pom.xml index 40ebd07f..215ddb58 100644 --- a/shared_sdk_jetty121/pom.xml +++ b/shared_sdk_jetty121/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index 6959e6ce..531cc10c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 5.0.3-SNAPSHOT + 5.0.3-beta-SNAPSHOT true From 3c0eeb8884521f2a0e23fffe986b35ede39e212f Mon Sep 17 00:00:00 2001 From: Manu C Date: Thu, 11 Jun 2026 22:04:27 +0530 Subject: [PATCH 2/2] Update image-server configuration environment variable names (#508) --- .../api/images/GrpcImagesClient.java | 25 +++++++++++++----- .../api/images/ImagesServiceFactoryImpl.java | 6 ++++- .../api/images/ImagesServiceImpl.java | 3 ++- .../api/images/GrpcImagesClientTest.java | 26 +++++++++++++------ .../images/ImagesServiceFactoryImplTest.java | 8 ++++-- .../api/images/ImagesServiceImplTest.java | 15 ++++++++--- 6 files changed, 61 insertions(+), 22 deletions(-) diff --git a/api/src/main/java/com/google/appengine/api/images/GrpcImagesClient.java b/api/src/main/java/com/google/appengine/api/images/GrpcImagesClient.java index 9eb39ecc..5bf3d22a 100644 --- a/api/src/main/java/com/google/appengine/api/images/GrpcImagesClient.java +++ b/api/src/main/java/com/google/appengine/api/images/GrpcImagesClient.java @@ -72,27 +72,40 @@ private static GoogleCredentials getApplicationDefaultCredentials() { } private String getTarget() { - String endpoint = environmentProvider.getenv("IMAGES_SERVICE_ENDPOINT"); + String endpoint = + environmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV); if (isNullOrEmpty(endpoint)) { - throw new IllegalStateException("IMAGES_SERVICE_ENDPOINT environment variable not set."); + throw new IllegalStateException( + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV + " environment variable not set."); } try { URI uri = new URI(endpoint); String host = uri.getHost(); if (host == null) { - throw new IllegalStateException("Invalid URI in IMAGES_SERVICE_ENDPOINT: " + endpoint); + throw new IllegalStateException( + "Invalid URI in " + + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV + + ": " + + endpoint); } return host + ":443"; } catch (URISyntaxException e) { - throw new IllegalStateException("Invalid URI in IMAGES_SERVICE_ENDPOINT: " + endpoint, e); + throw new IllegalStateException( + "Invalid URI in " + + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV + + ": " + + endpoint, + e); } } private static CallCredentials createOidcCredentials( EnvironmentProvider environmentProvider, GoogleCredentials googleCredentials) { - String endpoint = environmentProvider.getenv("IMAGES_SERVICE_ENDPOINT"); + String endpoint = + environmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV); if (isNullOrEmpty(endpoint)) { - throw new IllegalStateException("IMAGES_SERVICE_ENDPOINT environment variable not set."); + throw new IllegalStateException( + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV + " environment variable not set."); } if (!(googleCredentials instanceof IdTokenProvider idTokenProvider)) { diff --git a/api/src/main/java/com/google/appengine/api/images/ImagesServiceFactoryImpl.java b/api/src/main/java/com/google/appengine/api/images/ImagesServiceFactoryImpl.java index 37e2bd66..98ef881f 100644 --- a/api/src/main/java/com/google/appengine/api/images/ImagesServiceFactoryImpl.java +++ b/api/src/main/java/com/google/appengine/api/images/ImagesServiceFactoryImpl.java @@ -33,7 +33,11 @@ final class ImagesServiceFactoryImpl implements IImagesServiceFactory { @VisibleForTesting - static final String USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV = "USE_CUSTOM_IMAGES_GRPC_SERVICE"; + static final String USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV = + "APPENGINE_USE_CUSTOM_IMAGES_GRPC_SERVICE"; + + @VisibleForTesting + static final String IMAGES_SERVICE_ENDPOINT_ENV = "APPENGINE_IMAGES_SERVICE_ENDPOINT"; private EnvironmentProvider environmentProvider = new SystemEnvironmentProvider(); diff --git a/api/src/main/java/com/google/appengine/api/images/ImagesServiceImpl.java b/api/src/main/java/com/google/appengine/api/images/ImagesServiceImpl.java index 322734a9..23fac426 100644 --- a/api/src/main/java/com/google/appengine/api/images/ImagesServiceImpl.java +++ b/api/src/main/java/com/google/appengine/api/images/ImagesServiceImpl.java @@ -164,7 +164,8 @@ private ImagesServiceBlockingStub getGrpcStub() { @VisibleForTesting boolean useGrpc() { - String envVar = environmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE"); + String envVar = + environmentProvider.getenv(ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV); return Boolean.parseBoolean(envVar); } diff --git a/api/src/test/java/com/google/appengine/api/images/GrpcImagesClientTest.java b/api/src/test/java/com/google/appengine/api/images/GrpcImagesClientTest.java index bed6c056..12be765b 100644 --- a/api/src/test/java/com/google/appengine/api/images/GrpcImagesClientTest.java +++ b/api/src/test/java/com/google/appengine/api/images/GrpcImagesClientTest.java @@ -37,7 +37,7 @@ public class GrpcImagesClientTest { @Test public void constructor_validEndpointAndCreds_success() { - when(mockEnvironmentProvider.getenv("IMAGES_SERVICE_ENDPOINT")) + when(mockEnvironmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV)) .thenReturn("https://my-service.run.app"); GrpcImagesClient client = new GrpcImagesClient(mockEnvironmentProvider, mockCallCredentials); @@ -46,37 +46,47 @@ public void constructor_validEndpointAndCreds_success() { @Test public void constructor_endpointNotSet_throwsException() { - when(mockEnvironmentProvider.getenv("IMAGES_SERVICE_ENDPOINT")).thenReturn(null); + when(mockEnvironmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV)) + .thenReturn(null); IllegalStateException e = assertThrows( IllegalStateException.class, () -> new GrpcImagesClient(mockEnvironmentProvider, mockCallCredentials)); - assertThat(e).hasMessageThat().contains("IMAGES_SERVICE_ENDPOINT environment variable not set"); + assertThat(e) + .hasMessageThat() + .contains( + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV + " environment variable not set"); } @Test public void constructor_invalidEndpoint_throwsException() { - when(mockEnvironmentProvider.getenv("IMAGES_SERVICE_ENDPOINT")).thenReturn("://my-service"); + when(mockEnvironmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV)) + .thenReturn("://my-service"); IllegalStateException e = assertThrows( IllegalStateException.class, () -> new GrpcImagesClient(mockEnvironmentProvider, mockCallCredentials)); - assertThat(e).hasMessageThat().contains("Invalid URI in IMAGES_SERVICE_ENDPOINT"); + assertThat(e) + .hasMessageThat() + .contains("Invalid URI in " + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV); } @Test public void constructor_endpointMissingHost_throwsException() { - when(mockEnvironmentProvider.getenv("IMAGES_SERVICE_ENDPOINT")).thenReturn("https://"); + when(mockEnvironmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV)) + .thenReturn("https://"); IllegalStateException e = assertThrows( IllegalStateException.class, () -> new GrpcImagesClient(mockEnvironmentProvider, mockCallCredentials)); - assertThat(e).hasMessageThat().contains("Invalid URI in IMAGES_SERVICE_ENDPOINT"); + assertThat(e) + .hasMessageThat() + .contains("Invalid URI in " + ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV); } @Test public void getBlockingStub_returnsStub() { - when(mockEnvironmentProvider.getenv("IMAGES_SERVICE_ENDPOINT")) + when(mockEnvironmentProvider.getenv(ImagesServiceFactoryImpl.IMAGES_SERVICE_ENDPOINT_ENV)) .thenReturn("https://my-service.run.app"); GrpcImagesClient client = new GrpcImagesClient(mockEnvironmentProvider, mockCallCredentials); assertThat(client.getBlockingStub()).isNotNull(); diff --git a/api/src/test/java/com/google/appengine/api/images/ImagesServiceFactoryImplTest.java b/api/src/test/java/com/google/appengine/api/images/ImagesServiceFactoryImplTest.java index 417ee684..0ae60314 100644 --- a/api/src/test/java/com/google/appengine/api/images/ImagesServiceFactoryImplTest.java +++ b/api/src/test/java/com/google/appengine/api/images/ImagesServiceFactoryImplTest.java @@ -41,7 +41,9 @@ public void setUp() { @Test public void makeImageFromFilename_newBehavior_trueEnv_gsPrefix() { - when(mockEnvironmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE")).thenReturn("true"); + when(mockEnvironmentProvider.getenv( + ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV)) + .thenReturn("true"); String filename = "/gs/bucket/object"; // Should NOT call BlobstoreServiceFactory (which would fail in this env) @@ -53,7 +55,9 @@ public void makeImageFromFilename_newBehavior_trueEnv_gsPrefix() { @Test public void makeImageFromFilename_newBehavior_trueEnv_noGsPrefix_throwsException() { - when(mockEnvironmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE")).thenReturn("true"); + when(mockEnvironmentProvider.getenv( + ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV)) + .thenReturn("true"); String filename = "not/gs/path"; IllegalArgumentException e = diff --git a/api/src/test/java/com/google/appengine/api/images/ImagesServiceImplTest.java b/api/src/test/java/com/google/appengine/api/images/ImagesServiceImplTest.java index 55e18213..27bb5bc8 100644 --- a/api/src/test/java/com/google/appengine/api/images/ImagesServiceImplTest.java +++ b/api/src/test/java/com/google/appengine/api/images/ImagesServiceImplTest.java @@ -172,7 +172,9 @@ private void setupGrpcService(ImagesServiceGrpc.ImagesServiceImplBase serviceImp new ImagesServiceImpl( mockEnvironmentProvider, mockGrpcImagesClient, null, mockBlobstoreReference); - when(mockEnvironmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE")).thenReturn("true"); + when(mockEnvironmentProvider.getenv( + ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV)) + .thenReturn("true"); } @Test @@ -354,7 +356,8 @@ public void loadImageData_withLegacyBlobKey_failure() throws Exception { public void setUpGrpc(boolean useGrpc) throws Exception { ImagesServiceImpl.setStorageForTesting(mockStorage); - when(mockEnvironmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE")) + when(mockEnvironmentProvider.getenv( + ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV)) .thenReturn(Boolean.toString(useGrpc)); if (useGrpc) { @@ -407,7 +410,9 @@ public void useGrpc_envVarSetFalse_returnsFalse() throws Exception { @Test public void useGrpc_envVarNotSet_returnsFalse() { - when(mockEnvironmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE")).thenReturn(null); + when(mockEnvironmentProvider.getenv( + ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV)) + .thenReturn(null); imagesService = new ImagesServiceImpl( mockEnvironmentProvider, null, null, mockBlobstoreReference, null, mockBlobInfoFactory); @@ -416,7 +421,9 @@ public void useGrpc_envVarNotSet_returnsFalse() { @Test public void useGrpc_envVarInvalid_returnsFalse() { - when(mockEnvironmentProvider.getenv("USE_CUSTOM_IMAGES_GRPC_SERVICE")).thenReturn("yes"); + when(mockEnvironmentProvider.getenv( + ImagesServiceFactoryImpl.USE_CUSTOM_IMAGES_GRPC_SERVICE_ENV)) + .thenReturn("yes"); imagesService = new ImagesServiceImpl( mockEnvironmentProvider, null, null, mockBlobstoreReference, null, mockBlobInfoFactory);