Merge branch 'grpc:master' into onResult2_resolutionResultHaveAddress…

…esOrError

.github/workflows/gradle-wrapper-validation.yml

@@ -9,5 +9,5 @@ jobs:
     name: "Gradle wrapper validation"
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
+      - uses: actions/checkout@v4
+      - uses: gradle/actions/wrapper-validation@v4

.github/workflows/lock.yml

@@ -13,7 +13,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v4
+      - uses: dessant/lock-threads@v5
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: 90

.github/workflows/testing.yml

@@ -21,14 +21,14 @@ jobs:
       fail-fast: false # Should swap to true if we grow a large matrix
 
     steps:
-    - uses: actions/checkout@v3
-    - uses: actions/setup-java@v3
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.jre }}
         distribution: 'temurin'
 
     - name: Gradle cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.gradle/caches
@@ -37,7 +37,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
     - name: Maven cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.m2/repository
@@ -46,7 +46,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Protobuf cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: /tmp/protobuf-cache
         key: ${{ runner.os }}-maven-${{ hashFiles('buildscripts/make_dependencies.sh') }}
@@ -55,7 +55,7 @@ jobs:
       run: buildscripts/kokoro/unix.sh
     - name: Post Failure Upload Test Reports to Artifacts
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Test Reports (JRE ${{ matrix.jre }})
         path: |
@@ -71,23 +71,25 @@ jobs:
         COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
       run: ./gradlew :grpc-all:coveralls -PskipAndroid=true -x compileJava
     - name: Codecov
