Skip to content

Commit ee01a20

Browse files
chore: merge main into generate-libraries-main
2 parents 6e5903e + 698375d commit ee01a20

File tree

51 files changed

+284
-260
lines changed

Some content is hidden

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

51 files changed

+284
-260
lines changed

.cloudbuild/graalvm/cloudbuild-test-a.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-
_SHARED_DEPENDENCIES_VERSION: '3.46.0' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.46.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-b.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-
_SHARED_DEPENDENCIES_VERSION: '3.46.0' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.46.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild-test-c.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-
_SHARED_DEPENDENCIES_VERSION: '3.46.0' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.46.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
options:
2020
machineType: 'E2_HIGHCPU_8'

.cloudbuild/graalvm/cloudbuild.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-
_SHARED_DEPENDENCIES_VERSION: '3.46.0' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.46.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.15.4'
1919
steps:
2020
# GraalVM A build

.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.56.0' # {x-version-update:gapic-generator-java:current}
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.56.2' # {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
@@ -21,7 +21,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-17-alpine@sha256:969014ee8852
2121
WORKDIR /sdk-platform-java
2222
COPY . .
2323
# {x-version-update-start:gapic-generator-java:current}
24-
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.56.0"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.56.2"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter

.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.56.0"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.56.2"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter

.github/release-please.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ extraFiles:
1010
- .cloudbuild/graalvm/cloudbuild-test-b.yaml
1111
- .cloudbuild/graalvm/cloudbuild-test-c.yaml
1212
- .cloudbuild/library_generation/cloudbuild-library-generation-release.yaml
13+
- hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-a.cfg
14+
- hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-b.cfg
15+
- hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg
1316
- generation_config.yaml
1417
branches:
1518
- branch: 2.23.x

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "2.56.0"
2+
".": "2.56.2"
33
}

CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Changelog
22

3+
## [2.56.2](https://github.com/googleapis/sdk-platform-java/compare/v2.56.1...v2.56.2) (2025-04-23)
4+
5+
6+
### Bug Fixes
7+
8+
* inline version update in kokoro templates ([#3762](https://github.com/googleapis/sdk-platform-java/issues/3762)) ([050aeab](https://github.com/googleapis/sdk-platform-java/commit/050aeab4e84b6333aa1d4658ba62dcc68818c374))
9+
* keep native image templates up to date ([#3759](https://github.com/googleapis/sdk-platform-java/issues/3759)) ([7dffab1](https://github.com/googleapis/sdk-platform-java/commit/7dffab1251268736c9bf05b7d4bfcca06ed6576a))
10+
11+
## [2.56.1](https://github.com/googleapis/sdk-platform-java/compare/v2.56.0...v2.56.1) (2025-04-23)
12+
13+
14+
### Bug Fixes
15+
16+
* match graalvm job names with internal configs ([#3755](https://github.com/googleapis/sdk-platform-java/issues/3755)) ([23b4b12](https://github.com/googleapis/sdk-platform-java/commit/23b4b1277e3675cad1ebaa32c1115e8050501a0d))
17+
* use java 17 in samples.yaml ([#3754](https://github.com/googleapis/sdk-platform-java/issues/3754)) ([2d5c5e2](https://github.com/googleapis/sdk-platform-java/commit/2d5c5e28f56cc4332efd511bf9018c966a7c0458))
18+
* use spotify formatter in hermetic build templates ([#3752](https://github.com/googleapis/sdk-platform-java/issues/3752)) ([65e29da](https://github.com/googleapis/sdk-platform-java/commit/65e29dacaf533be61f2a14cbb8adeea316750911))
19+
320
## [2.56.0](https://github.com/googleapis/sdk-platform-java/compare/v2.55.1...v2.56.0) (2025-04-18)
421

522

0 commit comments

Comments
 (0)