Обновить GRPC в Аркадии до версии 1.51.0

426b5a970fb81b66991877c07290963f63e64b22

27 files changed, 139 insertions, 154 deletions

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 4d867c45df..944a15c690 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -457,8 +457,9 @@ macro USE_JAVALITE() {
 # tag:proto tag:java-specific
 JAVA_PROTO_COMPILER_VERSION = 3.22.5
 JAVA_PROTO_RUNTIME_VERSION = 3.22.5
-JAVA_PROTO_COMMON_VERSION = 1.12.0
-JAVA_GRPC_VERSION = 1.43.2
+JAVA_PROTO_COMMON_VERSION = 2.9.0
+JAVA_GRPC_VERSION = 1.51.0
+JAVA_NETTY_NETTY_VERSION = 4.1.79.Final
 KOTLIN_PROTO=no
 KOTLIN_PROTO_PEERS=
 when ($JAVA_PROTO_RUNTIME == "javalite") {
diff --git a/contrib/java/com/google/api/grpc/proto-google-common-protos/1.12.0/ya.make b/contrib/java/com/google/api/grpc/proto-google-common-protos/1.12.0/ya.make
deleted file mode 100644
index ead2f94ff1..0000000000
--- a/contrib/java/com/google/api/grpc/proto-google-common-protos/1.12.0/ya.make
+++ /dev/null
@@ -1,12 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/com/google/protobuf/protobuf-java/3.5.1
-)
-
-JAR_RESOURCE(805479550)
-SRC_RESOURCE(805477995)
-
-END()
diff --git a/contrib/java/com/google/api/grpc/proto-google-common-protos/2.0.1/ya.make b/contrib/java/com/google/api/grpc/proto-google-common-protos/2.0.1/ya.make
deleted file mode 100644
index 4ca3f2bbdf..0000000000
--- a/contrib/java/com/google/api/grpc/proto-google-common-protos/2.0.1/ya.make
+++ /dev/null
@@ -1,12 +0,0 @@
-JAVA_CONTRIB(proto-google-common-protos-2.0.1)
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/com/google/protobuf/protobuf-java/3.13.0
-)
-
-JAR_RESOURCE(1965473130)
-SRC_RESOURCE(1965469271)
-
-END()
diff --git a/contrib/java/com/google/api/grpc/proto-google-common-protos/2.9.0/ya.make b/contrib/java/com/google/api/grpc/proto-google-common-protos/2.9.0/ya.make
new file mode 100644
index 0000000000..be05b314f0
--- /dev/null
+++ b/contrib/java/com/google/api/grpc/proto-google-common-protos/2.9.0/ya.make
@@ -0,0 +1,13 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/java/com/google/protobuf/protobuf-java/3.21.1
+)
+
+JAR_RESOURCE(3573996018)
+
+SRC_RESOURCE(3573990573)
+
+END()
diff --git a/contrib/java/com/google/errorprone/error_prone_annotations/2.11.0/ya.make b/contrib/java/com/google/errorprone/error_prone_annotations/2.11.0/ya.make
new file mode 100644
index 0000000000..fcaa340924
--- /dev/null
+++ b/contrib/java/com/google/errorprone/error_prone_annotations/2.11.0/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+JAR_RESOURCE(3096861715)
+
+SRC_RESOURCE(3096861694)
+
+END()
diff --git a/contrib/java/com/google/errorprone/error_prone_annotations/2.14.0/ya.make b/contrib/java/com/google/errorprone/error_prone_annotations/2.14.0/ya.make
new file mode 100644
index 0000000000..bf52fa81d0
--- /dev/null
+++ b/contrib/java/com/google/errorprone/error_prone_annotations/2.14.0/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+JAR_RESOURCE(3359065448)
+
+SRC_RESOURCE(3359067951)
+
+END()
diff --git a/contrib/java/com/google/errorprone/error_prone_annotations/2.5.1/ya.make b/contrib/java/com/google/errorprone/error_prone_annotations/2.5.1/ya.make
deleted file mode 100644
index 34990fe043..0000000000
--- a/contrib/java/com/google/errorprone/error_prone_annotations/2.5.1/ya.make
+++ /dev/null
@@ -1,8 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-JAR_RESOURCE(2155789749)
-SRC_RESOURCE(2155789748)
-
-END()
diff --git a/contrib/java/com/google/errorprone/error_prone_annotations/2.9.0/ya.make b/contrib/java/com/google/errorprone/error_prone_annotations/2.9.0/ya.make
deleted file mode 100644
index d996574db1..0000000000
--- a/contrib/java/com/google/errorprone/error_prone_annotations/2.9.0/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-JAR_RESOURCE(2460308864)
-
-SRC_RESOURCE(2460308880)
-
-END()
diff --git a/contrib/java/com/google/guava/guava/30.1.1-android/ya.make b/contrib/java/com/google/guava/guava/31.1-android/ya.make
index da15f204f1..65373ce43e 100644
--- a/contrib/java/com/google/guava/guava/30.1.1-android/ya.make
+++ b/contrib/java/com/google/guava/guava/31.1-android/ya.make
@@ -6,13 +6,13 @@ PEERDIR(
     contrib/java/com/google/guava/failureaccess/1.0.1
     contrib/java/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava
     contrib/java/com/google/code/findbugs/jsr305/3.0.2
-    contrib/java/org/checkerframework/checker-compat-qual/2.5.5
-    contrib/java/com/google/errorprone/error_prone_annotations/2.5.1
+    contrib/java/org/checkerframework/checker-qual/3.12.0
+    contrib/java/com/google/errorprone/error_prone_annotations/2.11.0
     contrib/java/com/google/j2objc/j2objc-annotations/1.3
 )
 
