Merge pull request #8 from grpc/master

Author: tonyjongyoonan

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.54.1/examples) and the
-[Android example](https://github.com/grpc/grpc-java/tree/v1.54.1/examples/android)
+The [examples](https://github.com/grpc/grpc-java/tree/v1.56.0/examples) and the
+[Android example](https://github.com/grpc/grpc-java/tree/v1.56.0/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.54.1</version>
+  <version>1.56.0</version>
   <scope>runtime</scope>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-protobuf</artifactId>
-  <version>1.54.1</version>
+  <version>1.56.0</version>
 </dependency>
 <dependency>
   <groupId>io.grpc</groupId>
   <artifactId>grpc-stub</artifactId>
-  <version>1.54.1</version>
+  <version>1.56.0</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.54.1'
-implementation 'io.grpc:grpc-protobuf:1.54.1'
-implementation 'io.grpc:grpc-stub:1.54.1'
+runtimeOnly 'io.grpc:grpc-netty-shaded:1.56.0'
+implementation 'io.grpc:grpc-protobuf:1.56.0'
+implementation 'io.grpc:grpc-stub:1.56.0'
 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.54.1'
-implementation 'io.grpc:grpc-protobuf-lite:1.54.1'
-implementation 'io.grpc:grpc-stub:1.54.1'
+implementation 'io.grpc:grpc-okhttp:1.56.0'
+implementation 'io.grpc:grpc-protobuf-lite:1.56.0'
+implementation 'io.grpc:grpc-stub:1.56.0'
 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.54.1
+https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.56.0
 
 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.21.7:exe:${os.detected.classifier}</protocArtifact>
+        <protocArtifact>com.google.protobuf:protoc:3.22.3:exe:${os.detected.classifier}</protocArtifact>
         <pluginId>grpc-java</pluginId>
-        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.54.1:exe:${os.detected.classifier}</pluginArtifact>
+        <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.56.0:exe:${os.detected.classifier}</pluginArtifact>
       </configuration>
       <executions>
         <execution>
@@ -157,11 +157,11 @@ plugins {
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.21.7"
+    artifact = "com.google.protobuf:protoc:3.22.3"
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.54.1'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.56.0'
     }
   }
   generateProtoTasks {
@@ -190,11 +190,11 @@ plugins {
 
 protobuf {
   protoc {
-    artifact = "com.google.protobuf:protoc:3.21.7"
+    artifact = "com.google.protobuf:protoc:3.22.3"
   }
   plugins {
     grpc {
-      artifact = 'io.grpc:protoc-gen-grpc-java:1.54.1'
+      artifact = 'io.grpc:protoc-gen-grpc-java:1.56.0'
     }
   }
   generateProtoTasks {

RELEASING.md

@@ -141,39 +141,70 @@ Tagging the Release
    ```
 7. Close the release milestone.
 
-Build Artifacts
----------------
+8. Trigger build as described in "Auto releasing using kokoro" at
+   go/grpc/java/releasing.
+
+    It runs three jobs on Kokoro, one on each platform. See their scripts:
+    `linux_artifacts.sh`, `windows.bat`, and `macos.sh`. The mvn-artifacts/
+    outputs of each script is combined into a single folder and then processed
+    by `upload_artifacts.sh`, which signs the files and uploads to Sonatype.
+
+9. Once all of the artifacts have been pushed to the staging repository, the
+   repository should have been closed by `upload_artifacts.sh`. Closing triggers
+   several sanity checks on the repository. If this completes successfully, the
+   repository can then be `released`, which will begin the process of pushing
+   the new artifacts to Maven Central (the staging repository will be destroyed
+   in the process). You can see the complete process for releasing to Maven
+   Central on the [OSSRH site](https://central.sonatype.org/pages/releasing-the-deployment.html).
+
+10. We have containers for each release to detect compatibility regressions with
+    old releases. Generate one for the new release by following the [GCR image
+    generation instructions][gcr-image]. Summary:
+    ```bash
+    # If you haven't previously configured docker:
+    gcloud auth configure-docker
+
+    # In main grpc repo, add the new version to matrix
+    ${EDITOR:-nano -w} tools/interop_matrix/client_matrix.py
+    tools/interop_matrix/create_matrix_images.py --git_checkout --release=v$MAJOR.$MINOR.$PATCH \
+        --upload_images --language java
+    docker pull gcr.io/grpc-testing/grpc_interop_java:v$MAJOR.$MINOR.$PATCH
+    docker_image=gcr.io/grpc-testing/grpc_interop_java:v$MAJOR.$MINOR.$PATCH \
+        tools/interop_matrix/testcases/java__master
+
+    # Commit the changes
+    git commit --all -m "Add grpc-java $MAJOR.$MINOR.$PATCH to client_matrix.py"
+
+    # Create a PR and run ad-hoc test against your PR
+    ```
+[gcr-image]: https://github.com/grpc/grpc/blob/master/tools/interop_matrix/README.md#step-by-step-instructions-for-adding-a-gcr-image-for-a-new-release-for-compatibility-test
+
+11. Update gh-pages with the new Javadoc. Generally the file is on repo1
+    15 minutes after publishing:
+
+    ```bash
+    git checkout gh-pages
+    git pull --ff-only upstream gh-pages
+    rm -r javadoc/
+    wget -O grpc-all-javadoc.jar "https://repo1.maven.org/maven2/io/grpc/grpc-all/$MAJOR.$MINOR.$PATCH/grpc-all-$MAJOR.$MINOR.$PATCH-javadoc.jar"
+    unzip -d javadoc grpc-all-javadoc.jar
+    patch -p1 < ga.patch
+    rm grpc-all-javadoc.jar
+    rm -r javadoc/META-INF/
+    git add -A javadoc
+    git commit -m "Javadoc for $MAJOR.$MINOR.$PATCH"
+    ```
+
+    Push gh-pages to the main repository and verify the current version is
+    [live on grpc.io](https://grpc.io/grpc-java/javadoc/).
+
+12. Add [Release Notes](https://github.com/grpc/grpc-java/releases) for the new tag.
+    *Make sure that any backports are reflected in the release notes.*
 
-Trigger build as described in "Auto releasing using kokoro" at
-go/grpc/java/releasing.
-
-It runs three jobs on Kokoro, one on each platform. See their scripts:
-`linux_artifacts.sh`, `windows.bat`, and `unix.sh` (called directly for OS X;
-called within the Docker environment on Linux). The mvn-artifacts/ outputs of
-each script is combined into a single folder and then processed by
-`upload_artifacts.sh`, which signs the files and uploads to Sonatype.
-
-Releasing on Maven Central
---------------------------
-
-Once all of the artifacts have been pushed to the staging repository, the
-repository should have been closed by `upload_artifacts.sh`. Closing triggers
-several sanity checks on the repository. If this completes successfully, the
-repository can then be `released`, which will begin the process of pushing the
-new artifacts to Maven Central (the staging repository will be destroyed in the
-process). You can see the complete process for releasing to Maven Central on the
-[OSSRH site](https://central.sonatype.org/pages/releasing-the-deployment.html).
-
-Build interop container image
------------------------------
-
-We have containers for each release to detect compatibility regressions with old
-releases. Generate one for the new release by following the
-[GCR image generation instructions](https://github.com/grpc/grpc/blob/master/tools/interop_matrix/README.md#step-by-step-instructions-for-adding-a-gcr-image-for-a-new-release-for-compatibility-test).
 
 Update README.md
 ----------------
-After waiting ~1 day and verifying that the release appears on [Maven
+After waiting ~1 day and verifying that the release is indexed on [Maven
 Central](https://search.maven.org/search?q=g:io.grpc), cherry-pick the commit
 that updated the README into the master branch.
 
@@ -183,14 +214,6 @@ $ git cherry-pick v$MAJOR.$MINOR.$PATCH^
 $ git push --set-upstream origin bump-readme
 ```
 
-NOTE: If you add to your ~/.gitconfig the following, you don't need the
-`--set-upstream`
-
-```text
-[push]
-	autoSetupRemote = true
-```
-
 Create a PR and go through the review process
 
 Update version referenced by tutorials
@@ -202,35 +225,7 @@ of the grpc.io repository.
 
 Notify the Community
 --------------------
-Finally, document and publicize the release.
-
-1. Add [Release Notes](https://github.com/grpc/grpc-java/releases) for the new tag.
-   The description should include any major fixes or features since the last release.
-   You may choose to add links to bugs, PRs, or commits if appropriate.
-2. Post a release announcement to [grpc-io](https://groups.google.com/forum/#!forum/grpc-io)
-   (`[email protected]`). The title should be something that clearly identifies
-   the release (e.g.`GRPC-Java <tag> Released`).
-   - Note that there may have been backports to the release branch since you
-     generated the release notes. Please verify that any backports are reflected
-     in the release notes before sending them out.
-
-Update Hosted Javadoc
----------------------
-
-Now we need to update gh-pages with the new Javadoc:
-
-```bash
-git checkout gh-pages
-git pull --ff-only upstream gh-pages
-rm -r javadoc/
-wget -O grpc-all-javadoc.jar "http://search.maven.org/remotecontent?filepath=io/grpc/grpc-all/$MAJOR.$MINOR.$PATCH/grpc-all-$MAJOR.$MINOR.$PATCH-javadoc.jar"
-unzip -d javadoc grpc-all-javadoc.jar
-patch -p1 < ga.patch
-rm grpc-all-javadoc.jar
-rm -r javadoc/META-INF/
-git add -A javadoc
-git commit -m "Javadoc for $MAJOR.$MINOR.$PATCH"
-```
-
-Push gh-pages to the main repository and verify the current version is [live
-on grpc.io](https://grpc.io/grpc-java/javadoc/).
+Post a release announcement to [grpc-io](https://groups.google.com/forum/#!forum/grpc-io)
+(`[email protected]`) with the title `gRPC-Java v$MAJOR.$MINOR.$PATCH
+Released`. The email content should link to the GitHub release notes and include
+a copy of them.

SECURITY.md

@@ -394,7 +394,9 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
 1.44.x-1.47.x      | 4.1.72.Final          | 2.0.46.Final
 1.48.x-1.49.x      | 4.1.77.Final          | 2.0.53.Final
 1.50.x-1.53.x      | 4.1.79.Final          | 2.0.54.Final
-1.54.x-            | 4.1.87.Final          | 2.0.56.Final
+1.54.x-1.55.x      | 4.1.87.Final          | 2.0.56.Final
+1.56.x             | 4.1.87.Final          | 2.0.61.Final
+1.57.x-            | 4.1.94.Final          | 2.0.61.Final
 
 _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
 

alts/build.gradle

@@ -33,9 +33,7 @@ dependencies {
             libraries.mockito.core,
             libraries.truth
 
-    testImplementation (libraries.guava.testlib) {
-        exclude group: 'junit', module: 'junit'
-    }
+    testImplementation libraries.guava.testlib
     testRuntimeOnly libraries.netty.tcnative,
             libraries.netty.tcnative.classes
     testRuntimeOnly (libraries.netty.transport.epoll) {

alts/src/generated/main/grpc/io/grpc/alts/internal/HandshakerServiceGrpc.java

@@ -12,7 +12,7 @@ public final class HandshakerServiceGrpc {
 
   private HandshakerServiceGrpc() {}
 
-  public static final String SERVICE_NAME = "grpc.gcp.HandshakerService";
+  public static final java.lang.String SERVICE_NAME = "grpc.gcp.HandshakerService";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<io.grpc.alts.internal.HandshakerReq,
@@ -261,9 +261,9 @@ private static final class HandshakerServiceFileDescriptorSupplier
   private static final class HandshakerServiceMethodDescriptorSupplier
       extends HandshakerServiceBaseDescriptorSupplier
       implements io.grpc.protobuf.ProtoMethodDescriptorSupplier {
-    private final String methodName;
+    private final java.lang.String methodName;
 
-    HandshakerServiceMethodDescriptorSupplier(String methodName) {
+    HandshakerServiceMethodDescriptorSupplier(java.lang.String methodName) {
       this.methodName = methodName;
     }
 

android-interop-testing/build.gradle

@@ -112,7 +112,8 @@ import net.ltgt.gradle.errorprone.CheckSeverity
 
 tasks.withType(JavaCompile).configureEach {
     options.compilerArgs += [
-            "-Xlint:-cast"
+            "-Xlint:-cast",
+            "-Xlint:-deprecation", // https://github.com/grpc/grpc-java/issues/10298
     ]
     appendToProperty(it.options.errorprone.excludedPaths, ".*/R.java", "|")
     appendToProperty(

android-interop-testing/src/androidTest/java/io/grpc/android/integrationtest/InteropInstrumentationTest.java

@@ -25,9 +25,10 @@
 import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
 import com.google.android.gms.common.GooglePlayServicesRepairableException;
 import com.google.android.gms.security.ProviderInstaller;
-import com.google.common.util.concurrent.SettableFuture;
-import io.grpc.android.integrationtest.InteropTask.Listener;
 import java.io.InputStream;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,6 +45,7 @@ public class InteropInstrumentationTest {
   private String serverHostOverride;
   private boolean useTestCa;
   private String testCase;
+  private ExecutorService executor = Executors.newSingleThreadExecutor();
 
   @Before
   public void setUp() throws Exception {
@@ -101,26 +103,21 @@ public void interopTests() throws Exception {
   }
 
   private void runTest(String testCase) throws Exception {
-    final SettableFuture<String> resultFuture = SettableFuture.create();
-    InteropTask.Listener listener =
-        new Listener() {
-          @Override
-          public void onComplete(String result) {
-            resultFuture.set(result);
-          }
-        };
     InputStream testCa;
     if (useTestCa) {
       testCa = ApplicationProvider.getApplicationContext().getResources().openRawResource(R.raw.ca);
     } else {
       testCa = null;
     }
-    new InteropTask(
-            listener,
-            TesterOkHttpChannelBuilder.build(host, port, serverHostOverride, useTls, testCa),
-            testCase)
-        .execute();
-    String result = resultFuture.get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
-    assertEquals(testCase + " failed", InteropTask.SUCCESS_MESSAGE, result);
+
+    String result = null;
+    try {
+      result = executor.submit(new TestCallable(
+              TesterOkHttpChannelBuilder.build(host, port, serverHostOverride, useTls, testCa),
+              testCase)).get(TIMEOUT_SECONDS, TimeUnit.SECONDS);
+      assertEquals(testCase + " failed", TestCallable.SUCCESS_MESSAGE, result);
+    } catch (ExecutionException | InterruptedException e) {
+      result = e.getMessage();
+    }
   }
 }