-      uses: codecov/codecov-action@v3
+      uses: codecov/codecov-action@v4
+      with:
+        token: ${{ secrets.CODECOV_TOKEN }}
 
   bazel:
     runs-on: ubuntu-latest
     env:
       USE_BAZEL_VERSION: 6.0.0
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Check versions match in MODULE.bazel and repositories.bzl
       run: |
         diff -u <(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' MODULE.bazel) \
                 <(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' repositories.bzl)
 
     - name: Bazel cache
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: |
           ~/.cache/bazel/*/cache

CONTRIBUTING.md

@@ -30,43 +30,36 @@ style configurations are commonly useful. For IntelliJ 14, copy the style to
 `~/.IdeaIC14/config/codestyles/`, start IntelliJ, go to File > Settings > Code
 Style, and set the Scheme to `GoogleStyle`.
 
-## Maintaining clean commit history
-
-We have few conventions for keeping history clean and making code reviews easier
-for reviewers:
-
-* First line of commit messages should be in format of
-
-  `package-name: summary of change`
-
-  where the summary finishes the sentence: `This commit improves gRPC to ____________.`
-
-  for example:
-
-  `core,netty,interop-testing: add capacitive duractance to turbo encabulators`
-
-* Every time you receive a feedback on your pull request, push changes that
-  address it as a separate one or multiple commits with a descriptive commit
-  message (try avoid using vauge `addressed pr feedback` type of messages).
-
-  Project maintainers are obligated to squash those commits into one when
-  merging.
-
 ## Guidelines for Pull Requests
 How to get your contributions merged smoothly and quickly.
 
 - Create **small PRs** that are narrowly focused on **addressing a single concern**. We often times receive PRs that are trying to fix several things at a time, but only one fix is considered acceptable, nothing gets merged and both author's & review's time is wasted. Create more PRs to address different concerns and everyone will be happy.
 
-- For speculative changes, consider opening an issue and discussing it first. If you are suggesting a behavioral or API change, consider starting with a [gRFC proposal](https://github.com/grpc/proposal). 
-
-- Provide a good **PR description** as a record of **what** change is being made and **why** it was made. Link to a github issue if it exists.
-
-- Don't fix code style and formatting unless you are already changing that line to address an issue. PRs with irrelevant changes won't be merged. If you do want to fix formatting or style, do that in a separate PR.
-
-- Unless your PR is trivial, you should expect there will be reviewer comments that you'll need to address before merging. We expect you to be reasonably responsive to those comments, otherwise the PR will be closed after 2-3 weeks of inactivity.
-
-- Maintain **clean commit history** and use **meaningful commit messages**. See [maintaining clean commit history](#maintaining-clean-commit-history) for details.
-
+- For speculative changes, consider opening an issue and discussing it to avoid
+  wasting time on an inappropriate approach. If you are suggesting a behavioral
+  or API change, consider starting with a [gRFC
+  proposal](https://github.com/grpc/proposal).
+
+- Follow [typical Git commit message](https://cbea.ms/git-commit/#seven-rules)
+  structure. Have a good **commit description** as a record of **what** and
+  **why** the change is being made. Link to a GitHub issue if it exists. The
+  commit description makes a good PR description and is auto-copied by GitHub if
+  you have a single commit when creating the PR.
+
+  If your change is mostly for a single module (e.g., other module changes are
+  trivial), prefix your commit summary with the module name changed. Instead of
+  "Add HTTP/2 faster-than-light support to gRPC Netty" it is more terse as
+  "netty: Add faster-than-light support".
+
+- Don't fix code style and formatting unless you are already changing that line
+  to address an issue. If you do want to fix formatting or style, do that in a
+  separate PR.
+
+- Unless your PR is trivial, you should expect there will be reviewer comments
+  that you'll need to address before merging. Address comments with additional
+  commits so the reviewer can review just the changes; do not squash reviewed
+  commits unless the reviewer agrees. PRs are squashed when merging.
+
 - Keep your PR up to date with upstream/master (if there are merge conflicts, we can't really merge your change).
 
 - **All tests need to be passing** before your change can be merged. We recommend you **run tests locally** before creating your PR to catch breakages early on. Also, `./gradlew build` (`gradlew build` on Windows) **must not introduce any new warnings**.

MODULE.bazel

@@ -2,7 +2,7 @@ module(
     name = "grpc-java",
     compatibility_level = 0,
     repo_name = "io_grpc_grpc_java",
-    version = "1.66.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
+    version = "1.68.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
 )
 
 # GRPC_DEPS_START
@@ -22,31 +22,34 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
     "com.google.truth:truth:1.4.2",
     "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.100.Final",
-    "io.netty:netty-codec-http2:4.1.100.Final",
-    "io.netty:netty-codec-http:4.1.100.Final",
-    "io.netty:netty-codec-socks:4.1.100.Final",
-    "io.netty:netty-codec:4.1.100.Final",
-    "io.netty:netty-common:4.1.100.Final",
-    "io.netty:netty-handler-proxy:4.1.100.Final",
-    "io.netty:netty-handler:4.1.100.Final",
-    "io.netty:netty-resolver:4.1.100.Final",
-    "io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
-    "io.netty:netty-tcnative-classes:2.0.61.Final",
-    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
-    "io.netty:netty-transport-native-unix-common:4.1.100.Final",
-    "io.netty:netty-transport:4.1.100.Final",
+    "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.65.Final",
+    "io.netty:netty-tcnative-classes:2.0.65.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.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",
 ]
 # GRPC_DEPS_END
 
 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")

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.65.0/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.65.0/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.67.1/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.67.1/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -56,18 +56,18 @@ 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.65.0</version>
+  <version>1.67.1</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.65.0</version>
+  <version>1.67.1</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.65.0</version>
+  <version>1.67.1</version>
 </dependency>
 <dependency> <!-- necessary for Java 9+ -->
   <groupId>org.apache.tomcat</groupId>
@@ -79,18 +79,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
 
 Or for Gradle with non-Android, add to your dependencies:
 ```gradle
-runtimeOnly 'io.grpc:grpc-netty-shaded:1.65.0'
-implementation 'io.grpc:grpc-protobuf:1.65.0'
-implementation 'io.grpc:grpc-stub:1.65.0'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.67.1'
+implementation 'io.grpc:grpc-protobuf:1.67.1'
+implementation 'io.grpc:grpc-stub:1.67.1'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
 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.65.0'
-implementation 'io.grpc:grpc-protobuf-lite:1.65.0'
-implementation 'io.grpc:grpc-stub:1.65.0'
+implementation 'io.grpc:grpc-okhttp:1.67.1'
+implementation 'io.grpc:grpc-protobuf-lite:1.67.1'
+implementation 'io.grpc:grpc-stub:1.67.1'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
@@ -99,7 +99,7 @@ For [Bazel](https://bazel.build), you can either
 (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.65.0
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.67.1
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://oss.sonatype.org/content/repositories/snapshots/).
@@ -129,9 +129,9 @@ For protobuf-based codegen integrated with the Maven build system, you can use
       <artifactId>protobuf-maven-plugin</artifactId>
       <version>0.6.1</version>
       <configuration>
-        <protocArtifact>com.google.protobuf:protoc:3.25.1:exe:${os.detected.classifier}</protocArtifact>
+        <protocArtifact>com.google.protobuf:protoc:3.25.3:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.65.0:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.67.1:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -157,11 +157,11 @@ plugins {
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.25.1"
+    artifact = "com.google.protobuf:protoc:3.25.3"
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.65.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.67.1'
     }
   }
   generateProtoTasks {
@@ -190,11 +190,11 @@ plugins {
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.25.1"
+    artifact = "com.google.protobuf:protoc:3.25.3"
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.65.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.67.1'
     }
   }
   generateProtoTasks {

RELEASING.md

@@ -65,7 +65,7 @@ would be used to create all `v1.7` tags (e.g. `v1.7.0`, `v1.7.1`).
    ```bash
    git fetch upstream
    git checkout -b v$MAJOR.$MINOR.x \
-     $(git log --pretty=format:%H --grep "^Start $MAJOR.$((MINOR+1)).0 development cycle$" upstream/master)^
+     $(git log --pretty=format:%H --grep "^Start $MAJOR.$((MINOR+1)).0 development cycle" upstream/master)^
    git push upstream v$MAJOR.$MINOR.x
    ```
 5. Continue with Google-internal steps at go/grpc-java/releasing, but stop
@@ -132,7 +132,9 @@ Tagging the Release
      compiler/src/test{,Lite}/golden/Test{,Deprecated}Service.java.txt
    ./gradlew build
    git commit -a -m "Bump version to $MAJOR.$MINOR.$((PATCH+1))-SNAPSHOT"
+   git push -u origin release-v$MAJOR.$MINOR.$PATCH
    ```
+   Raise a PR and set the base branch of the PR to v$MAJOR.$MINOR.x of the upstream grpc-java repo.
 6. Go through PR review and push the release tag and updated release branch to
    GitHub (DO NOT click the merge button on the GitHub page):
 

SECURITY.md

@@ -398,7 +398,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
 1.56.x             | 4.1.87.Final          | 2.0.61.Final
 1.57.x-1.58.x      | 4.1.93.Final          | 2.0.61.Final
 1.59.x             | 4.1.97.Final          | 2.0.61.Final
-1.60.x-            | 4.1.100.Final         | 2.0.61.Final
+1.60.x-1.66.x      | 4.1.100.Final         | 2.0.61.Final
+1.67.x             | 4.1.110.Final         | 2.0.65.Final
 
 _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
 

alts/BUILD.bazel

@@ -19,7 +19,6 @@ java_library(
         "@com_google_protobuf//:protobuf_java_util",
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("io.netty:netty-buffer"),
         artifact("io.netty:netty-codec"),
         artifact("io.netty:netty-common"),
@@ -45,7 +44,6 @@ java_library(
         artifact("com.google.auth:google-auth-library-oauth2-http"),
         artifact("com.google.code.findbugs:jsr305"),
         artifact("com.google.guava:guava"),
-        artifact("com.google.j2objc:j2objc-annotations"),
         artifact("io.netty:netty-common"),
         artifact("io.netty:netty-handler"),
         artifact("io.netty:netty-transport"),

android-interop-testing/build.gradle

@@ -69,7 +69,6 @@ dependencies {
 
     implementation project(':grpc-android'),
             project(':grpc-core'),
-            project(':grpc-auth'),
             project(':grpc-census'),
             project(':grpc-okhttp'),
             project(':grpc-protobuf-lite'),
@@ -81,10 +80,6 @@ dependencies {
             libraries.androidx.test.rules,
             libraries.opencensus.contrib.grpc.metrics
 
-    implementation (libraries.google.auth.oauth2Http) {
-        exclude group: 'org.apache.httpcomponents'
-    }
-
     implementation (project(':grpc-services')) {
         exclude group: 'com.google.protobuf'
         exclude group: 'com.google.guava'
@@ -116,7 +111,6 @@ import net.ltgt.gradle.errorprone.CheckSeverity
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += [
             "-Xlint:-cast",
-            "-Xlint:-deprecation", // https://github.com/grpc/grpc-java/issues/10298
     ]
     appendToProperty(it.options.errorprone.excludedPaths, ".*/R.java", "|")
     appendToProperty(