Merge branch 'main' into renovate/gitpython-3.x

googleapis · Jan 23, 2025 · fa5d9ee · fa5d9ee
2 parents 4423ba8 + b99d97c
commit fa5d9ee
Show file tree

Hide file tree

Showing 52 changed files with 293 additions and 232 deletions.
diff --git a/.cloudbuild/graalvm/cloudbuild-test-a.yaml b/.cloudbuild/graalvm/cloudbuild-test-a.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.41.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.41.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.13.0'
 options:
   machineType: 'E2_HIGHCPU_8'

diff --git a/.cloudbuild/graalvm/cloudbuild-test-b.yaml b/.cloudbuild/graalvm/cloudbuild-test-b.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.41.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.41.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.13.0'
 options:
   machineType: 'E2_HIGHCPU_8'

diff --git a/.cloudbuild/graalvm/cloudbuild.yaml b/.cloudbuild/graalvm/cloudbuild.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _SHARED_DEPENDENCIES_VERSION: '3.41.1-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
+  _SHARED_DEPENDENCIES_VERSION: '3.41.2-SNAPSHOT' # {x-version-update:google-cloud-shared-dependencies:current}
   _JAVA_SHARED_CONFIG_VERSION: '1.13.0'
 steps:
   # GraalVM A build

diff --git a/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml b/.cloudbuild/library_generation/cloudbuild-library-generation-push.yaml
@@ -14,7 +14,7 @@
 
 timeout: 7200s # 2 hours
 substitutions:
-  _GAPIC_GENERATOR_JAVA_VERSION: '2.51.1-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
+  _GAPIC_GENERATOR_JAVA_VERSION: '2.51.2-SNAPSHOT' # {x-version-update:gapic-generator-java:current}
   _PRIVATE_IMAGE_NAME: "us-docker.pkg.dev/java-hermetic-build-prod/private-resources/java-library-generation"
   _PRIVATE_SHA_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:${COMMIT_SHA}"
   _PRIVATE_LATEST_IMAGE_ID: "${_PRIVATE_IMAGE_NAME}:latest"

diff --git a/.cloudbuild/library_generation/library_generation.Dockerfile b/.cloudbuild/library_generation/library_generation.Dockerfile
@@ -20,7 +20,7 @@ FROM docker.io/library/maven:3.9.9-eclipse-temurin-11-alpine@sha256:3bab9f2cd4fa
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.51.1-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.51.2-SNAPSHOT"
 # {x-version-update-end}
 
 RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

diff --git a/.cloudbuild/library_generation/library_generation_airlock.Dockerfile b/.cloudbuild/library_generation/library_generation_airlock.Dockerfile
@@ -21,7 +21,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f0
 WORKDIR /sdk-platform-java
 COPY . .
 # {x-version-update-start:gapic-generator-java:current}
-ENV DOCKER_GAPIC_GENERATOR_VERSION="2.51.1-SNAPSHOT"
+ENV DOCKER_GAPIC_GENERATOR_VERSION="2.51.2-SNAPSHOT"
 # {x-version-update-end}
 
 RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip

diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -3,4 +3,13 @@ bumpMinorPreMajor: true
 handleGHRelease: true
 primaryBranch: main
 manifest: true
-extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml"]
+extraFiles: ["WORKSPACE", ".cloudbuild/graalvm/cloudbuild.yaml", ".cloudbuild/graalvm/cloudbuild-test-a.yaml", ".cloudbuild/graalvm/cloudbuild-test-b.yaml", ".cloudbuild/library_generation/cloudbuild-library-generation-release.yaml", "generation_config.yaml"]
+branches:
+  - branch: 2.23.x
+    releaseType: java-backport
+    manifest: true
+    handleGHRelease: true
+  - branch: 2.40.x
+    releaseType: java-backport
+    manifest: true
+    handleGHRelease: true
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -2,37 +2,79 @@ rebaseMergeAllowed: true
 squashMergeAllowed: true
 mergeCommitAllowed: false
 branchProtectionRules:
