Merge branch 'main' into fix-parsing-token

lqiu96 · web-flow · commit 9f8d07b9f247 · 2025-02-06T15:50:50.000-05:00
diff --git a/.github/workflows/members.json b/.github/workflows/members.json
@@ -123,5 +123,6 @@
 {"login":"erwinh85"},
 {"login":"CadillacBurgess1"},
 {"login":"julieqiu"},
-{"login":"coryan"}
+{"login":"coryan"},
+{"login":"devoncarew"}
 ]
diff --git a/.github/workflows/multi_approvers.yaml b/.github/workflows/multi_approvers.yaml
@@ -28,4 +28,4 @@ jobs:
   multi-approvers:
     uses: 'abcxyz/pkg/.github/workflows/multi-approvers.yml@main'
     with:
-      org-members-path: '.github/workflows/members.json'
+      org-members-path: 'googleapis/google-auth-library-java/main/.github/workflows/members.json'
diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg
@@ -44,6 +44,6 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.1"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.2"
 }
 
diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg
@@ -44,5 +44,5 @@ env_vars: {
 }
 
 container_properties {
-  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.1"
+  docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.2"
 }
diff --git a/pom.xml b/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.google.cloud</groupId>
     <artifactId>google-cloud-shared-config</artifactId>
-    <version>1.14.1</version>
+    <version>1.14.2</version>
   </parent>
 
   <distributionManagement>
diff --git a/renovate.json b/renovate.json
@@ -53,6 +53,12 @@
       "matchPackageNames": [
         "/^com.google.auto.value:auto-/"
       ]
+    },
+    {
+      "enabled": false,
+      "matchPackageNames": [
+        "/^com.google.protobuf:/"
+      ]
     }
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -123,5 +123,6 @@`
`123`	`123`	`{"login":"erwinh85"},`
`124`	`124`	`{"login":"CadillacBurgess1"},`
`125`	`125`	`{"login":"julieqiu"},`
`126`		`-{"login":"coryan"}`
	`126`	`+{"login":"coryan"},`
	`127`	`+{"login":"devoncarew"}`
`127`	`128`	`]`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,6 @@ env_vars: {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`container_properties {`
`47`		`- docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.1"`
	`47`	`+ docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:1.14.2"`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -44,5 +44,5 @@ env_vars: {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`container_properties {`
`47`		`- docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.1"`
	`47`	`+ docker_image: "us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:1.14.2"`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,12 @@`
`53`	`53`	`"matchPackageNames": [`
`54`	`54`	`"/^com.google.auto.value:auto-/"`
`55`	`55`	`]`
	`56`	`+ },`
	`57`	`+ {`
	`58`	`+ "enabled": false,`
	`59`	`+ "matchPackageNames": [`
	`60`	`+ "/^com.google.protobuf:/"`
	`61`	`+ ]`
`56`	`62`	`}`
`57`	`63`	`]`
`58`	`64`	`}`