From 22297cf68d1e022c20d8dd1046bf0a1703d4dc02 Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Wed, 4 Dec 2024 13:00:07 -0800 Subject: [PATCH 1/2] [1.3] Upgrades protobuf-java to 3.22.5 (#16779) * Upgrades protobuf-java to 3.22.5 Signed-off-by: Owais * Adds CHANGELOG Signed-off-by: Owais --------- Signed-off-by: Owais --- CHANGELOG.md | 1 + buildSrc/version.properties | 2 +- plugins/repository-gcs/build.gradle | 2 +- plugins/repository-gcs/licenses/protobuf-java-3.21.7.jar.sha1 | 1 - plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 2 +- plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1 | 1 - plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 | 1 + 8 files changed, 6 insertions(+), 5 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.5.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 79db3446b3504..a22f2086230c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `org.bouncycastle:bc-fips` from 1.0.2.4 to 1.0.2.5 ([#13446](https://github.com/opensearch-project/OpenSearch/pull/13446)) - Bump `Netty` from 4.1.114.Final to 4.1.115.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661)) - Bump `avro` from 1.11.3 to 1.11.4 ([#16773](https://github.com/opensearch-project/OpenSearch/pull/16773)) +- Bump `protobuf-java` to 3.22.5 ([#16779](https://github.com/opensearch-project/OpenSearch/pull/16779)) ### Changed ### Deprecated diff --git a/buildSrc/version.properties b/buildSrc/version.properties index 82e2142f61582..901c1fa2066ea 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -21,7 +21,7 @@ asm = 9.5 woodstox = 6.4.0 kotlin = 1.7.10 guava = 32.0.1-jre -protobuf = 3.22.3 +protobuf = 3.22.5 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.5.0 diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index 829abc080428a..ae2d3f1f72060 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -62,7 +62,7 @@ dependencies { api 'com.google.api:gax:1.54.0' api 'org.threeten:threetenbp:1.4.4' api 'com.google.protobuf:protobuf-java-util:3.19.3' - api 'com.google.protobuf:protobuf-java:3.21.7' + api "com.google.protobuf:protobuf-java:${versions.protobuf}" api 'com.google.code.gson:gson:2.8.9' api 'com.google.api.grpc:proto-google-common-protos:1.16.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.5.jar.sha1 b/plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 new file mode 100644 index 0000000000000..80feeec023e7b --- /dev/null +++ b/plugins/repository-gcs/licenses/protobuf-java-3.22.5.jar.sha1 @@ -0,0 +1 @@ +fdee98b8f6abab73f146a4edb4c09e56f8278d03 \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 573d342c90794..f514bb5a9d275 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -67,7 +67,7 @@ dependencies { api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" api 'com.google.code.gson:gson:2.9.0' runtimeOnly "com.google.guava:guava:${versions.guava}" - api 'com.google.protobuf:protobuf-java:3.21.9' + api "com.google.protobuf:protobuf-java:${versions.protobuf}" api 'commons-logging:commons-logging:1.1.3' api 'commons-cli:commons-cli:1.2' api "commons-codec:commons-codec:${versions.commonscodec}" diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1 deleted file mode 100644 index 2e03dbe5dafd0..0000000000000 --- a/plugins/repository-hdfs/licenses/protobuf-java-3.21.9.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -ed1240d9231044ce6ccf1978512f6e44416bb7e7 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 b/plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 new file mode 100644 index 0000000000000..80feeec023e7b --- /dev/null +++ b/plugins/repository-hdfs/licenses/protobuf-java-3.22.5.jar.sha1 @@ -0,0 +1 @@ +fdee98b8f6abab73f146a4edb4c09e56f8278d03 \ No newline at end of file From 6c40db04510f4d8f47f77e23605c2dcfb085bc4b Mon Sep 17 00:00:00 2001 From: Owais Kazi Date: Wed, 4 Dec 2024 13:47:59 -0800 Subject: [PATCH 2/2] [1.3] Upgrades commonsio to 2.16.0 (#16780) * Upgrades commonsio to 2.16.0 Signed-off-by: Owais * Adds CHANGELOG Signed-off-by: Owais --------- Signed-off-by: Owais --- CHANGELOG.md | 1 + buildSrc/build.gradle | 2 +- plugins/discovery-azure-classic/build.gradle | 2 +- .../discovery-azure-classic/licenses/commons-io-2.16.0.jar.sha1 | 1 + .../discovery-azure-classic/licenses/commons-io-2.7.jar.sha1 | 1 - plugins/ingest-attachment/build.gradle | 2 +- plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 | 1 - plugins/ingest-attachment/licenses/commons-io-2.16.0.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 2 +- plugins/repository-hdfs/licenses/commons-io-2.11.0.jar.sha1 | 1 - plugins/repository-hdfs/licenses/commons-io-2.16.0.jar.sha1 | 1 + 11 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 plugins/discovery-azure-classic/licenses/commons-io-2.16.0.jar.sha1 delete mode 100644 plugins/discovery-azure-classic/licenses/commons-io-2.7.jar.sha1 delete mode 100644 plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 create mode 100644 plugins/ingest-attachment/licenses/commons-io-2.16.0.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/commons-io-2.11.0.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/commons-io-2.16.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index a22f2086230c0..3419220361939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Bump `Netty` from 4.1.114.Final to 4.1.115.Final ([#16661](https://github.com/opensearch-project/OpenSearch/pull/16661)) - Bump `avro` from 1.11.3 to 1.11.4 ([#16773](https://github.com/opensearch-project/OpenSearch/pull/16773)) - Bump `protobuf-java` to 3.22.5 ([#16779](https://github.com/opensearch-project/OpenSearch/pull/16779)) +- Bump `commonsio` to 2.16.0 ([#16780](https://github.com/opensearch-project/OpenSearch/pull/16780)) ### Changed ### Deprecated diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 3da274ef4244f..39ee079b5b6e6 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -126,7 +126,7 @@ dependencies { } api 'org.eclipse.jgit:org.eclipse.jgit:6.8.0.202311291450-r' api 'org.apache.rat:apache-rat:0.13' - api 'commons-io:commons-io:2.7' + api 'commons-io:commons-io:2.16.0' api "net.java.dev.jna:jna:5.5.0" api 'com.github.jengelman.gradle.plugins:shadow:6.0.0' api 'de.thetaphi:forbiddenapis:3.2' diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle index f02d964893709..68bda0933daa7 100644 --- a/plugins/discovery-azure-classic/build.gradle +++ b/plugins/discovery-azure-classic/build.gradle @@ -53,7 +53,7 @@ dependencies { api "org.apache.logging.log4j:log4j-1.2-api:${versions.log4j}" api "commons-codec:commons-codec:${versions.commonscodec}" api "commons-lang:commons-lang:2.6" - api "commons-io:commons-io:2.7" + api "commons-io:commons-io:2.16.0" api 'javax.mail:mail:1.4.7' api 'javax.inject:javax.inject:1' api "com.sun.jersey:jersey-client:${versions.jersey}" diff --git a/plugins/discovery-azure-classic/licenses/commons-io-2.16.0.jar.sha1 b/plugins/discovery-azure-classic/licenses/commons-io-2.16.0.jar.sha1 new file mode 100644 index 0000000000000..6a7b638719fa3 --- /dev/null +++ b/plugins/discovery-azure-classic/licenses/commons-io-2.16.0.jar.sha1 @@ -0,0 +1 @@ +27875a7935f1ddcc13267eb6fae1f719e0409572 \ No newline at end of file diff --git a/plugins/discovery-azure-classic/licenses/commons-io-2.7.jar.sha1 b/plugins/discovery-azure-classic/licenses/commons-io-2.7.jar.sha1 deleted file mode 100644 index bbb1b15dd1e1e..0000000000000 --- a/plugins/discovery-azure-classic/licenses/commons-io-2.7.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -3f2bd4ba11c4162733c13cc90ca7c7ea09967102 \ No newline at end of file diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index cf26d8a1c3641..b633ecb56769e 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/build.gradle @@ -57,7 +57,7 @@ dependencies { runtimeOnly "com.google.guava:guava:${versions.guava}" // Other dependencies api 'org.tukaani:xz:1.9' - api 'commons-io:commons-io:2.11.0' + api 'commons-io:commons-io:2.16.0' api "org.slf4j:slf4j-api:${versions.slf4j}" // character set detection diff --git a/plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 deleted file mode 100644 index 8adec30bade49..0000000000000 --- a/plugins/ingest-attachment/licenses/commons-io-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2503f302b11ebde7ebc3df41daebe0e4eea3689 \ No newline at end of file diff --git a/plugins/ingest-attachment/licenses/commons-io-2.16.0.jar.sha1 b/plugins/ingest-attachment/licenses/commons-io-2.16.0.jar.sha1 new file mode 100644 index 0000000000000..6a7b638719fa3 --- /dev/null +++ b/plugins/ingest-attachment/licenses/commons-io-2.16.0.jar.sha1 @@ -0,0 +1 @@ +27875a7935f1ddcc13267eb6fae1f719e0409572 \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index f514bb5a9d275..f924245b5404b 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -74,7 +74,7 @@ dependencies { api 'commons-collections:commons-collections:3.2.2' api 'org.apache.commons:commons-compress:1.21' api 'org.apache.commons:commons-configuration2:2.8.0' - api 'commons-io:commons-io:2.11.0' + api 'commons-io:commons-io:2.16.0' api 'org.apache.commons:commons-lang3:3.7' implementation 'com.google.re2j:re2j:1.1' api 'javax.servlet:servlet-api:2.5' diff --git a/plugins/repository-hdfs/licenses/commons-io-2.11.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-io-2.11.0.jar.sha1 deleted file mode 100644 index 8adec30bade49..0000000000000 --- a/plugins/repository-hdfs/licenses/commons-io-2.11.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -a2503f302b11ebde7ebc3df41daebe0e4eea3689 \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/commons-io-2.16.0.jar.sha1 b/plugins/repository-hdfs/licenses/commons-io-2.16.0.jar.sha1 new file mode 100644 index 0000000000000..6a7b638719fa3 --- /dev/null +++ b/plugins/repository-hdfs/licenses/commons-io-2.16.0.jar.sha1 @@ -0,0 +1 @@ +27875a7935f1ddcc13267eb6fae1f719e0409572 \ No newline at end of file