Skip to content

Commit 55bdeff

Browse files
mpeddada1gcf-owl-bot[bot]
mpeddada1
and
gcf-owl-bot[bot]
authored
chore: use sdk-platform-java-config to consolidate build configs (googleapis#2865)
* chore: use sdk-platform-java-config to consolidate build configs * update trampoline images * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * fix property name * exclude graalvm cfg from owlbot --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 7349a2a commit 55bdeff

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

‎.kokoro/presubmit/graalvm-native-17.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm17:22.3.3"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.24.0"
77
}
88

99
env_vars: {

‎.kokoro/presubmit/graalvm-native.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Configure the docker image for kokoro-trampoline.
44
env_vars: {
55
key: "TRAMPOLINE_IMAGE"
6-
value: "gcr.io/cloud-devrel-kokoro-resources/graalvm:22.3.3"
6+
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.24.0"
77
}
88

99
env_vars: {

‎google-cloud-spanner-bom/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
10-
<artifactId>google-cloud-shared-config</artifactId>
11-
<version>1.6.1</version>
10+
<artifactId>sdk-platform-java-config</artifactId>
11+
<version>3.24.0</version>
1212
</parent>
1313

1414
<name>Google Cloud Spanner BOM</name>

‎owlbot.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
".kokoro/presubmit/java8-samples.cfg",
3434
".kokoro/presubmit/java11-samples.cfg",
3535
".kokoro/presubmit/samples.cfg",
36+
".kokoro/presubmit/graalvm-native.cfg",
37+
".kokoro/presubmit/graalvm-native-17.cfg",
3638
".kokoro/release/common.cfg",
3739
"samples/install-without-bom/pom.xml",
3840
"samples/snapshot/pom.xml",

‎pom.xml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
<parent>
1515
<groupId>com.google.cloud</groupId>
16-
<artifactId>google-cloud-shared-config</artifactId>
17-
<version>1.6.1</version>
16+
<artifactId>sdk-platform-java-config</artifactId>
17+
<version>3.24.0</version>
1818
</parent>
1919

2020
<developers>
@@ -54,7 +54,6 @@
5454
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5555
<github.global.server>github</github.global.server>
5656
<site.installationModule>google-cloud-spanner-parent</site.installationModule>
57-
<google.cloud.shared-dependencies.version>3.24.0</google.cloud.shared-dependencies.version>
5857
</properties>
5958

6059
<dependencyManagement>
@@ -116,7 +115,7 @@
116115
<dependency>
117116
<groupId>com.google.cloud</groupId>
118117
<artifactId>google-cloud-shared-dependencies</artifactId>
119-
<version>${google.cloud.shared-dependencies.version}</version>
118+
<version>${google-cloud-shared-dependencies.version}</version>
120119
<type>pom</type>
121120
<scope>import</scope>
122121
</dependency>

0 commit comments

Comments
 (0)