From a825f9f325176097a430bb3c2aadec526b69fec0 Mon Sep 17 00:00:00 2001 From: Mulugeta Mammo Date: Mon, 24 Mar 2025 20:31:15 +0000 Subject: [PATCH 1/3] Bump ZSTD lib to version 1.5.6-1. Signed-off-by: Mulugeta Mammo --- gradle/libs.versions.toml | 2 +- libs/compress/licenses/zstd-jni-1.5.5-5.jar.sha1 | 1 - libs/compress/licenses/zstd-jni-1.5.6-1.jar.sha1 | 1 + server/src/main/java/org/opensearch/bootstrap/Security.java | 2 +- .../src/test/java/org/opensearch/bootstrap/SecurityTests.java | 4 ++-- 5 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 libs/compress/licenses/zstd-jni-1.5.5-5.jar.sha1 create mode 100644 libs/compress/licenses/zstd-jni-1.5.6-1.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4ccb794137c14..be347e06dc86a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -78,7 +78,7 @@ bytebuddy = "1.15.10" jmh = "1.35" # compression -zstd = "1.5.5-5" +zstd = "1.5.6-1" jzlib = "1.1.3" diff --git a/libs/compress/licenses/zstd-jni-1.5.5-5.jar.sha1 b/libs/compress/licenses/zstd-jni-1.5.5-5.jar.sha1 deleted file mode 100644 index 498c60c34e3da..0000000000000 --- a/libs/compress/licenses/zstd-jni-1.5.5-5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74ffdc5f140080adacf5278287aadd950179f848 \ No newline at end of file diff --git a/libs/compress/licenses/zstd-jni-1.5.6-1.jar.sha1 b/libs/compress/licenses/zstd-jni-1.5.6-1.jar.sha1 new file mode 100644 index 0000000000000..0b0e63e9e598d --- /dev/null +++ b/libs/compress/licenses/zstd-jni-1.5.6-1.jar.sha1 @@ -0,0 +1 @@ +d6c1fbcf83d1d125fb8dbc7e3c5208729057d9a7 diff --git a/server/src/main/java/org/opensearch/bootstrap/Security.java b/server/src/main/java/org/opensearch/bootstrap/Security.java index acf2d7ec6a5ac..9c93b0414bdda 100644 --- a/server/src/main/java/org/opensearch/bootstrap/Security.java +++ b/server/src/main/java/org/opensearch/bootstrap/Security.java @@ -256,7 +256,7 @@ static Policy readPolicy(URL policyFile, Map codebases) { // - netty-tcnative-boringssl-static-2.0.61.Final-linux-x86_64.jar // - kafka-server-common-3.6.1-test.jar // - lucene-core-9.11.0-snapshot-8a555eb.jar - // - zstd-jni-1.5.5-5.jar + // - zstd-jni-1.5.6-1.jar jarsWithPossibleClassifiers.put(codebase, matcher.group(2)); } else { String property = "codebase." + name; diff --git a/server/src/test/java/org/opensearch/bootstrap/SecurityTests.java b/server/src/test/java/org/opensearch/bootstrap/SecurityTests.java index ae57a1b0916cb..9bd5e46fe50a5 100644 --- a/server/src/test/java/org/opensearch/bootstrap/SecurityTests.java +++ b/server/src/test/java/org/opensearch/bootstrap/SecurityTests.java @@ -96,8 +96,8 @@ public void testReadPolicyWithCodebases() throws IOException { new URL("file://test-kafka-server-common-3.6.1-test.jar"), "test-lucene-core-9.11.0-snapshot-8a555eb.jar", new URL("file://test-lucene-core-9.11.0-snapshot-8a555eb.jar"), - "test-zstd-jni-1.5.5-5.jar", - new URL("file://test-zstd-jni-1.5.5-5.jar") + "test-zstd-jni-1.5.6-1.jar", + new URL("file://test-zstd-jni-1.5.6-1.jar") ); AccessController.doPrivileged( From e38dc9a902ee5d2a0d05002601a192da3c062930 Mon Sep 17 00:00:00 2001 From: Mulugeta Mammo Date: Mon, 24 Mar 2025 21:16:39 +0000 Subject: [PATCH 2/3] Update CHANGELOG.md for ZSTD version bump. Signed-off-by: Mulugeta Mammo --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c90fc26867b0..091edd1a36862 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `org.jruby.joni:joni` from 2.2.3 to 2.2.5 ([#17608](https://github.com/opensearch-project/OpenSearch/pull/17608)) - Bump `dangoslen/dependabot-changelog-helper` from 3 to 4 ([#17498](https://github.com/opensearch-project/OpenSearch/pull/17498)) - Bump `com.google.api:gax` from 2.35.0 to 2.63.1 ([#17465](https://github.com/opensearch-project/OpenSearch/pull/17465)) +- Bump `com.github.luben:zstd-jni` from 1.5.5-1 to 1.5.6-1 ([#17674](https://github.com/opensearch-project/OpenSearch/pull/17674)) ### Changed From ae4068e744d95e9df0f6f39ad6240d71fe112cd0 Mon Sep 17 00:00:00 2001 From: Mulugeta Mammo Date: Mon, 24 Mar 2025 21:26:08 +0000 Subject: [PATCH 3/3] Update zstd-jni SHA. Signed-off-by: Mulugeta Mammo --- server/licenses/zstd-jni-1.5.5-5.jar.sha1 | 1 - server/licenses/zstd-jni-1.5.6-1.jar.sha1 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 server/licenses/zstd-jni-1.5.5-5.jar.sha1 create mode 100644 server/licenses/zstd-jni-1.5.6-1.jar.sha1 diff --git a/server/licenses/zstd-jni-1.5.5-5.jar.sha1 b/server/licenses/zstd-jni-1.5.5-5.jar.sha1 deleted file mode 100644 index 498c60c34e3da..0000000000000 --- a/server/licenses/zstd-jni-1.5.5-5.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -74ffdc5f140080adacf5278287aadd950179f848 \ No newline at end of file diff --git a/server/licenses/zstd-jni-1.5.6-1.jar.sha1 b/server/licenses/zstd-jni-1.5.6-1.jar.sha1 new file mode 100644 index 0000000000000..21ecbb2972e33 --- /dev/null +++ b/server/licenses/zstd-jni-1.5.6-1.jar.sha1 @@ -0,0 +1 @@ +d6c1fbcf83d1d125fb8dbc7e3c5208729057d9a7 \ No newline at end of file