aboutsummaryrefslogtreecommitdiffstats
path: root/build/conf/proto.conf
diff options
context:
space:
mode:
authorpazus <pazus@yandex-team.com>2024-06-19 08:09:30 +0300
committerpazus <pazus@yandex-team.com>2024-06-19 08:20:59 +0300
commit71e31152d8d81e2e84441aa5b6574e5f112a9449 (patch)
tree272159a8e6685f06c5078a7313e3f460b2362359 /build/conf/proto.conf
parentdac397659bea6624b9b9e1d19139cb617bb7a4d3 (diff)
downloadydb-71e31152d8d81e2e84441aa5b6574e5f112a9449.tar.gz
Update arcadia protobuf to 3.25.3
20f3895d893b877de556b7797c92edf535ccf891
Diffstat (limited to 'build/conf/proto.conf')
-rw-r--r--build/conf/proto.conf11
1 files changed, 4 insertions, 7 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 59bf640511..42a32ac3ae 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -4,11 +4,8 @@ PY_PROTOC=${tool:"contrib/tools/protoc"}
when ($PYTHON2 == "yes") {
PY_PROTOC=${tool:"contrib/tools/protoc_old"}
}
-JAVA_PROTOC=${tool:"contrib/tools/protoc"}
-NEW_JAVA_PROTOC=yes
-when ($NEW_JAVA_PROTOC == "yes") {
- JAVA_PROTOC=${tool:"build/platform/java/protoc"}
-}
+JAVA_PROTOC=${tool:"build/platform/java/protoc"}
+
when ($OPENSOURCE_REPLACE_PROTOBUF) {
PROTOC_STYLEGUIDE_OUT=
PROTOC_PLUGIN_STYLEGUIDE=
@@ -478,8 +475,8 @@ macro USE_JAVALITE() {
}
# tag:proto tag:java-specific
-JAVA_PROTO_COMPILER_VERSION = 3.22.5
-JAVA_PROTO_RUNTIME_VERSION = 3.22.5
+JAVA_PROTO_COMPILER_VERSION = 3.25.3
+JAVA_PROTO_RUNTIME_VERSION = 3.25.3
JAVA_PROTO_COMMON_VERSION = 2.9.0
JAVA_GRPC_VERSION = 1.51.0
JAVA_NETTY_NETTY_VERSION = 4.1.79.Final