Skip to content

Commit b5d1c6c

Browse files
cloud-java-botcloud-java-bot
committed
chore: merge main into generate-libraries-main
2 parents a132bc5 + deb8161 commit b5d1c6c

File tree

115 files changed

+39606
-168
lines changed

Some content is hidden

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

115 files changed

+39606
-168
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.4-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.47.0' # {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.4-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.47.0' # {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.4-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.47.0' # {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.4-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
17+
_SHARED_DEPENDENCIES_VERSION: '3.47.0' # {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.4-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
17+
_GAPIC_GENERATOR_JAVA_VERSION: '2.57.0' # {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.4-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.57.0"
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.4-SNAPSHOT"
24+
ENV DOCKER_GAPIC_GENERATOR_VERSION="2.57.0"
2525
# {x-version-update-end}
2626

2727
# Download the java formatter

‎.github/workflows/ci.yaml‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,62 @@ jobs:
213213
# testlib modules of gax
214214
run: mvn package clirr:check -DskipTests -Dfmt.skip
215215

216+
build-java8-showcase:
217+
name: "build(8) for showcase"
218+
runs-on: ubuntu-22.04
219+
steps:
220+
- uses: actions/checkout@v4
221+
- uses: actions/setup-java@v4
222+
with:
223+
java-version: 11
224+
distribution: temurin
225+
cache: maven
226+
- name: Install all modules using Java 11
227+
shell: bash
228+
run: |
229+
mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip
230+
- uses: actions/setup-java@v3
231+
with:
232+
java-version: 8
233+
distribution: temurin
234+
- run: java -version
235+
- name: Parse showcase version
236+
working-directory: java-showcase/gapic-showcase
237+
run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
238+
- name: Install showcase server
239+
run: |
240+
sudo mkdir -p /usr/src/showcase
241+
sudo chown -R ${USER} /usr/src/
242+
curl --location https://github.com/googleapis/gapic-showcase/releases/download/v${{env.SHOWCASE_VERSION}}/gapic-showcase-${{env.SHOWCASE_VERSION}}-linux-amd64.tar.gz --output /usr/src/showcase/showcase-${{env.SHOWCASE_VERSION}}-linux-amd64.tar.gz
243+
cd /usr/src/showcase/
244+
tar -xf showcase-*
245+
./gapic-showcase run &
246+
cd -
247+
- name: Showcase integration tests
248+
working-directory: java-showcase
249+
run: |
250+
mvn verify \
251+
-P enable-integration-tests \
252+
--batch-mode \
253+
--no-transfer-progress
254+
# The `slf4j1_logback` profile brings logging dependency and compiles logging tests, require env var to be set
255+
- name: Showcase integration tests - Logging SLF4J 1.x
256+
working-directory: java-showcase
257+
run: |
258+
mvn clean verify -P '!showcase,enable-integration-tests,loggingTestBase,slf4j1_logback' \
259+
--batch-mode \
260+
--no-transfer-progress
261+
# Set the Env Var for this step only
262+
env:
263+
GOOGLE_SDK_JAVA_LOGGING: true
264+
# The `disabledLogging` profile tests logging disabled when logging dependency present,
265+
# do not set env var for this step
266+
- name: Showcase integration tests - Logging disabed
267+
working-directory: java-showcase
268+
run: |
269+
mvn clean verify -P '!showcase,enable-integration-tests,loggingTestBase,disabledLogging' \
270+
--batch-mode \
271+
--no-transfer-progress
216272
showcase:
217273
runs-on: ubuntu-22.04
218274
strategy:

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

‎CHANGELOG.md‎

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

3+
## [2.57.0](https://github.com/googleapis/sdk-platform-java/compare/v2.56.3...v2.57.0) (2025-05-05)
4+
5+
6+
### Features
7+
8+
* Generate IAM v3beta Client Library ([#3780](https://github.com/googleapis/sdk-platform-java/issues/3780)) ([6fc9656](https://github.com/googleapis/sdk-platform-java/commit/6fc965638ce5df58db0b04726ee0aa3afe99c485))
9+
10+
11+
### Bug Fixes
12+
13+
* Update IAM v3 groupId to the correct value ([#3777](https://github.com/googleapis/sdk-platform-java/issues/3777)) ([6ecbf5f](https://github.com/googleapis/sdk-platform-java/commit/6ecbf5f1c7731536089bdc255200beb85b1c3586))
14+
315
## [2.56.3](https://github.com/googleapis/sdk-platform-java/compare/v2.56.2...v2.56.3) (2025-05-02)
416

517

0 commit comments

Comments
 (0)