-- pattern: main
-  isAdminEnforced: true
-  requiredApprovingReviewCount: 1
-  requiresCodeOwnerReviews: true
-  requiresStrictStatusChecks: false
-  requiredStatusCheckContexts:
-  - build(8) except for gapic-generator-java
-  - build(8) for gapic-generator-java
-  - build (11)
-  - build (17)
-  - cla/google
-  - compatibility
-  - graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
-  - graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
-  - graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
-  - graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
-  - graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
-  - graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
-  - library_generation
-  - library-generation-integration-test (java-hermetic-build-prod)
-  - library-generation-lint-python
-  - library-generation-lint-shell
-  - library-generation-unit-tests
-  - lint
-  - should-run-library-generation-tests
-  - showcase (11)
-  - showcase (17)
+  - pattern: main
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - build(8) except for gapic-generator-java
+      - build(8) for gapic-generator-java
+      - build (11)
+      - build (17)
+      - cla/google
+      - compatibility
+      - graalvm-presubmit-sdk-platform-java-a (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-b (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-a-downstream-kms (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-b-downstream-kms (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-a-downstream-kmsinventory (java-graalvm-ci-prod)
+      - graalvm-presubmit-sdk-platform-java-b-downstream-kmsinventory (java-graalvm-ci-prod)
+      - library_generation
+      - library-generation-integration-test (java-hermetic-build-prod)
+      - library-generation-lint-python
+      - library-generation-lint-shell
+      - library-generation-unit-tests
+      - lint
+      - should-run-library-generation-tests
+      - showcase (11)
+      - showcase (17)
+  - pattern: 2.23.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - build (8) except for gapic-generator-java
+      - build (8) for gapic-generator-java
+      - build (11)
+      - build (17)
+      - showcase (11)
+      - showcase (17)
+      - compatibility
+      - cla/google
+      - lint
+      - graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
+      - graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
+      - library-generation-integration-tests
+      - library-generation-lint-shell
+      - library-generation-lint-python
+      - should-run-library-generation-tests
+  - pattern: 2.40.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - build (8) except for gapic-generator-java
+      - build (8) for gapic-generator-java
+      - build (11)
+      - build (17)
+      - build(21) except self-service clients
+      - showcase (11)
+      - showcase (17)
+      - showcase-native
+      - compatibility
+      - cla/google
+      - lint
+      - graalvm-presubmit-sdk-platform-java-a (cloud-devrel-kokoro-resources)
+      - graalvm-presubmit-sdk-platform-java-b (cloud-devrel-kokoro-resources)
+      - library-generation-integration-tests
+      - library-generation-lint-shell
+      - library-generation-lint-python
+      - should-run-library-generation-tests
 permissionRules:
-- team: yoshi-admins
-  permission: admin
-- team: yoshi-java-admins
-  permission: admin
-- team: yoshi-java
-  permission: push
+  - team: cloud-java-team-teamsync
+    permission: admin
+  - team: cloud-java-bot
+    permission: write
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -214,7 +214,7 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        java: [ 11, 17, 21 ]
+        java: [ 11, 17, 21, 23 ]
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -256,36 +256,6 @@ jobs:
             --batch-mode \
             --no-transfer-progress
 
-  showcase-native:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v4
-      - uses: graalvm/setup-graalvm@v1
-        with:
-          version: '22.3.2'
-          java-version: '17'
-          components: 'native-image'
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-      - run: mvn -version
-      - run: native-image --version
-      - name: Install sdk-platform-java
-        run: mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip
-      - name: Parse showcase version
-        working-directory: showcase/gapic-showcase
-        run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
-      - name: Install showcase server
-        run: |
-          sudo mkdir -p /usr/src/showcase
-          sudo chown -R ${USER} /usr/src/
-          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
-          cd /usr/src/showcase/
-          tar -xf showcase-*
-          ./gapic-showcase run &
-          cd -
-      - name: Build native image
-        working-directory: showcase
-        run: mvn test -Pnative,-showcase -ntp -B
-
   showcase-clirr:
     if: ${{ github.base_ref != '' }} # Only execute on pull_request trigger event
     runs-on: ubuntu-22.04

diff --git a/.release-please-manifest.json b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "2.51.0"
+  ".": "2.51.1"
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,25 @@
 # Changelog
 
+## [2.51.1](https://github.com/googleapis/sdk-platform-java/compare/v2.51.0...v2.51.1) (2025-01-08)
+
+
+### Dependencies
+
+* update dependency com.google.guava:guava to v33.4.0-jre ([#3473](https://github.com/googleapis/sdk-platform-java/issues/3473)) ([453b897](https://github.com/googleapis/sdk-platform-java/commit/453b897aabf9a7abdb59e9ea18ac8f8196b9792a))
+* update dependency com.google.guava:guava-bom to v33.4.0-jre ([#3545](https://github.com/googleapis/sdk-platform-java/issues/3545)) ([07eb10e](https://github.com/googleapis/sdk-platform-java/commit/07eb10e848d73a2e8d1d39018e2ec31b881653c8))
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.37.0 ([#3471](https://github.com/googleapis/sdk-platform-java/issues/3471)) ([1f1c369](https://github.com/googleapis/sdk-platform-java/commit/1f1c369633f0ae9b5b512a2908befdcd1c9cb952))
+* update dependency net.bytebuddy:byte-buddy to v1.15.11 ([#3468](https://github.com/googleapis/sdk-platform-java/issues/3468)) ([fde27db](https://github.com/googleapis/sdk-platform-java/commit/fde27db7f7959953cf480abfa62dc7dc58ac445e))
+* update google api dependencies ([#3461](https://github.com/googleapis/sdk-platform-java/issues/3461)) ([12d9ff2](https://github.com/googleapis/sdk-platform-java/commit/12d9ff26e6ab905e6230703a671e188690ec1322))
+* update googleapis/java-cloud-bom digest to 03f6dcd ([#3465](https://github.com/googleapis/sdk-platform-java/issues/3465)) ([67f5ea2](https://github.com/googleapis/sdk-platform-java/commit/67f5ea23f50eaf57925cdf34d51c7b0bfcc67cf3))
+* update junit5 monorepo to v5.11.4 ([#3470](https://github.com/googleapis/sdk-platform-java/issues/3470)) ([164ebac](https://github.com/googleapis/sdk-platform-java/commit/164ebac30632ca8fd688781b4aaecc5eab932f77))
+* update netty dependencies to v4.1.116.final ([#3543](https://github.com/googleapis/sdk-platform-java/issues/3543)) ([d4fa54d](https://github.com/googleapis/sdk-platform-java/commit/d4fa54d8b25afeacc4c9675f4763a3bff311f595))
+* update repo-automation-bots digest to 8b7d94b ([#3458](https://github.com/googleapis/sdk-platform-java/issues/3458)) ([59f9e0a](https://github.com/googleapis/sdk-platform-java/commit/59f9e0a3a101d5425b0c751b39e6b784466e16b8))
+
+
+### Documentation
+
+* update development guide ([#3480](https://github.com/googleapis/sdk-platform-java/issues/3480)) ([9a65386](https://github.com/googleapis/sdk-platform-java/commit/9a65386dfc3146de4f9b36962caae2df0662ac98))
+
 ## [2.51.0](https://github.com/googleapis/sdk-platform-java/compare/v2.50.0...v2.51.0) (2024-12-12)
 
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -58,7 +58,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_ARTIFACTS")
 load("@io_grpc_grpc_java//:repositories.bzl", "IO_GRPC_GRPC_JAVA_OVERRIDE_TARGETS")
 
-_gapic_generator_java_version = "2.51.1-SNAPSHOT"  # {x-version-update:gapic-generator-java:current}
+_gapic_generator_java_version = "2.51.2-SNAPSHOT"  # {x-version-update:gapic-generator-java:current}
 
 maven_install(
     artifacts = [

diff --git a/api-common-java/pom.xml b/api-common-java/pom.xml
@@ -5,14 +5,14 @@
     <groupId>com.google.api</groupId>
     <artifactId>api-common</artifactId>
     <packaging>jar</packaging>
-    <version>2.42.1-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
+    <version>2.42.2-SNAPSHOT</version><!-- {x-version-update:api-common:current} -->
     <name>API Common</name>
     <description>Common utilities for Google APIs in Java</description>
 
     <parent>
         <groupId>com.google.api</groupId>
         <artifactId>gapic-generator-java-pom-parent</artifactId>
-        <version>2.51.1-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
+        <version>2.51.2-SNAPSHOT</version><!-- {x-version-update:gapic-generator-java:current} -->
         <relativePath>../gapic-generator-java-pom-parent</relativePath>
     </parent>
 

diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
@@ -31,22 +31,22 @@
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax</artifactId>
-                <version>2.59.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
+                <version>2.59.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-grpc</artifactId>
-                <version>2.59.1-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
+                <version>2.59.2-SNAPSHOT</version> <!-- {x-version-update:gax-grpc:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>gax-httpjson</artifactId>
-                <version>2.59.1-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
+                <version>2.59.2-SNAPSHOT</version> <!-- {x-version-update:gax:current} -->
             </dependency>
             <dependency>
                 <groupId>com.google.api</groupId>
                 <artifactId>api-common</artifactId>
-                <version>2.42.1-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
+                <version>2.42.2-SNAPSHOT</version> <!-- {x-version-update:api-common:current} -->
             </dependency>
         </dependencies>