Merge branch 'master' into nextAndComplete

Author: panchenko

MODULE.bazel

@@ -2,7 +2,7 @@ module(
     name = "grpc-java",
     compatibility_level = 0,
     repo_name = "io_grpc_grpc_java",
-    version = "1.70.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
+    version = "1.71.0-SNAPSHOT",  # CURRENT_GRPC_VERSION
 )
 
 # GRPC_DEPS_START

alts/BUILD.bazel

@@ -18,6 +18,7 @@ java_library(
         "@com_google_protobuf//:protobuf_java",
         "@com_google_protobuf//:protobuf_java_util",
         artifact("com.google.code.findbugs:jsr305"),
+        artifact("com.google.errorprone:error_prone_annotations"),
         artifact("com.google.guava:guava"),
         artifact("io.netty:netty-buffer"),
         artifact("io.netty:netty-codec"),

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

@@ -204,7 +204,7 @@ protected HandshakerServiceBlockingV2Stub build(
   }
 
   /**
-   * A stub to allow clients to do llimited synchronous rpc calls to service HandshakerService.
+   * A stub to allow clients to do limited synchronous rpc calls to service HandshakerService.
    */
   public static final class HandshakerServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub<HandshakerServiceBlockingStub> {

alts/src/main/java/io/grpc/alts/internal/AsyncSemaphore.java

@@ -16,12 +16,12 @@
 
 package io.grpc.alts.internal;
 
+import com.google.errorprone.annotations.concurrent.GuardedBy;
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import java.util.LinkedList;
 import java.util.Queue;
-import javax.annotation.concurrent.GuardedBy;
 
 /** Provides a semaphore primitive, without blocking waiting on permits. */
 final class AsyncSemaphore {

android-interop-testing/build.gradle

@@ -7,7 +7,6 @@ description = 'gRPC: Android Integration Testing'
 
 repositories {
     google()
-    mavenCentral()
 }
 
 android {

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java

@@ -262,7 +262,7 @@ public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse
   }
 
   /**
-   * A stub to allow clients to do llimited synchronous rpc calls to service LoadBalancerStatsService.
+   * A stub to allow clients to do limited synchronous rpc calls to service LoadBalancerStatsService.
    * <pre>
    * A service used to obtain stats for verifying LB behavior.
    * </pre>

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java

@@ -252,7 +252,7 @@ public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testin
   }
 
   /**
-   * A stub to allow clients to do llimited synchronous rpc calls to service MetricsService.
+   * A stub to allow clients to do limited synchronous rpc calls to service MetricsService.
    */
   public static final class MetricsServiceBlockingStub
       extends io.grpc.stub.AbstractBlockingStub<MetricsServiceBlockingStub> {

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java

@@ -244,7 +244,7 @@ public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.i
   }
 
   /**
-   * A stub to allow clients to do llimited synchronous rpc calls to service ReconnectService.
+   * A stub to allow clients to do limited synchronous rpc calls to service ReconnectService.
    * <pre>
    * A service used to control reconnect server.
    * </pre>

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java

@@ -671,7 +671,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do llimited synchronous rpc calls to service TestService.
+   * A stub to allow clients to do limited synchronous rpc calls to service TestService.
    * <pre>
    * A simple service to test the various types of RPCs and experiment with
    * performance with various types of payload.

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java

@@ -206,7 +206,7 @@ public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.t
   }
 
   /**
-   * A stub to allow clients to do llimited synchronous rpc calls to service UnimplementedService.
+   * A stub to allow clients to do limited synchronous rpc calls to service UnimplementedService.
    * <pre>
    * A simple service NOT implemented at servers so clients can test for
    * that case.