From 81a86a3502622d05123c8e05dac132fc078a5afe Mon Sep 17 00:00:00 2001
From: Mridula <66699525+mpeddada1@users.noreply.github.com>
Date: Wed, 14 Feb 2024 18:24:29 +0000
Subject: [PATCH] chore: use sdk-platform-java-config to consolidate build
config (#1569)
* chore: use sdk-platform-java-config to consolidate build configs
* resolve merge conflict
* resolve merge conflict
---
.kokoro/presubmit/graalvm-native-17.cfg | 2 +-
.kokoro/presubmit/graalvm-native.cfg | 2 +-
google-cloud-firestore-bom/pom.xml | 4 ++--
pom.xml | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg
index 153377974..de8fdd873 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.25.0"
}
env_vars: {
diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg
index 278255698..c5900b44d 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.25.0"
}
env_vars: {
diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml
index d868a9ae9..a4c7a7ed2 100644
--- a/google-cloud-firestore-bom/pom.xml
+++ b/google-cloud-firestore-bom/pom.xml
@@ -7,8 +7,8 @@
pom
com.google.cloud
- google-cloud-shared-config
- 1.7.1
+ sdk-platform-java-config
+ 3.25.0
Google Cloud Firestore BOM
diff --git a/pom.xml b/pom.xml
index 4f4600fa9..5d2bd4dcf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
com.google.cloud
- google-cloud-shared-config
- 1.7.1
+ sdk-platform-java-config
+ 3.25.0
@@ -181,7 +181,7 @@
com.google.cloud
google-cloud-shared-dependencies
- 3.25.0
+ ${google-cloud-shared-dependencies.version}
pom
import