diff options
| author | pazus <pazus@yandex-team.com> | 2024-06-19 08:09:30 +0300 |
|---|---|---|
| committer | pazus <pazus@yandex-team.com> | 2024-06-19 08:20:59 +0300 |
| commit | 71e31152d8d81e2e84441aa5b6574e5f112a9449 (patch) | |
| tree | 272159a8e6685f06c5078a7313e3f460b2362359 | |
| parent | dac397659bea6624b9b9e1d19139cb617bb7a4d3 (diff) | |
| download | ydb-71e31152d8d81e2e84441aa5b6574e5f112a9449.tar.gz | |
Update arcadia protobuf to 3.25.3
20f3895d893b877de556b7797c92edf535ccf891
| -rw-r--r-- | build/conf/proto.conf | 11 | ||||
| -rw-r--r-- | build/platform/java/protoc/resources.json | 31 | ||||
| -rw-r--r-- | contrib/java/com/google/protobuf/protobuf-java/3.22.5/ya.make | 9 | ||||
| -rw-r--r-- | contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.make | 9 |
4 files changed, 30 insertions, 30 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 diff --git a/build/platform/java/protoc/resources.json b/build/platform/java/protoc/resources.json index 1ae5fa8ded..d5d1ecef8b 100644 --- a/build/platform/java/protoc/resources.json +++ b/build/platform/java/protoc/resources.json @@ -1,16 +1,19 @@ { - "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" - } + "by_platform": { + "darwin-arm64": { + "uri": "sbr:6391358240" + }, + "darwin-x86_64": { + "uri": "sbr:6391357427" + }, + "linux-x86_64": { + "uri": "sbr:6391354461" + }, + "linux-aarch64": { + "uri": "sbr:6391355444" + }, + "win32-x86_64": { + "uri": "sbr:6391356500" } -}
\ No newline at end of file + } +} 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 deleted file mode 100644 index 4667f90295..0000000000 --- a/contrib/java/com/google/protobuf/protobuf-java/3.22.5/ya.make +++ /dev/null @@ -1,9 +0,0 @@ -JAVA_CONTRIB() - -LICENSE(BSD-3-Clause) - -JAR_RESOURCE(5119763722) - -SRC_RESOURCE(5119763727) - -END() diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.make new file mode 100644 index 0000000000..dc29c1b2cb --- /dev/null +++ b/contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.make @@ -0,0 +1,9 @@ +JAVA_CONTRIB() + +LICENSE(BSD-3-Clause) + +JAR_RESOURCE(6385637991) + +SRC_RESOURCE(6385637993) + +END() |