Merge branch 'master' of https://github.com/grpc/grpc-java into FixIssue-11194

Author: shivaspeaks

.bazelrc

@@ -1 +1 @@
-build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
+build --cxxopt=-std=c++17 --host_cxxopt=-std=c++17

.github/workflows/testing.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jre: [8, 11, 17]
+        jre: [8, 11, 17, 21]
       fail-fast: false # Should swap to true if we grow a large matrix
 
     steps:
@@ -81,7 +81,7 @@ jobs:
       matrix:
         bzlmod: [true, false]
     env:
-      USE_BAZEL_VERSION: 7.0.0
+      USE_BAZEL_VERSION: 7.7.1
 
     steps:
     - uses: actions/checkout@v4
@@ -102,6 +102,9 @@ jobs:
     - name: Run bazel build
       run: bazelisk build //... --enable_bzlmod=${{ matrix.bzlmod }}
 
+    - name: Run bazel test
+      run: bazelisk test //... --enable_bzlmod=${{ matrix.bzlmod }}
+
     - name: Run example bazel build
       run: bazelisk build //... --enable_bzlmod=${{ matrix.bzlmod }}
       working-directory: ./examples

.gitignore

@@ -31,6 +31,9 @@ MODULE.bazel.lock
 .gitignore
 bin
 
+# VsCode
+.vscode
+
 # OS X
 .DS_Store
 

BUILD.bazel

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+load("@com_google_protobuf//bazel:java_proto_library.bzl", "java_proto_library")
+load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
 load("@rules_jvm_external//:defs.bzl", "artifact")
 load(":java_grpc_library.bzl", "java_grpc_library")
 
