Merge branch 'master' into HEAD

Turned back off compat repositories to swapping new targets to
artifact() in a less-noisy commit.

 Conflicts:
	BUILD.bazel
	WORKSPACE
	api/BUILD.bazel
	core/BUILD.bazel
	netty/BUILD.bazel
	okhttp/BUILD.bazel
	services/BUILD.bazel
	testing/BUILD.bazel
	xds/BUILD.bazel

Author: ejona86

.bazelrc

@@ -0,0 +1 @@
+build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14

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

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

.github/workflows/lock.yml

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

.github/workflows/testing.yml

@@ -17,18 +17,18 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        jre: [8, 11]
+        jre: [8, 11, 17]
       fail-fast: false # Should swap to true if we grow a large matrix
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         java-version: ${{ matrix.jre }}
         distribution: 'temurin'
 
     - name: Gradle cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
           ~/.gradle/caches
@@ -37,7 +37,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-gradle-
     - name: Maven cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: |
           ~/.m2/repository
@@ -46,7 +46,7 @@ jobs:
         restore-keys: |
           ${{ runner.os }}-maven-
     - name: Protobuf cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: /tmp/protobuf-cache
         key: ${{ runner.os }}-maven-${{ hashFiles('buildscripts/make_dependencies.sh') }}
@@ -55,16 +55,39 @@ jobs:
       run: buildscripts/kokoro/unix.sh
     - name: Post Failure Upload Test Reports to Artifacts
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: Test Reports (JRE ${{ matrix.jre }})
-        path: ./*/build/reports/tests/**
+        path: |
+          ./*/build/reports/tests/**
+          ./*/*/build/reports/tests/**
         retention-days: 14
     - name: Check for modified codegen
       run: test -z "$(git status --porcelain)" || (git status && echo Error Working directory is not clean. Forget to commit generated files? && false)
 
     - name: Coveralls
       if: matrix.jre == 8 # Upload once, instead of for each job in the matrix
-      run: ./gradlew :grpc-all:coveralls -x compileJava
+      env:
+        COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
+      run: ./gradlew :grpc-all:coveralls -PskipAndroid=true -x compileJava
     - name: Codecov
-      uses: codecov/codecov-action@v2
+      uses: codecov/codecov-action@v3
+
+  bazel:
+    runs-on: ubuntu-latest
+    env:
+      USE_BAZEL_VERSION: 6.0.0
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Bazel cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cache/bazel/*/cache
+          ~/.cache/bazelisk/downloads
+        key: ${{ runner.os }}-bazel-${{ env.USE_BAZEL_VERSION }}-${{ hashFiles('WORKSPACE', 'repositories.bzl') }}
+
+    - name: Run bazel build
+      run: bazelisk build //...

BUILD.bazel

