5 files changed, 34 insertions, 11 deletions

diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index ac9702f6dc..82506d1eb3 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -1,6 +1,7 @@
 # tag:tool-specific tag:proto
 PROTOC=${tool:"contrib/tools/protoc"}
 JAVA_PROTOC=${tool:"contrib/tools/protoc"}
+NEW_JAVA_PROTOC=yes
 when ($NEW_JAVA_PROTOC == "yes") {
     JAVA_PROTOC=${tool:"build/platform/java/protoc"}
 }
@@ -179,7 +180,7 @@ macro WITH_KOTLIN_GRPC() {
     PEERDIR(build/platform/java/kotlin_grpc)
     SET_APPEND(JAVA_PROTO_ARGS ${env:"JAVA_HOME=${JDK_RESOURCE}"} ${env:"KOTLIN_GRPC_JAR=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/protoc-gen-grpc-kotlin-1.3.1.jar"} --plugin=protoc-gen-kotlin_grpc=${KOTLIN_GRPC_RESOURCE_GLOBAL}/grpc_kotlin/grpc_kotlin --kotlin_grpc_out=$ARCADIA_BUILD_ROOT/java_out)
     SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/io/grpc/grpc-kotlin-stub/1.3.1)
-    SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/3.24.2)
+    SET(JAVA_PROTOBUF_PEERS $JAVA_PROTOBUF_PEERS contrib/java/com/google/protobuf/protobuf-kotlin/${JAVA_PROTO_RUNTIME_VERSION})
 }
 
 
@@ -445,7 +446,7 @@ macro USE_JAVALITE() {
 }
 
 # tag:proto tag:java-specific
-JAVA_PROTO_RUNTIME_VERSION = 3.21.12
+JAVA_PROTO_RUNTIME_VERSION = 3.22.5
 JAVA_PROTO_COMMON_VERSION = 1.12.0
 JAVA_GRPC_VERSION = 1.43.2
 KOTLIN_PROTO=no
diff --git a/build/platform/java/protoc/resources.json b/build/platform/java/protoc/resources.json
new file mode 100644
index 0000000000..1ae5fa8ded
--- /dev/null
+++ b/build/platform/java/protoc/resources.json
@@ -0,0 +1,16 @@
+{
+    "by_platform": {
+        "darwin-arm64": {
+            "uri": "sbr:5440674608"
+        },
+        "darwin-x86_64": {
+            "uri": "sbr:5440679227"
+        },
+        "linux-x86_64": {
+            "uri": "sbr:5440663490"
+        },
+        "win32-x86_64": {
+            "uri": "sbr:5440670117"
+        }
+    }
+}
\ No newline at end of file
diff --git a/build/platform/java/protoc/ya.make b/build/platform/java/protoc/ya.make
new file mode 100644
index 0000000000..24851b57da
--- /dev/null
+++ b/build/platform/java/protoc/ya.make
@@ -0,0 +1,6 @@
+SET_RESOURCE_URI_FROM_JSON(SANDBOX_RESOURCE_URI ${ARCADIA_ROOT}/build/platform/java/protoc/resources.json)
+ENABLE(PREBUILT)
+PREBUILT_PROGRAM()
+DECLARE_EXTERNAL_RESOURCE(JAVA_PROTOC ${SANDBOX_RESOURCE_URI})
+PRIMARY_OUTPUT(${JAVA_PROTOC_RESOURCE_GLOBAL}/bin/protoc${MODULE_SUFFIX})
+END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.21.12/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.21.12/ya.make
deleted file mode 100644
index 5233fe13d7..0000000000
--- a/contrib/java/com/google/protobuf/protobuf-java/3.21.12/ya.make
+++ /dev/null
@@ -1,9 +0,0 @@
-JAVA_CONTRIB()
-
-LICENSE(BSD-3-Clause)
-
-JAR_RESOURCE(4136336433)
-
-SRC_RESOURCE(4136336434)
-
-END()
diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.22.5/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.22.5/ya.make
new file mode 100644
index 0000000000..4667f90295
--- /dev/null
+++ b/contrib/java/com/google/protobuf/protobuf-java/3.22.5/ya.make
@@ -0,0 +1,9 @@
+JAVA_CONTRIB()
+
+LICENSE(BSD-3-Clause)
+
+JAR_RESOURCE(5119763722)
+
+SRC_RESOURCE(5119763727)
+
+END()