Merge remote-tracking branch 'origin/master' into ext-proc-server

# Conflicts:
#	xds/src/main/java/io/grpc/xds/ExternalProcessorClientInterceptor.java
#	xds/src/test/java/io/grpc/xds/ExternalProcessorClientInterceptorTest.java
#	xds/third_party/envoy/src/main/proto/envoy/service/ext_proc/v3/external_processor.proto

Author: kannanjgithub

MODULE.bazel

@@ -1,6 +1,6 @@
 module(
     name = "grpc-java",
-    version = "1.84.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
+    version = "1.85.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
     repo_name = "io_grpc_grpc_java",
 )
 
@@ -54,7 +54,7 @@ bazel_dep(name = "bazel_jar_jar", version = "0.1.11.bcr.1")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "googleapis", version = "0.0.0-20260514-1dbb1a14", repo_name = "com_google_googleapis")
 bazel_dep(name = "grpc-proto", version = "0.0.0-20240627-ec30f58.bcr.1", repo_name = "io_grpc_grpc_proto")
-bazel_dep(name = "protobuf", version = "35.1", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "36.0.bcr.1", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_proto", version = "7.1.0")
 bazel_dep(name = "rules_android", version = "0.7.3")
 bazel_dep(name = "rules_cc", version = "0.0.9")

README.md

@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
 guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
 basics](https://grpc.io/docs/languages/java/basics).
 
-The [examples](https://github.com/grpc/grpc-java/tree/v1.83.1/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.83.1/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.84.0/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.84.0/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -56,42 +56,42 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-netty-shaded</artifactId>
-  <version>1.83.1</version>
+  <version>1.84.0</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.83.1</version>
+  <version>1.84.0</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.83.1</version>
+  <version>1.84.0</version>
 </dependency>
 ```
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-runtimeOnly 'io.grpc:grpc-netty-shaded:1.83.1'
-implementation 'io.grpc:grpc-protobuf:1.83.1'
-implementation 'io.grpc:grpc-stub:1.83.1'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.84.0'
+implementation 'io.grpc:grpc-protobuf:1.84.0'
+implementation 'io.grpc:grpc-stub:1.84.0'
 ```
 
 For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
 `grpc-protobuf-lite` instead of `grpc-protobuf`:
 ```gradle
-implementation 'io.grpc:grpc-okhttp:1.83.1'
-implementation 'io.grpc:grpc-protobuf-lite:1.83.1'
-implementation 'io.grpc:grpc-stub:1.83.1'
+implementation 'io.grpc:grpc-okhttp:1.84.0'
+implementation 'io.grpc:grpc-protobuf-lite:1.84.0'
+implementation 'io.grpc:grpc-stub:1.84.0'
 ```
 
 For [Bazel](https://bazel.build), you can either
 [use Maven](https://github.com/bazelbuild/rules_jvm_external)
 (with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
 
 [the JARs]:
-https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.83.1
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.84.0
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://central.sonatype.com/repository/maven-snapshots/).
@@ -123,7 +123,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <configuration>
         <protocArtifact>com.google.protobuf:protoc:3.25.8:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.83.1:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.84.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -153,7 +153,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.83.1'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.84.0'
     }
   }
   generateProtoTasks {
@@ -186,7 +186,7 @@ protobuf {
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.83.1'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.84.0'
     }
   }
   generateProtoTasks {

SECURITY.md

@@ -400,7 +400,10 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
 1.75.x-1.76.x      | 4.1.124.Final         | 2.0.72.Final
 1.77.x-1.78.x      | 4.1.127.Final         | 2.0.74.Final
 1.79.x-1.80.x      | 4.1.130.Final         | 2.0.74.Final
-1.81.x-            | 4.2.16.Final          | 2.0.81.Final
+1.81.x             | 4.1.132.Final         | 2.0.75.Final
+1.82.x             | 4.1.133.Final         | 2.0.75.Final
+1.83.x             | 4.2.15.Final          | 2.0.75.Final
+1.84.x-            | 4.2.16.Final          | 2.0.81.Final
 
 _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
 

auth/BUILD.bazel

@@ -11,7 +11,6 @@ java_library(
         "//api",
         artifact("com.google.auth:google-auth-library-credentials"),
         artifact("com.google.code.findbugs:jsr305"),
-        artifact("com.google.code.gson:gson"),
         artifact("com.google.guava:guava"),
     ],
 )

auth/build.gradle

@@ -17,8 +17,7 @@ tasks.named("jar").configure {
 dependencies {
     api project(':grpc-api'),
             libraries.google.auth.credentials
-    implementation libraries.guava,
-            libraries.gson
+    implementation libraries.guava
     testImplementation project(':grpc-testing'),
             project(':grpc-core'),
             project(":grpc-context"), // Override google-auth dependency with our newer version