@@ -65,5 +65,8 @@ java_library(
     exported_plugins = [":auto_value"],
     neverlink = 1,
     visibility = ["//:__subpackages__"],
-    exports = [artifact("com.google.auto.value:auto-value-annotations")],
+    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 3.21.1 or later.
+The codegen plugin is C++ code and requires protobuf 21.7 or later.
 
 For Linux, Mac and MinGW:
 ```
-$ PROTOBUF_VERSION=3.21.1
+$ PROTOBUF_VERSION=21.7
 $ 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
@@ -68,7 +68,7 @@ For Visual C++, please refer to the [Protobuf README](https://github.com/google/
 for how to compile Protobuf. gRPC-java assumes a Release build.
 
 #### Mac
-Some versions of Mac OS X (e.g., 10.10) doesn't have ``/usr/local`` in the
+Some versions of Mac OS X (e.g., 10.10) don't have ``/usr/local`` in the
 default search paths for header files and libraries. It will fail the build of
 the codegen. To work around this, you will need to set environment variables:
 ```

CONTRIBUTING.md

@@ -52,19 +52,6 @@ for reviewers:
   Project maintainers are obligated to squash those commits into one when
   merging.
 
-## Running tests
-
-### Jetty ALPN setup for IntelliJ
-
-The tests in interop-testing project require jetty-alpn agent running in the background
-otherwise they'll fail. Here are instructions on how to setup IntellJ IDEA to enable running
-those tests in IDE:
-
-* Settings -> Build Tools -> Gradle -> Runner -> select Gradle Test Runner
-* View -> Tool Windows -> Gradle -> Edit Run Configuration -> Defaults -> JUnit -> Before lauch -> + -> Run Gradle task, enter the task in the build.gradle that sets the javaagent.
-
-Step 1 must be taken, otherwise by the default JUnit Test Runner running a single test in IDE will trigger all the tests.
-
 ## Guidelines for Pull Requests
 How to get your contributions merged smoothly and quickly.
 

MAINTAINERS.md

@@ -9,7 +9,9 @@ for general contribution guidelines.
 
 ## Maintainers (in alphabetical order)
 - [ejona86](https://github.com/ejona86), Google LLC
+- [jdcormie](https://github.com/jdcormie), 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
 - [sanjaypujare](https://github.com/sanjaypujare), Google LLC
 - [sergiitk](https://github.com/sergiitk), Google LLC

README.md

@@ -1,13 +1,6 @@
 gRPC-Java - An RPC library and framework
 ========================================
 
-gRPC-Java works with JDK 8. gRPC-Java clients are supported on Android API
-levels 19 and up (KitKat and later). Deploying gRPC servers on an Android
-device is not supported.
-
-TLS usage typically requires using Java 8, or Play Services Dynamic Security
-Provider on Android. Please see the [Security Readme](SECURITY.md).
-
 <table>
   <tr>
     <td><b>Homepage:</b></td>
@@ -20,19 +13,39 @@ Provider on Android. Please see the [Security Readme](SECURITY.md).
 </table>
 
 [![Join the chat at https://gitter.im/grpc/grpc](https://badges.gitter.im/grpc/grpc.svg)](https://gitter.im/grpc/grpc?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-[![Build Status](https://travis-ci.org/grpc/grpc-java.svg?branch=master)](https://travis-ci.org/grpc/grpc-java)
+[![GitHub Actions Linux Testing](https://github.com/grpc/grpc-java/actions/workflows/testing.yml/badge.svg?branch=master)](https://github.com/grpc/grpc-java/actions/workflows/testing.yml?branch=master)
 [![Line Coverage Status](https://coveralls.io/repos/grpc/grpc-java/badge.svg?branch=master&service=github)](https://coveralls.io/github/grpc/grpc-java?branch=master)
 [![Branch-adjusted Line Coverage Status](https://codecov.io/gh/grpc/grpc-java/branch/master/graph/badge.svg)](https://codecov.io/gh/grpc/grpc-java)
 
+Supported Platforms
+-------------------
+
+gRPC-Java supports Java 8 and later. Android minSdkVersion 21 (Lollipop) and
+later are supported with [Java 8 language desugaring][android-java-8].
+
+TLS usage on Android typically requires Play Services Dynamic Security Provider.
+Please see the [Security Readme](SECURITY.md).
+
+Older Java versions are not directly supported, but a branch remains available
+for fixes and releases. See [gRFC P5 JDK Version Support
+Policy][P5-jdk-version-support].
+
+Java version | gRPC Branch
+------------ | -----------
+7            | 1.41.x
+
+[android-java-8]: https://developer.android.com/studio/write/java8-support#supported_features
+[P5-jdk-version-support]: https://github.com/grpc/proposal/blob/master/P5-jdk-version-support.md#proposal
+
 Getting Started
 ---------------
 
 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.49.0/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.49.0/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.62.2/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.62.2/examples/android)
 are standalone projects that showcase the usage of gRPC.
 
 Download
@@ -43,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.49.0</version>
+  <version>1.62.2</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.49.0</version>
+  <version>1.62.2</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.49.0</version>
+  <version>1.62.2</version>
 </dependency>
 <dependency> <!-- necessary for Java 9+ -->
   <groupId>org.apache.tomcat</groupId>
@@ -66,23 +79,27 @@ 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.49.0'
-implementation 'io.grpc:grpc-protobuf:1.49.0'
-implementation 'io.grpc:grpc-stub:1.49.0'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.62.2'
+implementation 'io.grpc:grpc-protobuf:1.62.2'
+implementation 'io.grpc:grpc-stub:1.62.2'
 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.49.0'
-implementation 'io.grpc:grpc-protobuf-lite:1.49.0'
-implementation 'io.grpc:grpc-stub:1.49.0'
+implementation 'io.grpc:grpc-okhttp:1.62.2'
+implementation 'io.grpc:grpc-protobuf-lite:1.62.2'
+implementation 'io.grpc:grpc-stub:1.62.2'
 compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 ```
 
+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.49.0
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.62.2
 
 Development snapshots are available in [Sonatypes's snapshot
 repository](https://oss.sonatype.org/content/repositories/snapshots/).
@@ -103,7 +120,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
     <extension>
       <groupId>kr.motd.maven</groupId>
       <artifactId>os-maven-plugin</artifactId>
-      <version>1.6.2</version>
+      <version>1.7.1</version>
     </extension>
   </extensions>
   <plugins>
@@ -112,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.21.1:exe:${os.detected.classifier}</protocArtifact>
+        <protocArtifact>com.google.protobuf:protoc:3.25.1:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.49.0:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.62.2:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -135,16 +152,16 @@ For non-Android protobuf-based codegen integrated with the Gradle build system,
 you can use [protobuf-gradle-plugin][]:
 ```gradle
 plugins {
-    id 'com.google.protobuf' version '0.8.18'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.21.1"
+    artifact = "com.google.protobuf:protoc:3.25.1"
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.49.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.62.2'
     }
   }
   generateProtoTasks {
@@ -168,16 +185,16 @@ use protobuf-gradle-plugin but specify the 'lite' options:
 
 ```gradle
 plugins {
-    id 'com.google.protobuf' version '0.8.18'
+    id 'com.google.protobuf' version '0.9.4'
 }
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.21.1"
+    artifact = "com.google.protobuf:protoc:3.25.1"
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.49.0'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.62.2'
     }
   }
   generateProtoTasks {
@@ -194,6 +211,11 @@ protobuf {
 
 ```
 
+For [Bazel](https://bazel.build), use the [`proto_library`](https://github.com/bazelbuild/rules_proto)
+and the [`java_proto_library`](https://bazel.build/reference/be/java#java_proto_library) (no `load()` required) 
+and `load("@io_grpc_grpc_java//:java_grpc_library.bzl", "java_grpc_library")` (from this project), as in
+[this example `BUILD.bazel`](https://github.com/grpc/grpc-java/blob/master/examples/BUILD.bazel).
+
 API Stability
 -------------
 
@@ -243,12 +265,15 @@ wire. The interfaces to it are abstract just enough to allow plugging in of
 different implementations. Note the transport layer API is considered internal
 to gRPC and has weaker API guarantees than the core API under package `io.grpc`.
 
-gRPC comes with three Transport implementations:
+gRPC comes with multiple Transport implementations:
 
-1. The Netty-based transport is the main transport implementation based on
-   [Netty](https://netty.io). It is for both the client and the server.
-2. The OkHttp-based transport is a lightweight transport based on
-   [OkHttp](https://square.github.io/okhttp/). It is mainly for use on Android
-   and is for client only.
+1. The Netty-based HTTP/2 transport is the main transport implementation based
+   on [Netty](https://netty.io). It is not officially supported on Android.
+2. The OkHttp-based HTTP/2 transport is a lightweight transport based on
+   [Okio](https://square.github.io/okio/) and forked low-level parts of
+   [OkHttp](https://square.github.io/okhttp/). It is mainly for use on Android.
 3. The in-process transport is for when a server is in the same process as the
-   client. It is useful for testing, while also being safe for production use.
+   client. It is used frequently for testing, while also being safe for
+   production use.
+4. The Binder transport is for Android cross-process communication on a single
+   device.