Skip to content

Commit 70f9346

Browse files
mpeddada1mpeddada1
authored
Merge branch 'main' into renovate/googleapis-java-cloud-bom-digest
2 parents d9209eb + c624b89 commit 70f9346

File tree

52 files changed

+983
-112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+983
-112
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -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-a.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.39.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -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

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.30.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY
@@ -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.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.39.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
timeout: 7200s # 2 hours
1616
substitutions:
1717
_SHARED_DEPENDENCIES_VERSION: '3.39.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.11.3'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.12.0'
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker

‎.cloudbuild/graalvm/graalvm_a.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515

1616
ARG JAVA_SHARED_CONFIG_VERSION
1717

18-
FROM gcr.io/cloud-devrel-public-resources/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
18+
FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_a:$JAVA_SHARED_CONFIG_VERSION
1919

‎.cloudbuild/graalvm/graalvm_b.Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@
1515

1616
ARG JAVA_SHARED_CONFIG_VERSION
1717

18-
FROM gcr.io/cloud-devrel-public-resources/graalvm_b:$JAVA_SHARED_CONFIG_VERSION
18+
FROM us-docker.pkg.dev/java-graalvm-ci-prod/graalvm-integration-testing/graalvm_b:$JAVA_SHARED_CONFIG_VERSION

‎.github/sync-repo-settings.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ branchProtectionRules:
1414
- build (17)
1515
- cla/google
1616
- compatibility
17-
- graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
18-
- graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
17+
- graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
18+
- graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
19+
- graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
20+
- graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
21+
- graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
22+
- graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
1923
- library_generation
2024
- library-generation-integration-tests
2125
- library-generation-lint-python

‎WORKSPACE

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ maven_install(
6565
"com.google.api:gapic-generator-java:" + _gapic_generator_java_version,
6666
] + PROTOBUF_MAVEN_ARTIFACTS + IO_GRPC_GRPC_JAVA_ARTIFACTS,
6767
fail_on_missing_checksum = False,
68-
override_targets = IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS,
6968
repositories = [
7069
"m2Local",
7170
"https://repo.maven.apache.org/maven2/",

‎gapic-generator-java-pom-parent/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<parent>
1616
<groupId>com.google.cloud</groupId>
1717
<artifactId>google-cloud-shared-config</artifactId>
18-
<version>1.11.3</version>
18+
<version>1.12.0</version>
1919
<relativePath/>
2020
</parent>
2121

‎gax-java/dependencies.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ version.io_grpc=1.68.1
3737
# 2) Replace all characters which are neither alphabetic nor digits with the underscore ('_') character
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
40-
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.29.0
40+
maven.com_google_auth_google_auth_library_oauth2_http=com.google.auth:google-auth-library-oauth2-http:1.30.0
4141
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

‎gax-java/gax-bom/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>com.google.cloud</groupId>
1313
<artifactId>google-cloud-shared-config</artifactId>
14-
<version>1.11.3</version>
14+
<version>1.12.0</version>
1515
<relativePath/>
1616
</parent>
1717

‎gax-java/gax-grpc/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ _COMPILE_DEPS = [
2828
"@io_grpc_grpc_netty_shaded//jar",
2929
"@io_grpc_grpc_grpclb//jar",
3030
"@io_grpc_grpc_java//alts:alts",
31+
"@io_grpc_grpc_java//s2a:s2av2_credentials",
3132
"@io_netty_netty_tcnative_boringssl_static//jar",
3233
"@javax_annotation_javax_annotation_api//jar",
3334
"//gax:gax",

‎gax-java/gax-grpc/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
<groupId>io.grpc</groupId>
6464
<artifactId>grpc-protobuf</artifactId>
6565
</dependency>
66+
<dependency>
67+
<groupId>io.grpc</groupId>
68+
<artifactId>grpc-s2a</artifactId>
69+
</dependency>
6670
<dependency>
6771
<groupId>io.grpc</groupId>
6872
<artifactId>grpc-stub</artifactId>

0 commit comments

Comments
 (0)