-JAR_RESOURCE(2283859002)
+JAR_RESOURCE(3096861724)
 
-SRC_RESOURCE(2283859288)
+SRC_RESOURCE(3096861737)
 
 END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.13.0/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.13.0/ya.make
deleted file mode 100644
index a271f676ca..0000000000
--- a/contrib/java/com/google/protobuf/protobuf-java/3.13.0/ya.make
+++ /dev/null
@@ -1,8 +0,0 @@
-JAVA_CONTRIB(protobuf-java-3.13.0)
-
-LICENSE(BSD-3-Clause)
-
-JAR_RESOURCE(1755015277)
-SRC_RESOURCE(1755014752)
-
-END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.19.2/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.19.2/ya.make
deleted file mode 100644
index 3ffb9f4e61..0000000000
--- a/contrib/java/com/google/protobuf/protobuf-java/3.19.2/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(BSD-3-Clause)
-
-JAR_RESOURCE(2758790421)
-
-SRC_RESOURCE(2758794869)
-
-END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.21.1/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.21.1/ya.make
new file mode 100644
index 0000000000..bbad1b4c2c
--- /dev/null
+++ b/contrib/java/com/google/protobuf/protobuf-java/3.21.1/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(BSD-3-Clause)
+
+JAR_RESOURCE(3573993651)
+
+SRC_RESOURCE(3573993762)
+
+END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.21.7/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.21.7/ya.make
new file mode 100644
index 0000000000..a44f57a5d0
--- /dev/null
+++ b/contrib/java/com/google/protobuf/protobuf-java/3.21.7/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(BSD-3-Clause)
+
+JAR_RESOURCE(4136337938)
+
+SRC_RESOURCE(4136336439)
+
+END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.5.1/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.5.1/ya.make
deleted file mode 100644
index 8c4499fe84..0000000000
--- a/contrib/java/com/google/protobuf/protobuf-java/3.5.1/ya.make
+++ /dev/null
@@ -1,8 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(BSD-3-Clause)
-
-JAR_RESOURCE(593726696)
-SRC_RESOURCE(593726660)
-
-END()
diff --git a/contrib/java/com/google/protobuf/protobuf-javalite/3.19.2/ya.make b/contrib/java/com/google/protobuf/protobuf-javalite/3.19.2/ya.make
deleted file mode 100644
index 4d028e6089..0000000000
--- a/contrib/java/com/google/protobuf/protobuf-javalite/3.19.2/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(BSD-3-Clause)
-
-JAR_RESOURCE(2758794545)
-
-SRC_RESOURCE(2758793982)
-
-END()
diff --git a/contrib/java/com/google/protobuf/protobuf-javalite/3.21.7/ya.make b/contrib/java/com/google/protobuf/protobuf-javalite/3.21.7/ya.make
new file mode 100644
index 0000000000..c9307b6d77
--- /dev/null
+++ b/contrib/java/com/google/protobuf/protobuf-javalite/3.21.7/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(BSD-3-Clause)
+
+JAR_RESOURCE(4136336630)
+
+SRC_RESOURCE(4136339462)
+
+END()
diff --git a/contrib/java/io/grpc/grpc-api/1.43.2/ya.make b/contrib/java/io/grpc/grpc-api/1.51.0/ya.make
index adf8f2c23e..d12061f696 100644
--- a/contrib/java/io/grpc/grpc-api/1.43.2/ya.make
+++ b/contrib/java/io/grpc/grpc-api/1.51.0/ya.make
@@ -3,14 +3,14 @@ JAVA_CONTRIB()
 LICENSE(Apache-2.0)
 
 PEERDIR(
-    contrib/java/io/grpc/grpc-context/1.43.2
+    contrib/java/io/grpc/grpc-context/1.51.0
     contrib/java/com/google/code/findbugs/jsr305/3.0.2
-    contrib/java/com/google/guava/guava/30.1.1-android
-    contrib/java/com/google/errorprone/error_prone_annotations/2.9.0
+    contrib/java/com/google/errorprone/error_prone_annotations/2.14.0
+    contrib/java/com/google/guava/guava/31.1-android
 )
 
