From 3090df9a78139c9e1f775802eea68a56879be48b Mon Sep 17 00:00:00 2001 From: Lai Jiang Date: Thu, 2 Nov 2023 10:08:14 -0400 Subject: [PATCH] Upgrade to Java 17 runtime (#2201) We finally fixed Spinnaker (I hope) to deploy bundled services with Java 17 runtime. Note that the bytecodes are still targeting Java 8. The only change this PR introduces is to switch the runtime environment to Java 17. TESTED=deployed to crash. --- .../registry/env/alpha/backend/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/alpha/default/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/alpha/pubapi/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/alpha/tools/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/crash/backend/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/crash/default/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/crash/pubapi/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/crash/tools/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/local/backend/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/local/default/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/local/pubapi/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/local/tools/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/production/backend/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/production/default/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/production/pubapi/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/production/tools/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/qa/backend/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/qa/default/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml | 4 ++-- .../google/registry/env/qa/tools/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/sandbox/backend/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/sandbox/default/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml | 4 ++-- .../registry/env/sandbox/tools/WEB-INF/appengine-web.xml | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml index 82d84abad..260b79ab5 100644 --- a/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/alpha/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 backend - true + true true B4 diff --git a/core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml index dfe7ac4d5..f486516f8 100644 --- a/core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/alpha/default/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 default - true + true true B4 diff --git a/core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml index 914df6906..02c92c317 100644 --- a/core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/alpha/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 pubapi - true + true true B4 diff --git a/core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml index eb0e5a938..339ef1b58 100644 --- a/core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/alpha/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 tools - true + true true B4 diff --git a/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml index e6070b5f0..66a7c22fa 100644 --- a/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/crash/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 backend - true + true true B4 diff --git a/core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml index fe8cff576..599553a84 100644 --- a/core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/crash/default/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 default - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml index c6c738bae..3beafc6e3 100644 --- a/core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/crash/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 pubapi - true + true true B4 diff --git a/core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml index 065d3624d..6020f0c7b 100644 --- a/core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/crash/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 tools - true + true true B4 diff --git a/core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml index 2cad41736..3ca4328c2 100644 --- a/core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/local/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 backend - true + true true B4 diff --git a/core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml index 361ba13e9..6f483b1ff 100644 --- a/core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/local/default/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 default - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml index 39bae1a9c..c3a4a43a0 100644 --- a/core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/local/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 pubapi - true + true true B4 diff --git a/core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml index 037d5769c..0f5bd2898 100644 --- a/core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/local/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 tools - true + true true B4 diff --git a/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml index d19733cd6..e59cb166e 100644 --- a/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 backend - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml index fd6b6b8e7..44b867b5e 100644 --- a/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/default/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 default - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml index 893a39aac..22922a18f 100644 --- a/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 pubapi - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml index 8ce6932fa..bdacaa04c 100644 --- a/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/production/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 tools - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml index f83f825b3..0f78e0339 100644 --- a/core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/qa/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 backend - true + true true B4 diff --git a/core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml index 0eeb4341c..7a5109044 100644 --- a/core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/qa/default/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 default - true + true true F4_1G diff --git a/core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml index 10fb323de..ae056986a 100644 --- a/core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/qa/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 pubapi - true + true true B4 diff --git a/core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml index 778d623e9..f5956e6b1 100644 --- a/core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/qa/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 tools - true + true true B4 diff --git a/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml index 2c430bfe2..fd3f24754 100644 --- a/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/backend/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 backend - true + true true B4 diff --git a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml index c7716f184..e03fd12af 100644 --- a/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/default/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 default - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml index e82dd364c..126835223 100644 --- a/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/pubapi/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 pubapi - true + true true B4_1G diff --git a/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml b/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml index 55a950088..8262a7ac8 100644 --- a/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml +++ b/core/src/main/java/google/registry/env/sandbox/tools/WEB-INF/appengine-web.xml @@ -1,9 +1,9 @@ - java8 + java17 tools - true + true true B4