diff --git a/README.md b/README.md index 287f336c2..952614495 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.15 + 2.0.16 javax.servlet @@ -131,7 +131,7 @@ Source code for remote APIs for App Engine. com.google.appengine appengine-remote-api - 2.0.15 + 2.0.16 ``` @@ -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.15 + 2.0.16 ``` @@ -169,19 +169,19 @@ We moved `com.google.appengine.api.memcache.stdimpl` and its old dependency com.google.appengine appengine-testing - 2.0.15 + 2.0.16 test com.google.appengine appengine-api-stubs - 2.0.15 + 2.0.16 test com.google.appengine appengine-tools-sdk - 2.0.15 + 2.0.16 test ``` @@ -281,4 +281,3 @@ Always be sure to follow the [Code of Conduct](CODE_OF_CONDUCT.md). [maven-version-image]: https://img.shields.io/maven-central/v/com.google.appengine/appengine-api-1.0-sdk.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.appengine%20AND%20a:appengine-api-1.0-sdk&core=gav - diff --git a/TRYLATESTBITSINPROD.md b/TRYLATESTBITSINPROD.md index 975216037..7c7848038 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.16-SNAPSHOT`. +Let's assume the current built version is `2.0.17-SNAPSHOT`. Add the dependency for the GAE runtime jars in your application pom.xml file: ``` - 2.0.16-SNAPSHOT + 2.0.17-SNAPSHOT ${appengine.runtime.location} ... diff --git a/api/pom.xml b/api/pom.xml index 95c4a4ce8..5a922b6eb 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT true diff --git a/api_dev/pom.xml b/api_dev/pom.xml index 5a2298f44..5b3c608b0 100644 --- a/api_dev/pom.xml +++ b/api_dev/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/api_legacy/pom.xml b/api_legacy/pom.xml index c43eb2f91..9f426c502 100644 --- a/api_legacy/pom.xml +++ b/api_legacy/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/appengine-api-1.0-sdk/pom.xml b/appengine-api-1.0-sdk/pom.xml index 22be877c5..7c115028e 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.16-SNAPSHOT + 2.0.18-SNAPSHOT jar AppEngine :: appengine-api-1.0-sdk diff --git a/appengine-api-stubs/pom.xml b/appengine-api-stubs/pom.xml index 69d7c6fac..f7612ef89 100644 --- a/appengine-api-stubs/pom.xml +++ b/appengine-api-stubs/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/appengine_jsr107/pom.xml b/appengine_jsr107/pom.xml index fca023e8d..eea11725d 100644 --- a/appengine_jsr107/pom.xml +++ b/appengine_jsr107/pom.xml @@ -24,7 +24,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT diff --git a/appengine_resources/pom.xml b/appengine_resources/pom.xml index 66985a655..33c889b84 100644 --- a/appengine_resources/pom.xml +++ b/appengine_resources/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar AppEngine :: appengine-resources diff --git a/appengine_setup/test/pom.xml b/appengine_setup/test/pom.xml index 3e59f7023..4bd646628 100644 --- a/appengine_setup/test/pom.xml +++ b/appengine_setup/test/pom.xml @@ -54,7 +54,7 @@ org.apache.commons commons-text - 1.9 + 1.10.0 com.jcabi diff --git a/appengine_setup/testapps/jetty11_testapp/pom.xml b/appengine_setup/testapps/jetty11_testapp/pom.xml index 0744ef892..fbe257bed 100644 --- a/appengine_setup/testapps/jetty11_testapp/pom.xml +++ b/appengine_setup/testapps/jetty11_testapp/pom.xml @@ -26,7 +26,7 @@ com.google.appengine.setup.testapps jetty11_testapp - 11.0.12 + 11.0.14 diff --git a/appengine_testing/pom.xml b/appengine_testing/pom.xml index e15edbede..ba8372aab 100644 --- a/appengine_testing/pom.xml +++ b/appengine_testing/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/appengine_testing_tests/pom.xml b/appengine_testing_tests/pom.xml index a37550f4d..21b3b9c82 100644 --- a/appengine_testing_tests/pom.xml +++ b/appengine_testing_tests/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/applications/pom.xml b/applications/pom.xml index f1a537409..9d2cb8e1d 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT pom diff --git a/applications/proberapp/pom.xml b/applications/proberapp/pom.xml index 3f9cccf0c..ea3e197e9 100644 --- a/applications/proberapp/pom.xml +++ b/applications/proberapp/pom.xml @@ -14,9 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war @@ -27,7 +25,7 @@ com.google.appengine applications - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT diff --git a/applications/proberapp/src/main/java/app/ProberApp.java b/applications/proberapp/src/main/java/app/ProberApp.java index 36a9c4a36..d905fe58e 100644 --- a/applications/proberapp/src/main/java/app/ProberApp.java +++ b/applications/proberapp/src/main/java/app/ProberApp.java @@ -130,6 +130,7 @@ import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Properties; import java.util.Random; @@ -271,7 +272,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) } // Cloud Tasks QA is only available in us-central1/2. // TODO(b/197253337): Enable in prod once task queues are added to prod apps in sisyfus. - if (isRunningInQa() && "uc".equals(getLocationId())) { + if (isRunningInQa() && Objects.equals(getLocationId(), "uc")) { testMethodsBuilder .put("pushQueue", ProberApp::testPushQueue) .put("pullQueue", ProberApp::testPullQueue); @@ -295,28 +296,15 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response) } // For testHttpGet - private static final String HUMANS = "https://www.google.com/humans.txt"; - private static final String EXPECTED = - "Google is built by a large team of engineers, designers, " - + "researchers, robots, and others in many different sites across the " - + "globe. It is updated continuously, and built with more tools and " - + "technologies than we can shake a stick at. If you'd like to help us " - + "out, see careers.google.com.\n"; + private static final String URL = "https://cloud.google.com/appengine/docs/java"; /** Tests HTTP connection. */ private static void testHttpGet(HttpServletRequest request) throws IOException { String failureMsg = ""; - HttpURLConnection connection = (HttpURLConnection) new URL(HUMANS).openConnection(); + HttpURLConnection connection = (HttpURLConnection) new URL(URL).openConnection(); try (InputStream is = connection.getInputStream()) { - String responseBody = new String(ByteStreams.toByteArray(is), UTF_8); - - if (!responseBody.equals(EXPECTED)) { - failureMsg += - String.format("response body differs; got: '%s'; want: '%s'.", responseBody, EXPECTED); - } - int code = connection.getResponseCode(); if (code != 200) { failureMsg += "\nstatus code; got: " + code + "want: " + 200; @@ -339,7 +327,7 @@ private static void testUrlFetch(HttpServletRequest request) throws IOException // bypassing FastNet by using http_over_rpc .doNotFollowRedirects() .setDeadline(120.0); - HTTPRequest httpRequest = new HTTPRequest(new URL(HUMANS), HTTPMethod.GET, fetchOptions); + HTTPRequest httpRequest = new HTTPRequest(new URL(URL), HTTPMethod.GET, fetchOptions); // Disable gzip compression on the response httpRequest.setHeader(new HTTPHeader("Accept-Encoding", "identity")); @@ -347,8 +335,8 @@ private static void testUrlFetch(HttpServletRequest request) throws IOException try { URLFetchService urlFetchService = URLFetchServiceFactory.getURLFetchService(); response = urlFetchService.fetch(httpRequest); - String content = new String(response.getContent(), UTF_8); - assertThat(content).isEqualTo(EXPECTED); + assertThat(response).isNotNull(); + assertThat(response.getResponseCode()).isEqualTo(HttpServletResponse.SC_OK); } catch (IOException ioe) { // URLFetch documentation states that an exception is thrown, // i.e. error code not set, when the response is too large. @@ -524,7 +512,7 @@ private static void testMysql(HttpServletRequest request) throws SQLException, I if (resultSet.next()) { String res = resultSet.getString("message"); - if (!SQL_RESPONSE.equals(res)) { + if (!Objects.equals(res, SQL_RESPONSE)) { throw new AssertionError( String.format( "from SQL database query '%s' got: '%s'; want: '%s'\n", diff --git a/applications/springboot/pom.xml b/applications/springboot/pom.xml index d35ad917d..0f6cbf554 100644 --- a/applications/springboot/pom.xml +++ b/applications/springboot/pom.xml @@ -15,13 +15,12 @@ limitations under the License. --> - + 4.0.0 com.google.appengine.demos springboot - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT war AppEngine :: springboot diff --git a/external/geronimo_javamail/pom.xml b/external/geronimo_javamail/pom.xml index f8fc296a7..6abbf5f2b 100644 --- a/external/geronimo_javamail/pom.xml +++ b/external/geronimo_javamail/pom.xml @@ -22,14 +22,14 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT ../../pom.xml geronimo-javamail_1.4_spec jar AppEngine :: JavaMail 1.4 - 1.4.4-${project.parent.version} + 1.4.4-3.0.17-SNAPSHOT Javamail 1.4 Specification with AppEngine updates. diff --git a/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml b/google3/third_party/java_src/appengine_standard/api_compatibility_tests/pom.xml index 9e275c7d2..c8630c110 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.16-SNAPSHOT + 2.0.17-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 f63b5df13..4254dcb95 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.16-SNAPSHOT.jar"); + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.17-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 3d2eee288..0a522f7ef 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.16-SNAPSHOT.jar"; + "/tmp/check_build/appengine-api-1.0-sdk/target/appengine-api-1.0-sdk-2.0.17-SNAPSHOT.jar"; private boolean isExhaustiveUsageClass(String clsName) { return clsName.startsWith("com.google.appengine.apicompat.usage"); diff --git a/lib/pom.xml b/lib/pom.xml index 934936464..494b4e844 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT pom diff --git a/lib/tools_api/pom.xml b/lib/tools_api/pom.xml index 4651c5ac2..acb4defcd 100644 --- a/lib/tools_api/pom.xml +++ b/lib/tools_api/pom.xml @@ -23,7 +23,7 @@ com.google.appengine lib-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java b/lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java index b37e1f9c4..7c809eaff 100644 --- a/lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java +++ b/lib/tools_api/src/main/java/com/google/appengine/tools/admin/Application.java @@ -131,12 +131,14 @@ public class Application implements GenericApplication { private static final String GOOGLE_LEGACY_RUNTIME_ID = "googlelegacy"; private static final String JAVA_11_RUNTIME_ID = "java11"; private static final String JAVA_17_RUNTIME_ID = "java17"; + private static final String JAVA_21_RUNTIME_ID = "java21"; private static final ImmutableSet ALLOWED_RUNTIME_IDS = ImmutableSet.of( JAVA_8_RUNTIME_ID, JAVA_11_RUNTIME_ID, JAVA_17_RUNTIME_ID, + JAVA_21_RUNTIME_ID, GOOGLE_RUNTIME_ID, GOOGLE_LEGACY_RUNTIME_ID); @@ -939,6 +941,7 @@ private boolean isJava8OrAbove() { return (appEngineWebXml.getRuntime().startsWith(JAVA_8_RUNTIME_ID) || appEngineWebXml.getRuntime().equals(JAVA_11_RUNTIME_ID) || appEngineWebXml.getRuntime().equals(JAVA_17_RUNTIME_ID) + || appEngineWebXml.getRuntime().equals(JAVA_21_RUNTIME_ID) || appEngineWebXml.getRuntime().startsWith(GOOGLE_LEGACY_RUNTIME_ID)); } @@ -1319,7 +1322,8 @@ private void compileJspJavaFiles( optionList.addAll(Arrays.asList("-target", "8")); } else if (runtime.startsWith(GOOGLE_LEGACY_RUNTIME_ID) || runtime.equals(JAVA_11_RUNTIME_ID) - || runtime.equals(JAVA_17_RUNTIME_ID)) { + || runtime.equals(JAVA_17_RUNTIME_ID) + || runtime.equals(JAVA_21_RUNTIME_ID)) { // TODO(b/115569833): for now, it's still possible to use a JDK8 to compile and deploy Java11 // apps. optionList.addAll(Arrays.asList("-source", "8")); diff --git a/lib/xml_validator/pom.xml b/lib/xml_validator/pom.xml index 8bb0739fc..d02acf3de 100644 --- a/lib/xml_validator/pom.xml +++ b/lib/xml_validator/pom.xml @@ -22,7 +22,7 @@ com.google.appengine lib-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar AppEngine :: libxmlvalidator diff --git a/lib/xml_validator_test/pom.xml b/lib/xml_validator_test/pom.xml index c1f9fc945..c09257dc0 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.16-SNAPSHOT + 2.0.18-SNAPSHOT jar AppEngine :: libxmlvalidator_test diff --git a/local_runtime_shared/pom.xml b/local_runtime_shared/pom.xml index 4bf31360b..50971a735 100644 --- a/local_runtime_shared/pom.xml +++ b/local_runtime_shared/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar AppEngine :: appengine-local-runtime-shared diff --git a/pom.xml b/pom.xml index d9560ddde..1899bd558 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 4.0.0 com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT pom AppEngine :: Parent project @@ -195,7 +195,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.1.2 ../deployment/target/runtime-deployment-${project.version} @@ -221,7 +221,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.1.0 + 3.1.2 ../deployment/target/runtime-deployment-${project.version} @@ -386,7 +386,7 @@ com.google.cloud.datastore datastore-v1-proto-client - 2.14.7 + 2.16.3 com.google.geometry @@ -421,25 +421,25 @@ com.google.auto.service auto-service - 1.0.1 + 1.1.1 provided com.google.auto.service auto-service-annotations - 1.0.1 + 1.1.1 provided com.google.auto.value auto-value - 1.10.1 + 1.10.2 provided com.google.auto.value auto-value-annotations - 1.10.1 + 1.10.2 com.esotericsoftware.yamlbeans @@ -449,12 +449,12 @@ com.google.api.grpc proto-google-cloud-datastore-v1 - 0.105.3 + 0.107.1 com.google.api.grpc proto-google-common-protos - 2.17.0 + 2.23.0 com.google.code.findbugs @@ -480,17 +480,17 @@ com.google.guava guava - 32.0.1-jre + 32.1.2-jre com.google.errorprone error_prone_annotations - 2.19.1 + 2.21.1 com.google.http-client google-http-client - 1.43.2 + 1.43.3 com.google.http-client @@ -541,7 +541,7 @@ org.apache.maven maven-core - 3.9.2 + 3.9.4 org.apache.ant @@ -557,12 +557,12 @@ org.apache.maven maven-plugin-api - 3.9.2 + 3.9.4 org.checkerframework checker-qual - 3.35.0 + 3.37.0 provided @@ -616,7 +616,7 @@ com.google.http-client google-http-client-appengine - 1.43.2 + 1.43.3 com.google.oauth-client @@ -626,22 +626,22 @@ io.grpc grpc-api - 1.55.1 + 1.57.1 io.grpc grpc-stub - 1.55.1 + 1.57.1 io.grpc grpc-protobuf - 1.55.1 + 1.57.1 io.grpc grpc-netty - 1.55.1 + 1.57.1 org.apache.tomcat @@ -661,30 +661,30 @@ org.json json - 20230227 + 20230618 commons-codec commons-codec - 1.15 + 1.16.0 com.google.guava guava-testlib - 32.0.1-jre + 32.1.2-jre test com.google.truth truth - 1.1.4 + 1.1.5 test com.google.truth.extensions truth-java8-extension - 1.1.4 + 1.1.5 test @@ -694,22 +694,23 @@ 4.13.2 test - + org.mockito - mockito-core - 4.8.1 - test + mockito-bom + 4.11.0 + import + pom - org.mockito - mockito-junit-jupiter - 4.8.1 - test - + org.mockito + mockito-inline + 4.11.0 + test + com.google.cloud google-cloud-logging - 3.14.4 + 3.15.7 @@ -747,11 +748,6 @@ org.apache.maven.plugins maven-compiler-plugin 3.11.0 - - - -Acom.google.auto.value.AutoBuilderIsUnstable - - org.apache.maven.plugins @@ -789,7 +785,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.4.1 + 3.5.0 com.github.os72 @@ -821,7 +817,7 @@ org.codehaus.mojo license-maven-plugin - 2.0.1 + 2.2.0 com.google.appengine true @@ -850,7 +846,7 @@ org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.0 diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 5e77c1aed..6786e7ea7 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/quickstartgenerator/pom.xml b/quickstartgenerator/pom.xml index 73e71a84d..8ffc47102 100644 --- a/quickstartgenerator/pom.xml +++ b/quickstartgenerator/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/remoteapi/pom.xml b/remoteapi/pom.xml index 8eeb824cb..35fb07d03 100644 --- a/remoteapi/pom.xml +++ b/remoteapi/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar AppEngine :: appengine-remote-api diff --git a/runtime/annotationscanningwebapp/pom.xml b/runtime/annotationscanningwebapp/pom.xml index d81f65230..9f4d1bd81 100644 --- a/runtime/annotationscanningwebapp/pom.xml +++ b/runtime/annotationscanningwebapp/pom.xml @@ -14,13 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war - 1.0 + 1.1-SNAPSHOT com.google.appengine.demos annotationscanningwebapp diff --git a/runtime/deployment/pom.xml b/runtime/deployment/pom.xml index bedc7c91a..65f207452 100644 --- a/runtime/deployment/pom.xml +++ b/runtime/deployment/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT pom diff --git a/runtime/failinitfilterwebapp/pom.xml b/runtime/failinitfilterwebapp/pom.xml index e6d09593d..5ec694ba6 100644 --- a/runtime/failinitfilterwebapp/pom.xml +++ b/runtime/failinitfilterwebapp/pom.xml @@ -14,13 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war - 1.0 + 1.1-SNAPSHOT com.google.appengine.demos failinitfilterwebapp diff --git a/runtime/impl/pom.xml b/runtime/impl/pom.xml index a677ec5d9..9562e3ed9 100644 --- a/runtime/impl/pom.xml +++ b/runtime/impl/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/runtime/lite/pom.xml b/runtime/lite/pom.xml index 9a0a7c1ff..7f67b1deb 100644 --- a/runtime/lite/pom.xml +++ b/runtime/lite/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.17-SNAPSHOT jar diff --git a/runtime/local/pom.xml b/runtime/local/pom.xml index 0ebf84215..260dcbe3b 100644 --- a/runtime/local/pom.xml +++ b/runtime/local/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/runtime/main/pom.xml b/runtime/main/pom.xml index 1eaa42423..955c64359 100644 --- a/runtime/main/pom.xml +++ b/runtime/main/pom.xml @@ -23,7 +23,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/runtime/nogaeapiswebapp/pom.xml b/runtime/nogaeapiswebapp/pom.xml index b974fe558..0d86963bc 100644 --- a/runtime/nogaeapiswebapp/pom.xml +++ b/runtime/nogaeapiswebapp/pom.xml @@ -14,13 +14,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - + 4.0.0 war - 1.0 + 1.1-SNAPSHOT com.google.appengine.demos nogaeapiswebapp diff --git a/runtime/pom.xml b/runtime/pom.xml index e2f1d4ad3..3d8c98d35 100644 --- a/runtime/pom.xml +++ b/runtime/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT AppEngine :: runtime projects pom diff --git a/runtime/test/pom.xml b/runtime/test/pom.xml index ae6361a72..310537a2e 100644 --- a/runtime/test/pom.xml +++ b/runtime/test/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/runtime/testapps/pom.xml b/runtime/testapps/pom.xml index 7a6f50d25..244b9afc2 100644 --- a/runtime/testapps/pom.xml +++ b/runtime/testapps/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/runtime/util/pom.xml b/runtime/util/pom.xml index dcc44ee9b..98faed1cb 100644 --- a/runtime/util/pom.xml +++ b/runtime/util/pom.xml @@ -22,7 +22,7 @@ com.google.appengine runtime-parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/runtime_shared/pom.xml b/runtime_shared/pom.xml index 055cd9032..1b94a25dc 100644 --- a/runtime_shared/pom.xml +++ b/runtime_shared/pom.xml @@ -22,7 +22,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/sdk_assembly/pom.xml b/sdk_assembly/pom.xml index 65001779c..ddf067900 100644 --- a/sdk_assembly/pom.xml +++ b/sdk_assembly/pom.xml @@ -20,7 +20,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT 4.0.0 appengine-java-sdk @@ -278,8 +278,8 @@ - - + + diff --git a/sdk_assembly/src/main/resources/bin/dev_appserver.cmd b/sdk_assembly/src/main/resources/bin/dev_appserver.cmd index 4ec3d497d..55807659a 100644 --- a/sdk_assembly/src/main/resources/bin/dev_appserver.cmd +++ b/sdk_assembly/src/main/resources/bin/dev_appserver.cmd @@ -19,9 +19,6 @@ rem Launches the Development AppServer. This utility allows developers rem to test a Google App Engine application on their local workstation. -echo 'The dev_appserver shipped with the standalone Java SDK is deprecated.' 1>&2 -echo 'Please use the java_dev_appserver.sh shipped with the Cloud SDK instead.' 1>&2 -echo 'https://cloud.google.com/appengine/docs/standard/java/download' 1>&2 java -cp "%~dp0\..\lib\appengine-tools-api.jar" ^ com.google.appengine.tools.KickStart ^ diff --git a/sdk_assembly/src/main/resources/bin/dev_appserver.sh b/sdk_assembly/src/main/resources/bin/dev_appserver.sh index a793d8a42..24f7165fa 100755 --- a/sdk_assembly/src/main/resources/bin/dev_appserver.sh +++ b/sdk_assembly/src/main/resources/bin/dev_appserver.sh @@ -17,11 +17,6 @@ # Launches the Development AppServer. This utility allows developers # to test a Google App Engine application on their local workstation. -(>&2 echo \ -'The dev_appserver shipped with the standalone Java SDK is deprecated. Please -use the java_dev_appserver.sh shipped with the Cloud SDK instead. -https://cloud.google.com/appengine/docs/standard/java/download') - [[ -z "${DEBUG}" ]] || set -x # trace if $DEBUG env. var. is non-zero # Construct the absolute name of the SDK bin directory. diff --git a/sessiondata/pom.xml b/sessiondata/pom.xml index 718b269c3..03039a5dc 100644 --- a/sessiondata/pom.xml +++ b/sessiondata/pom.xml @@ -23,7 +23,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/shared_sdk/pom.xml b/shared_sdk/pom.xml index ba8e2dd9a..82a3cce4b 100644 --- a/shared_sdk/pom.xml +++ b/shared_sdk/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT jar diff --git a/utils/pom.xml b/utils/pom.xml index 59bccebdd..d8203af1f 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -21,7 +21,7 @@ com.google.appengine parent - 2.0.16-SNAPSHOT + 2.0.18-SNAPSHOT true diff --git a/utils/src/main/java/com/google/apphosting/utils/config/AppEngineWebXml.java b/utils/src/main/java/com/google/apphosting/utils/config/AppEngineWebXml.java index 5aaf93ff6..b717414cd 100644 --- a/utils/src/main/java/com/google/apphosting/utils/config/AppEngineWebXml.java +++ b/utils/src/main/java/com/google/apphosting/utils/config/AppEngineWebXml.java @@ -342,7 +342,8 @@ public boolean isJava11OrAbove() { return getRuntime().equals("google") || getRuntime().equals("googlelegacy") || getRuntime().equals("java11") - || getRuntime().equals("java17"); + || getRuntime().equals("java17") + || getRuntime().equals("java21"); } public void setRuntime(String runtime) {