Skip to content

Commit 7484416

Browse files
suztomosuztomo
authored
Merge branch 'main' into dependabot/maven/java-shared-dependencies/unmanaged-dependency-check/org.apache.maven.shared-maven-shared-utils-3.3.3
2 parents 3e6a8e8 + 891119a commit 7484416

774 files changed

Lines changed: 960 additions & 905 deletions

File tree

Some content is hidden

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

‎.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.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
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.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
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.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
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.48.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.49.2' # {x-version-update:google-cloud-shared-dependencies:current}
1818
_JAVA_SHARED_CONFIG_VERSION: '1.16.0'
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.58.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.59.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: 2 additions & 2 deletions
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.58.1-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.59.2"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter
@@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
3737
FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final
3838

3939
ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
40-
ARG PROTOC_VERSION=25.5
40+
ARG PROTOC_VERSION=25.8
4141
ARG GRPC_VERSION=1.71.0
4242
ENV HOME=/home
4343
ENV OS_ARCHITECTURE="linux-x86_64"

‎.cloudbuild/library_generation/library_generation_airlock.Dockerfile‎

Lines changed: 2 additions & 2 deletions
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.58.1-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.59.2"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter
@@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
3838
FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final
3939

4040
ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
41-
ARG PROTOC_VERSION=25.5
41+
ARG PROTOC_VERSION=25.8
4242
ARG GRPC_VERSION=1.71.0
4343
ENV HOME=/home
4444
ENV OS_ARCHITECTURE="linux-x86_64"

‎.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.58.0"
2+
".": "2.59.2"
33
}

‎CHANGELOG.md‎

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

3+
## [2.59.2](https://github.com/googleapis/sdk-platform-java/compare/v2.59.1...v2.59.2) (2025-06-17)
4+
5+
6+
### Bug Fixes
7+
8+
* update googleapis commit at Thu Jun 12 02:34:24 UTC 2025 ([f3a5d87](https://github.com/googleapis/sdk-platform-java/commit/f3a5d87ed2b5ab1acddd1bf362d11d6ccf3d22b4))
9+
* update googleapis commit at Thu Jun 12 02:34:24 UTC 2025 ([#3833](https://github.com/googleapis/sdk-platform-java/issues/3833)) ([f3a5d87](https://github.com/googleapis/sdk-platform-java/commit/f3a5d87ed2b5ab1acddd1bf362d11d6ccf3d22b4))
10+
11+
## [2.59.1](https://github.com/googleapis/sdk-platform-java/compare/v2.59.0...v2.59.1) (2025-06-12)
12+
13+
14+
### Bug Fixes
15+
16+
* S2A- Check if a default endpoint has been set ([#3784](https://github.com/googleapis/sdk-platform-java/issues/3784)) ([5b2ab82](https://github.com/googleapis/sdk-platform-java/commit/5b2ab829888631caa382621570910187de45ce1c))
17+
18+
19+
### Dependencies
20+
21+
* update google auth library dependencies to v1.37.0 ([#3830](https://github.com/googleapis/sdk-platform-java/issues/3830)) ([8bf9d3c](https://github.com/googleapis/sdk-platform-java/commit/8bf9d3cbe0be80d0bd15dfb896514103293002e0))
22+
23+
## [2.59.0](https://github.com/googleapis/sdk-platform-java/compare/v2.58.0...v2.59.0) (2025-06-02)
24+
25+
26+
### Features
27+
28+
* add logic to set universe domain to ServiceAccountJwtAccessCredentials ([#3806](https://github.com/googleapis/sdk-platform-java/issues/3806)) ([5b45708](https://github.com/googleapis/sdk-platform-java/commit/5b45708d5ff92aae8e4138a737d294c71e1f235a))
29+
* use debian base image for `java-library-generation` ([#3817](https://github.com/googleapis/sdk-platform-java/issues/3817)) ([94d0b30](https://github.com/googleapis/sdk-platform-java/commit/94d0b30d94d79c74125811bf7353afe917e2fe6c))
30+
31+
32+
### Bug Fixes
33+
34+
* manage graalvm image versions via Hermetic Build templates _only_ ([#3800](https://github.com/googleapis/sdk-platform-java/issues/3800)) ([244c5dc](https://github.com/googleapis/sdk-platform-java/commit/244c5dce9f77d0b431d2ec3ea5b101b07dcc3d70))
35+
36+
37+
### Dependencies
38+
39+
* update dependency com.google.oauth-client:google-oauth-client-bom to v1.39.0 ([#3813](https://github.com/googleapis/sdk-platform-java/issues/3813)) ([196a7ca](https://github.com/googleapis/sdk-platform-java/commit/196a7cab502b5570f458f4cf4b324b99265e368c))
40+
* update google api dependencies ([#3791](https://github.com/googleapis/sdk-platform-java/issues/3791)) ([45ef2e0](https://github.com/googleapis/sdk-platform-java/commit/45ef2e0d595ab71555b0eee780962b08d2f073b6))
41+
* update google auth library dependencies to v1.36.0 ([#3814](https://github.com/googleapis/sdk-platform-java/issues/3814)) ([07f834a](https://github.com/googleapis/sdk-platform-java/commit/07f834a61201639ae771c179a229f7b5f794774d))
42+
* update grpc dependencies to 1.71.0 ([#3807](https://github.com/googleapis/sdk-platform-java/issues/3807)) ([49a7ae5](https://github.com/googleapis/sdk-platform-java/commit/49a7ae50071e75fe0d161a4eb9360a4fe4e6147b))
43+
* Upgrade Protobuf-Java to v3.25.8 ([#3810](https://github.com/googleapis/sdk-platform-java/issues/3810)) ([ab90662](https://github.com/googleapis/sdk-platform-java/commit/ab90662288a2181e16ecfb19c9ebb38fb9e29422))
44+
345
## [2.58.0](https://github.com/googleapis/sdk-platform-java/compare/v2.57.0...v2.58.0) (2025-05-13)
446

547

‎WORKSPACE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
5858
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
5959
load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
6060

61-
_gapic_generator_java_version = "2.58.1-SNAPSHOT" # {x-version-update:gapic-generator-java:current}
61+
_gapic_generator_java_version = "2.59.2" # {x-version-update:gapic-generator-java:current}
6262

6363
maven_install(
6464
artifacts = [

0 commit comments

Comments
 (0)