Merge branch 'main' into singe-channel-creds

Author: rmehta19

.cloudbuild/library_generation/library_generation.Dockerfile

@@ -38,7 +38,7 @@ FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad31690
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.8
-ARG GRPC_VERSION=1.76.0
+ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.cloudbuild/library_generation/library_generation_airlock.Dockerfile

@@ -39,7 +39,7 @@ FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc
 
 ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
 ARG PROTOC_VERSION=25.8
-ARG GRPC_VERSION=1.76.0
+ARG GRPC_VERSION=1.76.1
 ENV HOME=/home
 ENV OS_ARCHITECTURE="linux-x86_64"
 

.github/release-please.yml

@@ -18,6 +18,11 @@ extraFiles:
     hermetic_build/library_generation/owlbot/templates/java_library/.kokoro/presubmit/graalvm-native-c.cfg
   - generation_config.yaml
 branches:
+  - branch: protobuf-4.x-rc
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    manifest: true
+    releaseType: java-yoshi
   - branch: 2.23.x
     releaseType: java-backport
     manifest: true

.github/workflows/ci.yaml

@@ -402,7 +402,7 @@ jobs:
         working-directory: java-showcase
         run: |
           mvn versions:set -B -ntp -DnewVersion=local
-          mvn clirr:check -B -ntp -Dclirr.skip=false -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
+          mvn clirr:check -B -ntp -DcomparisonVersion=$SHOWCASE_CLIENT_VERSION
 
   gapic-generator-java-bom:
     runs-on: ubuntu-22.04

.gitignore

@@ -13,11 +13,12 @@ target/
 *.vim
 
 # Vscode Settings
-.vscode/settings.json
+.vscode
 
 # Python
 **/__pycache__/
 .venv
+.python-version
 
 # library generation
 **/googleapis

gapic-generator-java-pom-parent/pom.xml

@@ -27,7 +27,7 @@
     <!-- External dependencies, especially gRPC and Protobuf version, should be
         consistent across modules in this repository -->
     <javax.annotation-api.version>1.3.2</javax.annotation-api.version>
-    <grpc.version>1.76.0</grpc.version>
+    <grpc.version>1.76.1</grpc.version>
     <google.auth.version>1.40.0</google.auth.version>
     <google.http-client.version>2.0.2</google.http-client.version>
     <gson.version>2.12.1</gson.version>

gax-java/dependencies.properties

@@ -28,7 +28,7 @@ version.gax_httpjson=2.72.2-SNAPSHOT
 
 version.com_google_protobuf=3.25.8
 version.google_java_format=1.15.0
-version.io_grpc=1.76.0
+version.io_grpc=1.76.1
 
 # Maven artifacts.
 # Note, the actual name of each property matters (bazel build scripts depend on it).

java-showcase/gapic-showcase/pom.xml

@@ -18,7 +18,9 @@
 
   <properties>
     <gapic-showcase.version>0.36.2</gapic-showcase.version>
+    <!-- This is the last version supporting slf4j 1.x, do not upgrade -->
     <slf4j1-logback.version>1.2.13</slf4j1-logback.version>
+    <slf4j2-logback.version>1.5.21</slf4j2-logback.version>
   </properties>
 
   <build>
@@ -244,13 +246,13 @@
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.5.16</version>
+          <version>${slf4j2-logback.version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
-          <version>1.5.16</version>
+          <version>${slf4j2-logback.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>
@@ -333,13 +335,13 @@
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-classic</artifactId>
-          <version>1.2.13</version>
+          <version>${slf4j1-logback.version}</version>
           <scope>test</scope>
         </dependency>
         <dependency>
           <groupId>ch.qos.logback</groupId>
           <artifactId>logback-core</artifactId>
-          <version>1.3.15</version>
+          <version>${slf4j1-logback.version}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>