Skip to content

Commit 50c04b0

Browse files
rmehta19rmehta19
committed
resolve merge conflict.
2 parents 1d1e8ef + 2725744 commit 50c04b0

File tree

49 files changed

+179
-161
lines changed

Some content is hidden

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

49 files changed

+179
-161
lines changed

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.44.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.14.4'
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 1 addition & 1 deletion
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.14.4'
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.44.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.14.4'
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'
2121
logging: CLOUD_LOGGING_ONLY

‎.cloudbuild/graalvm/cloudbuild.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_SHARED_DEPENDENCIES_VERSION: '3.44.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18-
_JAVA_SHARED_CONFIG_VERSION: '1.14.4'
17+
_SHARED_DEPENDENCIES_VERSION: '3.45.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
18+
_JAVA_SHARED_CONFIG_VERSION: '1.15.0'
1919
steps:
2020
# GraalVM A build
2121
- name: gcr.io/cloud-builders/docker

‎.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
timeout: 7200s # 2 hours
1616
substitutions:
17-
_GAPIC_GENERATOR_JAVA_VERSION: '2.54.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.55.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
1818
_PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
1919
_PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
2020
_PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

‎.cloudbuild/library_generation/library_generation.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-11-alpine@sha256:456f60c1643c
2020
WORKDIR /sdk-platform-java
2121
COPY . .
2222
# {x-version-update-start:gapic-generator-java:current}
23-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.54.1-SNAPSHOT"
23+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.1-SNAPSHOT"
2424
# {x-version-update-end}
2525

2626
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

‎.cloudbuild/library_generation/library_generation_airlock.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
2121
WORKDIR /sdk-platform-java
2222
COPY . .
2323
# {x-version-update-start:gapic-generator-java:current}
24-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.54.1-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.55.1-SNAPSHOT"
2525
# {x-version-update-end}
2626

2727
RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

0 commit comments

Comments
 (0)