@@ -33,7 +35,6 @@ java_library(
         "//api",
         "//protobuf",
         "//stub",
-        "//stub:javax_annotation",
         "@com_google_protobuf//:protobuf_java",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
@@ -47,7 +48,6 @@ java_library(
         "//api",
         "//protobuf-lite",
         "//stub",
-        "//stub:javax_annotation",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
     ],
@@ -67,6 +67,5 @@ java_library(
     visibility = ["//:__subpackages__"],
     exports = [
         artifact("com.google.auto.value:auto-value-annotations"),
-        artifact("org.apache.tomcat:annotations-api"),  # @Generated for Java 9+
     ],
 )

COMPILING.md

@@ -44,11 +44,11 @@ This section is only necessary if you are making changes to the code
 generation. Most users only need to use `skipCodegen=true` as discussed above.
 
 ### Build Protobuf
-The codegen plugin is C++ code and requires protobuf 21.7 or later.
+The codegen plugin is C++ code and requires protobuf 22.5 or later.
 
 For Linux, Mac and MinGW:
 ```
-$ PROTOBUF_VERSION=21.7
+$ PROTOBUF_VERSION=22.5
 $ curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v$PROTOBUF_VERSION/protobuf-all-$PROTOBUF_VERSION.tar.gz
 $ tar xzf protobuf-all-$PROTOBUF_VERSION.tar.gz
 $ cd protobuf-$PROTOBUF_VERSION

MAINTAINERS.md

@@ -11,8 +11,6 @@ for general contribution guidelines.
 - [ejona86](https://github.com/ejona86), Google LLC
 - [jdcormie](https://github.com/jdcormie), Google LLC
 - [kannanjgithub](https://github.com/kannanjgithub), Google LLC
-- [larry-safran](https://github.com/larry-safran), Google LLC
-- [markb74](https://github.com/markb74), Google LLC
 - [ran-su](https://github.com/ran-su), Google LLC
 - [sergiitk](https://github.com/sergiitk), Google LLC
 - [temawi](https://github.com/temawi), Google LLC
@@ -26,7 +24,9 @@ for general contribution guidelines.
 - [ericgribkoff](https://github.com/ericgribkoff)
 - [jiangtaoli2016](https://github.com/jiangtaoli2016)
 - [jtattermusch](https://github.com/jtattermusch)
+- [larry-safran](https://github.com/larry-safran)
 - [louiscryan](https://github.com/louiscryan)
+- [markb74](https://github.com/markb74)
 - [nicolasnoble](https://github.com/nicolasnoble)
 - [nmittler](https://github.com/nmittler)
 - [sanjaypujare](https://github.com/sanjaypujare)

MODULE.bazel

@@ -1,209 +1,159 @@
 module(
     name = "grpc-java",
+    version = "1.81.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
     compatibility_level = 0,
     repo_name = "io_grpc_grpc_java",
-    version = "1.73.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
 )
 
 # GRPC_DEPS_START
 IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.android:annotations:4.1.1.4",
-    "com.google.api.grpc:proto-google-common-protos:2.51.0",
-    "com.google.auth:google-auth-library-credentials:1.24.1",
-    "com.google.auth:google-auth-library-oauth2-http:1.24.1",
+    "com.google.api.grpc:proto-google-common-protos:2.63.2",
+    "com.google.auth:google-auth-library-credentials:1.41.0",
+    "com.google.auth:google-auth-library-oauth2-http:1.41.0",
     "com.google.auto.value:auto-value-annotations:1.11.0",
     "com.google.auto.value:auto-value:1.11.0",
     "com.google.code.findbugs:jsr305:3.0.2",
-    "com.google.code.gson:gson:2.11.0",
-    "com.google.errorprone:error_prone_annotations:2.30.0",
+    "com.google.code.gson:gson:2.12.1",
+    "com.google.errorprone:error_prone_annotations:2.45.0",
     "com.google.guava:failureaccess:1.0.1",
-    "com.google.guava:guava:33.3.1-android",
+    "com.google.guava:guava:33.5.0-android",
     "com.google.re2j:re2j:1.8",
-    "com.google.s2a.proto.v2:s2a-proto:0.1.1",
-    "com.google.truth:truth:1.4.2",
+    "com.google.s2a.proto.v2:s2a-proto:0.1.3",
+    "com.google.truth:truth:1.4.5",
     "com.squareup.okhttp:okhttp:2.7.5",
     "com.squareup.okio:okio:2.10.0",  # 3.0+ needs swapping to -jvm; need work to avoid flag-day
-    "io.netty:netty-buffer:4.1.110.Final",
-    "io.netty:netty-codec-http2:4.1.110.Final",
-    "io.netty:netty-codec-http:4.1.110.Final",
-    "io.netty:netty-codec-socks:4.1.110.Final",
-    "io.netty:netty-codec:4.1.110.Final",
-    "io.netty:netty-common:4.1.110.Final",
-    "io.netty:netty-handler-proxy:4.1.110.Final",
-    "io.netty:netty-handler:4.1.110.Final",
-    "io.netty:netty-resolver:4.1.110.Final",
-    "io.netty:netty-tcnative-boringssl-static:2.0.70.Final",
-    "io.netty:netty-tcnative-classes:2.0.70.Final",
-    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
-    "io.netty:netty-transport-native-unix-common:4.1.110.Final",
-    "io.netty:netty-transport:4.1.110.Final",
+    "io.netty:netty-buffer:4.1.130.Final",
+    "io.netty:netty-codec-http2:4.1.130.Final",
+    "io.netty:netty-codec-http:4.1.130.Final",
+    "io.netty:netty-codec-socks:4.1.130.Final",
+    "io.netty:netty-codec:4.1.130.Final",
+    "io.netty:netty-common:4.1.130.Final",
+    "io.netty:netty-handler-proxy:4.1.130.Final",
+    "io.netty:netty-handler:4.1.130.Final",
+    "io.netty:netty-resolver:4.1.130.Final",
+    "io.netty:netty-tcnative-boringssl-static:2.0.74.Final",
+    "io.netty:netty-tcnative-classes:2.0.74.Final",
+    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.130.Final",
+    "io.netty:netty-transport-native-unix-common:4.1.130.Final",
+    "io.netty:netty-transport:4.1.130.Final",
     "io.opencensus:opencensus-api:0.31.0",
     "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
     "io.perfmark:perfmark-api:0.27.0",
     "junit:junit:4.13.2",
-    "org.apache.tomcat:annotations-api:6.0.53",
-    "org.checkerframework:checker-qual:3.12.0",
-    "org.codehaus.mojo:animal-sniffer-annotations:1.24",
+    "org.checkerframework:checker-qual:3.49.5",
+    "org.codehaus.mojo:animal-sniffer-annotations:1.26",
 ]
 # GRPC_DEPS_END
 
+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", repo_name = "com_google_googleapis", version = "0.0.0-20240326-1c8d509c5")
-
-# CEL Spec may be removed when cncf/xds MODULE is no longer using protobuf 27.x
-bazel_dep(name = "cel-spec", repo_name = "dev_cel", version = "0.15.0")
-bazel_dep(name = "grpc", repo_name = "com_github_grpc_grpc", version = "1.56.3.bcr.1")
-bazel_dep(name = "grpc-proto", repo_name = "io_grpc_grpc_proto", version = "0.0.0-20240627-ec30f58")
-bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "23.1")
+bazel_dep(name = "googleapis", version = "0.0.0-20240326-1c8d509c5", 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 = "33.4", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_cc", version = "0.0.9")
-bazel_dep(name = "rules_java", version = "5.3.5")
-bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.46.0")
+bazel_dep(name = "rules_java", version = "9.1.0")
 bazel_dep(name = "rules_jvm_external", version = "6.0")
-bazel_dep(name = "rules_proto", version = "5.3.0-21.7")
-
-non_module_deps = use_extension("//:repositories.bzl", "grpc_java_repositories_extension")
-
-use_repo(
-    non_module_deps,
-    "com_github_cncf_xds",
-    "envoy_api",
-)
-
-grpc_repo_deps_ext = use_extension("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_repo_deps_ext")
-
-use_repo(
-    grpc_repo_deps_ext,
-    "com_envoyproxy_protoc_gen_validate",
-    "opencensus_proto",
-)
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
-
 maven.install(
     artifacts = IO_GRPC_GRPC_JAVA_ARTIFACTS,
     repositories = [
         "https://repo.maven.apache.org/maven2/",
     ],
     strict_visibility = True,
 )
-
 use_repo(maven, "maven")
 
 maven.override(
     coordinates = "com.google.protobuf:protobuf-java",
     target = "@com_google_protobuf//:protobuf_java",
 )
-
 maven.override(
     coordinates = "com.google.protobuf:protobuf-java-util",
     target = "@com_google_protobuf//:protobuf_java_util",
 )
-
 maven.override(
     coordinates = "com.google.protobuf:protobuf-javalite",
     target = "@com_google_protobuf//:protobuf_javalite",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-alts",
     target = "@io_grpc_grpc_java//alts",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-api",
     target = "@io_grpc_grpc_java//api",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-auth",
     target = "@io_grpc_grpc_java//auth",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-census",
     target = "@io_grpc_grpc_java//census",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-context",
     target = "@io_grpc_grpc_java//context",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-core",
     target = "@io_grpc_grpc_java//core:core_maven",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-googleapis",
     target = "@io_grpc_grpc_java//googleapis",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-grpclb",
     target = "@io_grpc_grpc_java//grpclb",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-inprocess",
     target = "@io_grpc_grpc_java//inprocess",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-netty",
     target = "@io_grpc_grpc_java//netty",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-netty-shaded",
     target = "@io_grpc_grpc_java//netty:shaded_maven",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-okhttp",
     target = "@io_grpc_grpc_java//okhttp",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-protobuf",
     target = "@io_grpc_grpc_java//protobuf",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-protobuf-lite",
     target = "@io_grpc_grpc_java//protobuf-lite",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-rls",
     target = "@io_grpc_grpc_java//rls",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-services",
     target = "@io_grpc_grpc_java//services:services_maven",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-stub",
     target = "@io_grpc_grpc_java//stub",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-testing",
     target = "@io_grpc_grpc_java//testing",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-xds",
     target = "@io_grpc_grpc_java//xds:xds_maven",
 )
-
 maven.override(
     coordinates = "io.grpc:grpc-util",
     target = "@io_grpc_grpc_java//util",
 )
-
-switched_rules = use_extension("@com_google_googleapis//:extensions.bzl", "switched_rules")
-
-switched_rules.use_languages(java = True)