diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index af812de52..6c5421841 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: @@ -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/README.md b/README.md index 1d5351e99..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.19 + 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.19 + 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.19 + 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.19 + 2.0.21 test com.google.appengine appengine-api-stubs - 2.0.19 + 2.0.21 test com.google.appengine appengine-tools-sdk - 2.0.19 + 2.0.21 test ``` diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index 3e62caf79..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.20-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.20-SNAPSHOT + 2.0.22-SNAPSHOT ${appengine.runtime.location} ... diff --git a/api/pom.xml b/api/pom.xml index fc1864cb6..649c67599 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT true 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()); diff --git a/api_dev/pom.xml b/api_dev/pom.xml index f26e31800..8264b580a 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.22-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index 02245185c..68e0d10d2 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.22-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 04e3e24a5..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.20-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 2247931ee..ad868e2f5 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.22-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index 92cd06bd5..d957077a1 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.22-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index c0e5a6d7e..47bee7694 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.22-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index cf40ea245..3e359fef4 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.22-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index 14a830bce..8422b048d 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.22-SNAPSHOT jar @@ -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/applications/pom.xml b/applications/pom.xml index e2a89e2bd..c4d05e4b6 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index d12b18ac5..bd75dc407 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.22-SNAPSHOT @@ -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..08ead3221 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.22-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/devappservertests/pom.xml b/e2etests/devappservertests/pom.xml new file mode 100644 index 000000000..76bdb2735 --- /dev/null +++ b/e2etests/devappservertests/pom.xml @@ -0,0 +1,62 @@ + + + + + 4.0.0 + + devappservertests + + com.google.appengine + e2etests + 2.0.22-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 99% 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 index c24e3a612..5551b08ab 100644 --- 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 @@ -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.22-SNAPSHOT"); return appRoot; } diff --git a/e2etests/pom.xml b/e2etests/pom.xml index de83404b5..366a7ee24 100644 --- a/e2etests/pom.xml +++ b/e2etests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT AppEngine :: e2e tests pom @@ -31,5 +31,6 @@ testlocalapps stagingtests + devappservertests diff --git a/e2etests/stagingtests/pom.xml b/e2etests/stagingtests/pom.xml index 88c999c4e..a9db0fe95 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.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 c6306a50c..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 - + "-0.0.1-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 77d4917bd..8f9a937a6 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.22-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..39a900fe8 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.22-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..c109283e1 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.22-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..2418c5a3d 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.22-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..0113dbdea 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.22-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..08555c531 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.22-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..7fc78ee0e 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.22-SNAPSHOT + war AppEngine :: cron-bad-job-age-limit @@ -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/cron-good-retry-parameters/pom.xml b/e2etests/testlocalapps/cron-good-retry-parameters/pom.xml index 8e9d7c79d..1b633f23b 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.22-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..b363a2141 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.22-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..498ea575b 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.22-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..c99cdb6c6 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.22-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..def693521 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.22-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..9f0b495b3 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.22-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..727e6d2e2 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.22-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 1979f4edc..2c5717d75 100644 --- a/e2etests/testlocalapps/pom.xml +++ b/e2etests/testlocalapps/pom.xml @@ -17,12 +17,12 @@ 4.0.0 - testlocalapss + testlocalapps AppEngine :: Test local applications com.google.appengine e2etests - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT pom @@ -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..e9d60a644 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.22-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..51e489ec5 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.22-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..7ca9964cc 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.22-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..143ef8821 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.22-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..a763e30ca 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.22-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..af24c7c93 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.22-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..66c6dc902 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.22-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..7a3992069 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.22-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..15de69b2a 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.22-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..ec40c024f 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.22-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..510bae107 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.22-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..271ffc065 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.22-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..198cc662f 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.22-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..af8979489 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.22-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..83c90c7f4 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.22-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..176da4846 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.22-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..431dd2713 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.22-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..8ffe5c3ca 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.22-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..72344616b 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.22-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..91f622c0b 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.22-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..97fc62fbc 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.22-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..55854e851 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.22-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..839ffbc9f 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.22-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..d8982557a 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.22-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..8e9eca76f 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.22-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..f0605a971 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.22-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..9b8bf9eff 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.22-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/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index 3908e615d..3a69e55cb 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.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 112aa7af2..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.20-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 c067cac30..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.20-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 5169568e6..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.20-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 9988e5486..e9fa14b8d 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.22-SNAPSHOT 4.0.0 jetty12-assembly diff --git a/kokoro/gcp_ubuntu/build.sh b/kokoro/gcp_ubuntu/build.sh index 0c2b7438a..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 +./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 @@ -68,6 +68,10 @@ 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/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 . # cleanup staging area 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/lib/pom.xml b/lib/pom.xml index dff76bcd2..6839d910b 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 75be90da3..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.20-SNAPSHOT + 2.0.22-SNAPSHOT jar @@ -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 diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 715b545af..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.20-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 5f30b5266..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.20-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 8d1b4d30d..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.20-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 c74e5761a..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.20-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared Jetty9 diff --git a/pom.xml b/pom.xml index 534790efc..08d4e5e4d 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT pom AppEngine :: Parent project @@ -59,8 +59,8 @@ 1.8 1.8 UTF-8 - 9.4.52.v20230823 - 12.0.1 + 9.4.53.v20231009 + 12.0.2 https://oss.sonatype.org/content/repositories/google-snapshots/ sonatype-nexus-snapshots https://oss.sonatype.org/service/local/staging/deploy/maven2/ @@ -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 @@ -656,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 @@ -711,7 +712,7 @@ org.json json - 20230618 + 20231013 commons-codec @@ -807,7 +808,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 + 3.6.0 false none @@ -887,6 +888,25 @@ ${project.basedir}/licenses/resources/third-party-file-template.ftl + + org.spdx + spdx-maven-plugin + + 0.7.0 + + + build-spdx + + createSPDX + + + + + + *.spdx + + + diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 306024c54..123134164 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index 5111f9761..8cfea49d3 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/quickstartgenerator_jetty12/pom.xml b/quickstartgenerator_jetty12/pom.xml index 68cacd49e..81bf3b38e 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.22-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index 60b6e08b7..efdd2e290 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index ea6434bb2..d9644e7e3 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.22-SNAPSHOT + com.google.appengine.demos annotationscanningwebapp AppEngine :: annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index d54fc8552..489d04a5f 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.22-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index 497f4ca0a..a33f95ea6 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.22-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/impl/pom.xml b/runtime/impl/pom.xml index 87f565ab9..48cad455e 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.22-SNAPSHOT jar diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml index 3b1b7c866..8b333bc95 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.22-SNAPSHOT jar diff --git a/runtime/local_jetty12/pom.xml b/runtime/local_jetty12/pom.xml index d75272edc..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.20-SNAPSHOT + 2.0.22-SNAPSHOT jar @@ -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 31d803584..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.20-SNAPSHOT + 2.0.22-SNAPSHOT jar @@ -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 diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index f3082c622..557564485 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.22-SNAPSHOT jar 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); diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index 46cd76e44..2688cf8d5 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.22-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/pom.xml b/runtime/pom.xml index b1c055b76..8503487a4 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-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 832d82d18..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.20-SNAPSHOT + 2.0.22-SNAPSHOT jar 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) diff --git a/runtime/runtime_impl_jetty9/pom.xml b/runtime/runtime_impl_jetty9/pom.xml index b79294fce..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.20-SNAPSHOT + 2.0.22-SNAPSHOT jar diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index c43114b96..6e6f74d6e 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.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 98c914ea4..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-1.0"); + 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 4292ef75d..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-1.0"); + 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 49986aaa6..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-1.0"); + appRoot = + new File(currentDirectory, "../nogaeapiswebapp/target/nogaeapiswebapp-2.0.22-SNAPSHOT"); assertThat(appRoot.isDirectory()).isTrue(); } 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", diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 346d6a032..6b2d100c8 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.22-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index 431eec15a..0aa5e44ae 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.22-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 99d099299..8d916f89c 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.22-SNAPSHOT jar diff --git a/runtime_shared_jetty12/pom.xml b/runtime_shared_jetty12/pom.xml index 88dd7d7b2..9e5fb699d 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.22-SNAPSHOT jar diff --git a/runtime_shared_jetty9/pom.xml b/runtime_shared_jetty9/pom.xml index 574dccc52..4a70e421b 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.22-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index c1593de2d..76e2378d5 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.22-SNAPSHOT 4.0.0 appengine-java-sdk diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index 67e8fded7..724045399 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT jar 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() { + + } +} diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index a91eea4a8..5b7f04752 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.22-SNAPSHOT jar diff --git a/shared_sdk_jetty12/pom.xml b/shared_sdk_jetty12/pom.xml index 9739c05ba..de050e690 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.22-SNAPSHOT jar diff --git a/shared_sdk_jetty9/pom.xml b/shared_sdk_jetty9/pom.xml index db8a904f3..8c28dded8 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.22-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index 8eeed9136..856e4505c 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.20-SNAPSHOT + 2.0.22-SNAPSHOT true