From ac9372ffc4e2a2b672073cc3dbb1e130dbe0e08d Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Mon, 29 Jan 2024 12:57:48 -0500
Subject: [PATCH 1/4] chore: use sdk-platform-shared-config to consolidate
 build configs

---
 .kokoro/presubmit/graalvm-native-17.cfg |  2 +-
 .kokoro/presubmit/graalvm-native.cfg    |  2 +-
 pom.xml                                 |  6 +++---
 renovate.json                           | 11 +++++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index fb5bb678f..5009a42da 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.23.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 59efee340..5eb6bb824 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.23.0"
 }
 
 env_vars: {
diff --git a/pom.xml b/pom.xml
index 2876ae482..14a911791 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
 
   <parent>
     <groupId>com.google.cloud</groupId>
-    <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.7.1</version>
+    <artifactId>sdk-platform-java-config</artifactId>
+    <version>3.23.0</version>
   </parent>
 
   <developers>
@@ -77,7 +77,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.23.0</version>
+        <version>${google-cloud-shared-dependencies.version}</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/renovate.json b/renovate.json
index 24af58815..05c031c41 100644
--- a/renovate.json
+++ b/renovate.json
@@ -14,6 +14,17 @@
     ".kokoro/requirements.txt",
     ".github/workflows/**"
   ],
+  "customManagers": [
+    {
+      "customType": "regex",
+      "fileMatch": [
+        "^.kokoro/presubmit/graalvm-native.*.cfg$"
+      ],
+      "matchStrings": ["value: \"gcr.io/cloud-devrel-public-resources/graalvm.*:(?<currentValue>.*?)\""],
+      "depNameTemplate": "com.google.cloud:sdk-platform-java-config",
+      "datasourceTemplate": "maven"
+    }
+  ],
   "packageRules": [
     {
       "packagePatterns": [

From d8ffd8fc787e50a86521d04356f8b43dea8687e5 Mon Sep 17 00:00:00 2001
From: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Date: Wed, 31 Jan 2024 15:11:41 +0000
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?=
 =?UTF-8?q?st-processor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md
---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 5009a42da..fb5bb678f 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.23.0"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 5eb6bb824..59efee340 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.23.0"
+  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
 }
 
 env_vars: {

From 7d17384af3312904f01fb43a13dfcfb2797b99b6 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 31 Jan 2024 10:34:26 -0500
Subject: [PATCH 3/4] exclude graal cfgs from owlbot

---
 owlbot.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/owlbot.py b/owlbot.py
index b4bdf53bc..66c43071f 100644
--- a/owlbot.py
+++ b/owlbot.py
@@ -94,7 +94,9 @@
         ".github/blunderbuss.yml",
         "CONTRIBUTING.md",
         ".kokoro/requirements.in",
-        ".kokoro/requirements.txt"
+        ".kokoro/requirements.txt",
+        ".kokoro/presubmit/graalvm-native.cfg",
+        ".kokoro/presubmit/graalvm-native-17.cfg"
     ]
 )
 

From 6ded4a287c0fc95e961d2bc63155a10a95099cd1 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Wed, 31 Jan 2024 10:36:06 -0500
Subject: [PATCH 4/4] restore changes deleted by owlbot

---
 .kokoro/presubmit/graalvm-native-17.cfg | 2 +-
 .kokoro/presubmit/graalvm-native.cfg    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index fb5bb678f..3b2ffca27 100644
--- a/.kokoro/presubmit/graalvm-native-17.cfg
+++ b/.kokoro/presubmit/graalvm-native-17.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.22.0"
 }
 
 env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 59efee340..d6d66e1d6 100644
--- a/.kokoro/presubmit/graalvm-native.cfg
+++ b/.kokoro/presubmit/graalvm-native.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.22.0"
 }
 
 env_vars: {