From e34628b170f257ee4cbe32f5f388e33c5bd89f07 Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Fri, 31 Mar 2023 17:09:50 -0700 Subject: [PATCH 1/2] Bump version of protobuf-java to 3.22.2 Signed-off-by: Tianli Feng --- CHANGELOG.md | 3 +-- plugins/repository-gcs/build.gradle | 4 ++-- plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 | 1 - plugins/repository-gcs/licenses/protobuf-java-3.22.2.jar.sha1 | 1 + .../licenses/protobuf-java-util-3.20.0.jar.sha1 | 1 - .../licenses/protobuf-java-util-3.22.2.jar.sha1 | 1 + test/fixtures/hdfs-fixture/build.gradle | 2 +- 7 files changed, 6 insertions(+), 7 deletions(-) delete mode 100644 plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/protobuf-java-3.22.2.jar.sha1 delete mode 100644 plugins/repository-gcs/licenses/protobuf-java-util-3.20.0.jar.sha1 create mode 100644 plugins/repository-gcs/licenses/protobuf-java-util-3.22.2.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 714b569456e93..c39838304aeaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,7 +26,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Update Apache Lucene to 9.5.0-snapshot-d5cef1c ([#5570](https://github.com/opensearch-project/OpenSearch/pull/5570)) - Bump `maven-model` from 3.6.2 to 3.8.6 ([#5599](https://github.com/opensearch-project/OpenSearch/pull/5599)) - Bump `maxmind-db` from 2.1.0 to 3.0.0 ([#5601](https://github.com/opensearch-project/OpenSearch/pull/5601)) -- Bump `protobuf-java` from 3.21.11 to 3.21.12 ([#5603](https://github.com/opensearch-project/OpenSearch/pull/5603)) - Bump `wiremock-jre8-standalone` from 2.33.2 to 2.35.0 - Bump `gson` from 2.10 to 2.10.1 - Bump `json-schema-validator` from 1.0.73 to 1.0.76 @@ -98,7 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `io.projectreactor.netty:reactor-netty` from 1.1.3 to 1.1.4 - Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.15.2 to 0.16.11 - Bump `net.minidev:json-smart` from 2.4.8 to 2.4.9 -- Bump `com.google.protobuf:protobuf-java` from 3.22.0 to 3.22.2 +- Bump `com.google.protobuf:protobuf-java` to 3.22.2 - Bump Netty to 4.1.90.Final ([#6677](https://github.com/opensearch-project/OpenSearch/pull/6677) - Bump `com.diffplug.spotless` from 6.15.0 to 6.17.0 - Bump `org.apache.zookeeper:zookeeper` from 3.8.0 to 3.8.1 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 561119e9e2c30..5ef92e2ca2465 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -65,8 +65,8 @@ dependencies { api 'com.google.api:api-common:1.8.1' api 'com.google.api:gax:2.17.0' api 'org.threeten:threetenbp:1.4.4' - api 'com.google.protobuf:protobuf-java-util:3.20.0' - api 'com.google.protobuf:protobuf-java:3.21.7' + api 'com.google.protobuf:protobuf-java-util:3.22.2' + api 'com.google.protobuf:protobuf-java:3.22.2' api 'com.google.code.gson:gson:2.9.0' api 'com.google.api.grpc:proto-google-common-protos:2.10.0' api 'com.google.api.grpc:proto-google-iam-v1:0.12.0' diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 deleted file mode 100644 index faa673a23ef41..0000000000000 --- a/plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -96cfc7147192f1de72c3d7d06972155ffb7d180c \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/protobuf-java-3.22.2.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.22.2.jar.sha1 new file mode 100644 index 0000000000000..80feeec023e7b --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-3.22.2.jar.sha1 @@ -0,0 +1 @@ +fdee98b8f6abab73f146a4edb4c09e56f8278d03 \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/protobuf-java-util-3.20.0.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-util-3.20.0.jar.sha1 deleted file mode 100644 index 1e9d00d8d5c03..0000000000000 --- a/plugins/repository-gcs/licenses/protobuf-java-util-3.20.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ee4496b296418283cbe7ae784984347fc4717a9a \ No newline at end of file diff --git a/plugins/repository-gcs/licenses/protobuf-java-util-3.22.2.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-util-3.22.2.jar.sha1 new file mode 100644 index 0000000000000..2a5707254b8cf --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-util-3.22.2.jar.sha1 @@ -0,0 +1 @@ +749cd4fe8ab52f37bc186193802ba19f5b284647 \ No newline at end of file diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 1de65b1bad230..80214a3c6165f 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -52,7 +52,7 @@ dependencies { api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" api 'net.minidev:json-smart:2.4.9' api "org.mockito:mockito-core:${versions.mockito}" - api "com.google.protobuf:protobuf-java:3.21.9" + api "com.google.protobuf:protobuf-java:3.22.2" api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" api 'org.eclipse.jetty:jetty-server:9.4.49.v20220914' api 'org.apache.zookeeper:zookeeper:3.8.1' From b98ce5ac4894546a195cf9ac9e470b3ea0413ddd Mon Sep 17 00:00:00 2001 From: Tianli Feng Date: Tue, 4 Apr 2023 18:45:39 -0700 Subject: [PATCH 2/2] Update changelog to include PR link Signed-off-by: Tianli Feng --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c39838304aeaf..daefecb67ae00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -97,7 +97,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `io.projectreactor.netty:reactor-netty` from 1.1.3 to 1.1.4 - Bump `com.avast.gradle:gradle-docker-compose-plugin` from 0.15.2 to 0.16.11 - Bump `net.minidev:json-smart` from 2.4.8 to 2.4.9 -- Bump `com.google.protobuf:protobuf-java` to 3.22.2 +- Bump `com.google.protobuf:protobuf-java` to 3.22.2 ([#6994](https://github.com/opensearch-project/OpenSearch/pull/6994)) - Bump Netty to 4.1.90.Final ([#6677](https://github.com/opensearch-project/OpenSearch/pull/6677) - Bump `com.diffplug.spotless` from 6.15.0 to 6.17.0 - Bump `org.apache.zookeeper:zookeeper` from 3.8.0 to 3.8.1