8000 Merge branch 'main' into grpc-channel-using-s2a · rmehta19/sdk-platform-java@33faba1 · GitHub
[go: up one dir, main page]
Skip to content

Commit 33faba1

Browse files
rmehta19rmehta19
committed
Merge branch 'main' into grpc-channel-using-s2a
2 parents 8bf770d + 4c5a43c commit 33faba1

File tree

6 files changed

+9
-6
lines changed

6 files changed

+9
-6
lines changed

‎.cloudbuild/graalvm/cloudbuild-test-a-downstream-kms.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ steps:
4545
id: native-java-kms
4646
env:
4747
- 'MODULES_UNDER_TEST=java-kms'
48-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

‎.cloudbuild/graalvm/cloudbuild-test-a-downstream-kmsinventory.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ steps:
4545
id: native-java-kmsinventory
4646
env:
4747
- 'MODULES_UNDER_TEST=java-kmsinventory'
48-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

‎.cloudbuild/graalvm/cloudbuild-test-b-downstream-kms.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ steps:
4444
waitFor: [ "graalvm-b-build" ]
4545
env:
4646
- 'MODULES_UNDER_TEST=java-kms'
47-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
47+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

‎.cloudbuild/graalvm/cloudbuild-test-b-downstream-kmsinventory.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ steps:
4545
id: native-java-kmsinventory
4646
env:
4747
- 'MODULES_UNDER_TEST=java-kmsinventory'
48-
- 'GOOGLE_CLOUD_PROJECT=cloud-java-ci-test'
48+
- 'GOOGLE_CLOUD_PROJECT=java-graalvm-ci-prod'

‎gax-java/dependencies.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ version.io_grpc=1.68.1
3838
maven.com_google_api_grpc_proto_google_common_protos=com.google.api.grpc:proto-google-common-protos:2.46.0
3939
maven.com_google_api_grpc_grpc_google_common_protos=com.google.api.grpc:grpc-google-common-protos:2.46.0
4040
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.29.0
41-
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.29.0
41+
maven.com_google_auth_google_auth_library_credentials=com.google.auth:google-auth-library-credentials:1.30.0
4242
maven.io_opentelemetry_opentelemetry_api=io.opentelemetry:opentelemetry-api:1.42.1
4343
maven.io_opencensus_opencensus_api=io.opencensus:opencensus-api:0.31.1
4444
maven.io_opencensus_opencensus_contrib_grpc_metrics=io.opencensus:opencensus-contrib-grpc-metrics:0.31.1

‎gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
Args = --enable-url-protocols=https,http \
22
--initialize-at-build-time=org.conscrypt,\
3-
org.junit.platform.engine.TestTag \
3+
org.junit.platform.engine.TestTag,\
4+
com.google.api.gax.core.GaxProperties,\
5+
com.google.common.base.Platform,\
6+
com.google.common.base.Platform$JdkPatternCompiler \
47
--features=com.google.api.gax.nativeimage.OpenCensusFeature,\
58
com.google.api.gax.nativeimage.GoogleJsonClientFeature \
69
--add-modules=jdk.httpserver

0 commit comments

Comments
 (0)
0