diff options
author | pazus <pazus@yandex-team.com> | 2025-01-14 20:00:46 +0300 |
---|---|---|
committer | pazus <pazus@yandex-team.com> | 2025-01-14 21:11:05 +0300 |
commit | d773af288151566d282ecee0eb0f74d3547fc514 (patch) | |
tree | 4fc6b8a9baaec4311c4ab3afd9e3db596dbcbdb3 | |
parent | a37aefba7aa2f5ddf7fa980b05836eb445dd5ea5 (diff) | |
download | ydb-d773af288151566d282ecee0eb0f74d3547fc514.tar.gz |
Update protobuf to 3.25.5
commit_hash:ffd2d4837196be91cdb024e684d647b45fa6e3c1
-rw-r--r-- | build/conf/proto.conf | 4 | ||||
-rw-r--r-- | build/mapping.conf.json | 2 | ||||
-rw-r--r-- | build/platform/java/protoc/resources.json | 10 | ||||
-rw-r--r-- | contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.make | 11 | ||||
-rw-r--r-- | contrib/java/com/google/protobuf/protobuf-java/3.25.5/pom.xml (renamed from contrib/java/com/google/protobuf/protobuf-java/3.25.3/pom.xml) | 2 | ||||
-rw-r--r-- | contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.dependency_management.inc (renamed from contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.dependency_management.inc) | 2 | ||||
-rw-r--r-- | contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.make | 13 |
7 files changed, 24 insertions, 20 deletions
diff --git a/build/conf/proto.conf b/build/conf/proto.conf index f9781b588f..9e579852ae 100644 --- a/build/conf/proto.conf +++ b/build/conf/proto.conf @@ -484,8 +484,8 @@ macro USE_JAVALITE() { } # tag:proto tag:java-specific -JAVA_PROTO_COMPILER_VERSION = 3.25.3 -JAVA_PROTO_RUNTIME_VERSION = 3.25.3 +JAVA_PROTO_COMPILER_VERSION = 3.25.5 +JAVA_PROTO_RUNTIME_VERSION = 3.25.5 JAVA_PROTO_COMMON_VERSION = 2.9.0 JAVA_GRPC_VERSION = 1.51.0 KOTLIN_GRPC_VERSION = 1.3.1 diff --git a/build/mapping.conf.json b/build/mapping.conf.json index d38da1796c..b40d2cd315 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -995,6 +995,7 @@ "7101976574": "https://devtools-registry.s3.yandex.net/7101976574", "7552075245": "https://devtools-registry.s3.yandex.net/7552075245", "6391354461": "https://devtools-registry.s3.yandex.net/6391354461", + "7805449010": "https://devtools-registry.s3.yandex.net/7805449010", "6990868751": "https://devtools-registry.s3.yandex.net/6990868751", "6990860705": "https://devtools-registry.s3.yandex.net/6990860705", "6990881789": "https://devtools-registry.s3.yandex.net/6990881789", @@ -2157,6 +2158,7 @@ "7101976574": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz", "7552075245": "none-none-none-result_resources/jdk-windows-amd64.yandex.tgz", "6391354461": "none-none-none-result_resources/protoc-linux-x86_64.tgz", + "7805449010": "none-none-none-result_resources/protoc-linux-x86_64.tgz", "6990868751": "none-none-none-sandbox/backup/3527d100-e2d0-4b0e-bb7a-905010853d98/yfm-docs.tar", "6990860705": "none-none-none-sandbox/backup/d386643e-58f8-43e1-8760-341d73801df8/yfm-docs.tar", "6990881789": "none-none-none-sandbox/backup/efc428e5-52a5-4a6f-8f0c-53f1d255efea/yfm-docs.tar", diff --git a/build/platform/java/protoc/resources.json b/build/platform/java/protoc/resources.json index d5d1ecef8b..993c58da48 100644 --- a/build/platform/java/protoc/resources.json +++ b/build/platform/java/protoc/resources.json @@ -1,19 +1,19 @@ { "by_platform": { "darwin-arm64": { - "uri": "sbr:6391358240" + "uri": "sbr:7805450611" }, "darwin-x86_64": { - "uri": "sbr:6391357427" + "uri": "sbr:7805450231" }, "linux-x86_64": { - "uri": "sbr:6391354461" + "uri": "sbr:7805449010" }, "linux-aarch64": { - "uri": "sbr:6391355444" + "uri": "sbr:7805449449" }, "win32-x86_64": { - "uri": "sbr:6391356500" + "uri": "sbr:7805449878" } } } 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 deleted file mode 100644 index d538d0f48b..0000000000 --- a/contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.make +++ /dev/null @@ -1,11 +0,0 @@ -JAVA_CONTRIB() - -VERSION(3.25.3) - -LICENSE(BSD-3-Clause) - -JAR_RESOURCE(6385637991) - -SRC_RESOURCE(6385637993) - -END() diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.25.3/pom.xml b/contrib/java/com/google/protobuf/protobuf-java/3.25.5/pom.xml index 7622044208..6e71e7af58 100644 --- a/contrib/java/com/google/protobuf/protobuf-java/3.25.3/pom.xml +++ b/contrib/java/com/google/protobuf/protobuf-java/3.25.5/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-parent</artifactId> - <version>3.25.3</version> + <version>3.25.5</version> </parent> <artifactId>protobuf-java</artifactId> diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.dependency_management.inc b/contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.dependency_management.inc index ad5f49c2f0..817eef193e 100644 --- a/contrib/java/com/google/protobuf/protobuf-java/3.25.3/ya.dependency_management.inc +++ b/contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.dependency_management.inc @@ -1 +1 @@ -INCLUDE(${ARCADIA_ROOT}/contrib/java/com/google/protobuf/protobuf-parent/3.25.3/ya.dependency_management.inc) +INCLUDE(${ARCADIA_ROOT}/contrib/java/com/google/protobuf/protobuf-parent/3.25.5/ya.dependency_management.inc) diff --git a/contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.make b/contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.make new file mode 100644 index 0000000000..0b1343ff29 --- /dev/null +++ b/contrib/java/com/google/protobuf/protobuf-java/3.25.5/ya.make @@ -0,0 +1,13 @@ +JAVA_CONTRIB() + +VERSION(3.25.5) + +LICENSE(BSD-3-Clause) + +ORIGINAL_SOURCE(https://repo1.maven.org/maven2) + +JAR_RESOURCE(7804868953) + +SRC_RESOURCE(7804868939) + +END() |