-JAR_RESOURCE(2954037905)
+JAR_RESOURCE(4401902016)
 
-SRC_RESOURCE(2954039734)
+SRC_RESOURCE(4401902018)
 
 END()
diff --git a/contrib/java/io/grpc/grpc-context/1.43.2/ya.make b/contrib/java/io/grpc/grpc-context/1.43.2/ya.make
deleted file mode 100644
index 721c5d0785..0000000000
--- a/contrib/java/io/grpc/grpc-context/1.43.2/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-JAR_RESOURCE(2954036372)
-
-SRC_RESOURCE(2954039930)
-
-END()
diff --git a/contrib/java/io/grpc/grpc-context/1.51.0/ya.make b/contrib/java/io/grpc/grpc-context/1.51.0/ya.make
new file mode 100644
index 0000000000..eb5ae9d03b
--- /dev/null
+++ b/contrib/java/io/grpc/grpc-context/1.51.0/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+JAR_RESOURCE(4401902017)
+
+SRC_RESOURCE(4401902041)
+
+END()
diff --git a/contrib/java/io/grpc/grpc-protobuf-lite/1.43.2/ya.make b/contrib/java/io/grpc/grpc-protobuf-lite/1.43.2/ya.make
deleted file mode 100644
index c0311b0629..0000000000
--- a/contrib/java/io/grpc/grpc-protobuf-lite/1.43.2/ya.make
+++ /dev/null
@@ -1,16 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/io/grpc/grpc-api/1.43.2
-    contrib/java/com/google/protobuf/protobuf-javalite/3.19.2
-    contrib/java/com/google/code/findbugs/jsr305/3.0.2
-    contrib/java/com/google/guava/guava/30.1.1-android
-)
-
-JAR_RESOURCE(2954030659)
-
-SRC_RESOURCE(2954036247)
-
-END()
diff --git a/contrib/java/io/grpc/grpc-protobuf-lite/1.51.0/ya.make b/contrib/java/io/grpc/grpc-protobuf-lite/1.51.0/ya.make
new file mode 100644
index 0000000000..fe4e837f7b
--- /dev/null
+++ b/contrib/java/io/grpc/grpc-protobuf-lite/1.51.0/ya.make
@@ -0,0 +1,16 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/java/io/grpc/grpc-api/1.51.0
+    contrib/java/com/google/protobuf/protobuf-javalite/3.21.7
+    contrib/java/com/google/code/findbugs/jsr305/3.0.2
+    contrib/java/com/google/guava/guava/31.1-android
+)
+
+JAR_RESOURCE(4628902309)
+
+SRC_RESOURCE(4628902310)
+
+END()
diff --git a/contrib/java/io/grpc/grpc-protobuf/1.43.2/ya.make b/contrib/java/io/grpc/grpc-protobuf/1.43.2/ya.make
deleted file mode 100644
index 027fd80f2e..0000000000
--- a/contrib/java/io/grpc/grpc-protobuf/1.43.2/ya.make
+++ /dev/null
@@ -1,20 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/io/grpc/grpc-api/1.43.2
-    contrib/java/com/google/code/findbugs/jsr305/3.0.2
-    contrib/java/com/google/protobuf/protobuf-java/3.19.2
-    contrib/java/com/google/api/grpc/proto-google-common-protos/2.0.1
-    contrib/java/io/grpc/grpc-protobuf-lite/1.43.2
-    contrib/java/com/google/guava/guava/30.1.1-android
-)
-
-JAR_RESOURCE(2954038238)
-
-SRC_RESOURCE(2954032072)
-
-EXCLUDE(contrib/java/com/google/protobuf/protobuf-javalite/3.19.2)
-
-END()
diff --git a/contrib/java/io/grpc/grpc-protobuf/1.51.0/ya.make b/contrib/java/io/grpc/grpc-protobuf/1.51.0/ya.make
new file mode 100644
index 0000000000..87c097e3b1
--- /dev/null
+++ b/contrib/java/io/grpc/grpc-protobuf/1.51.0/ya.make
@@ -0,0 +1,20 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/java/io/grpc/grpc-api/1.51.0
+    contrib/java/com/google/code/findbugs/jsr305/3.0.2
+    contrib/java/com/google/protobuf/protobuf-java/3.21.7
+    contrib/java/com/google/api/grpc/proto-google-common-protos/2.9.0
+    contrib/java/io/grpc/grpc-protobuf-lite/1.51.0
+    contrib/java/com/google/guava/guava/31.1-android
+)
+
+JAR_RESOURCE(4628902851)
+
+SRC_RESOURCE(4628902574)
+
+EXCLUDE(contrib/java/com/google/protobuf/protobuf-javalite)
+
+END()
diff --git a/contrib/java/io/grpc/grpc-stub/1.43.2/ya.make b/contrib/java/io/grpc/grpc-stub/1.43.2/ya.make
deleted file mode 100644
index e7d7303f24..0000000000
--- a/contrib/java/io/grpc/grpc-stub/1.43.2/ya.make
+++ /dev/null
@@ -1,15 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/java/io/grpc/grpc-api/1.43.2
-    contrib/java/com/google/guava/guava/30.1.1-android
-    contrib/java/com/google/errorprone/error_prone_annotations/2.9.0
-)
-
-JAR_RESOURCE(2954038095)
-
-SRC_RESOURCE(2954031489)
-
-END()
diff --git a/contrib/java/io/grpc/grpc-stub/1.51.0/ya.make b/contrib/java/io/grpc/grpc-stub/1.51.0/ya.make
new file mode 100644
index 0000000000..b7bea00aca
--- /dev/null
+++ b/contrib/java/io/grpc/grpc-stub/1.51.0/ya.make
@@ -0,0 +1,15 @@
+JAVA_CONTRIB()
+
+LICENSE(Apache-2.0)
+
+PEERDIR(
+    contrib/java/io/grpc/grpc-api/1.51.0
+    contrib/java/com/google/guava/guava/31.1-android
+    contrib/java/com/google/errorprone/error_prone_annotations/2.14.0
+)
+
+JAR_RESOURCE(4628902878)
+
+SRC_RESOURCE(4628902847)
+
+END()
diff --git a/contrib/java/org/checkerframework/checker-compat-qual/2.5.5/ya.make b/contrib/java/org/checkerframework/checker-compat-qual/2.5.5/ya.make
deleted file mode 100644
index 79854122a8..0000000000
--- a/contrib/java/org/checkerframework/checker-compat-qual/2.5.5/ya.make
+++ /dev/null
@@ -1,8 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(MIT)
-
-JAR_RESOURCE(947906909)
-SRC_RESOURCE(947905977)
-
-END()
diff --git a/contrib/java/org/checkerframework/checker-qual/3.12.0/ya.make b/contrib/java/org/checkerframework/checker-qual/3.12.0/ya.make
new file mode 100644
index 0000000000..cc736b331b
--- /dev/null
+++ b/contrib/java/org/checkerframework/checker-qual/3.12.0/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(MIT)
+
+JAR_RESOURCE(2217197026)
+
+SRC_RESOURCE(2217196829)
+
+END()