From e62298e10079b39e4a660f99e2526da9da77ae5a Mon Sep 17 00:00:00 2001 From: Daniel Widdis Date: Tue, 11 Mar 2025 12:20:18 -0400 Subject: [PATCH 1/2] Add json-smart to version catalog (#17569) Signed-off-by: Daniel Widdis --- gradle/libs.versions.toml | 1 + plugins/repository-azure/build.gradle | 6 +++--- .../licenses/accessors-smart-2.5.1.jar.sha1 | 1 - .../licenses/accessors-smart-2.5.2.jar.sha1 | 1 + plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1 | 1 - plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 2 +- test/fixtures/hdfs-fixture/build.gradle | 2 +- 8 files changed, 8 insertions(+), 7 deletions(-) delete mode 100644 plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1 create mode 100644 plugins/repository-azure/licenses/accessors-smart-2.5.2.jar.sha1 delete mode 100644 plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1 create mode 100644 plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9e17d3b2b8bfd..f28ca5f116b89 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -28,6 +28,7 @@ google_auth = "1.29.0" tdigest = "3.2" hdrhistogram = "2.2.2" grpc = "1.68.2" +json_smart = "2.5.2" # when updating the JNA version, also update the version in buildSrc/build.gradle jna = "5.13.0" diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index c9297bd592437..d42d02ca340d0 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -67,9 +67,9 @@ dependencies { api 'com.nimbusds:content-type:2.3' api 'com.nimbusds:lang-tag:1.7' // Both msal4j:1.14.3 and oauth2-oidc-sdk:11.9.1 has compile dependency on different versions of json-smart, - // selected the higher version which is 2.5.0 - api 'net.minidev:json-smart:2.5.1' - api 'net.minidev:accessors-smart:2.5.1' + // selected the higher version + api "net.minidev:json-smart:${versions.json_smart}" + api "net.minidev:accessors-smart:${versions.json_smart}" api "org.ow2.asm:asm:${versions.asm}" // End of transitive dependencies for azure-identity api "io.projectreactor.netty:reactor-netty-core:${versions.reactor_netty}" diff --git a/plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1 b/plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1 deleted file mode 100644 index 8f7452437323d..0000000000000 --- a/plugins/repository-azure/licenses/accessors-smart-2.5.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -19b820261eb2e7de7d5bde11d1c06e4501dd7e5f \ No newline at end of file diff --git a/plugins/repository-azure/licenses/accessors-smart-2.5.2.jar.sha1 b/plugins/repository-azure/licenses/accessors-smart-2.5.2.jar.sha1 new file mode 100644 index 0000000000000..6012c3d0379f6 --- /dev/null +++ b/plugins/repository-azure/licenses/accessors-smart-2.5.2.jar.sha1 @@ -0,0 +1 @@ +ce16fd235cfee48e67eda33e684423bba09f7d07 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1 b/plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1 deleted file mode 100644 index fe23968afce1e..0000000000000 --- a/plugins/repository-azure/licenses/json-smart-2.5.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4c11d2808d009132dfbbf947ebf37de6bf266c8e \ No newline at end of file diff --git a/plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1 b/plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1 new file mode 100644 index 0000000000000..97fc7b94f0fd2 --- /dev/null +++ b/plugins/repository-azure/licenses/json-smart-2.5.2.jar.sha1 @@ -0,0 +1 @@ +95d166b18f95907be0f46cdb9e1c0695eed03387 \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 4cfb572929f54..d3c92ac39f5b4 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -81,7 +81,7 @@ dependencies { api 'javax.servlet:servlet-api:2.5' api "org.slf4j:slf4j-api:${versions.slf4j}" api "org.apache.logging.log4j:log4j-slf4j-impl:${versions.log4j}" - api 'net.minidev:json-smart:2.5.2' + api "net.minidev:json-smart:${versions.json_smart}" api "io.netty:netty-all:${versions.netty}" implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" implementation 'org.codehaus.woodstox:stax2-api:4.2.2' diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index 5aa7fdb70810c..b3ebeb638c4e0 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -64,7 +64,7 @@ dependencies { api "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:${versions.jackson}" api "com.fasterxml.jackson.core:jackson-databind:${versions.jackson_databind}" api "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" - api 'net.minidev:json-smart:2.5.2' + api "net.minidev:json-smart:${versions.json_smart}" api "org.mockito:mockito-core:${versions.mockito}" api "com.google.protobuf:protobuf-java:3.22.2" api "org.jetbrains.kotlin:kotlin-stdlib:${versions.kotlin}" From bdc3da2d3c16eff06b16eff91c8bd9aa82f33589 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Mar 2025 19:48:27 -0700 Subject: [PATCH 2/2] Bump org.jruby.jcodings:jcodings from 1.0.61 to 1.0.63 in /libs/grok (#17560) * Bump org.jruby.jcodings:jcodings from 1.0.61 to 1.0.63 in /libs/grok Bumps [org.jruby.jcodings:jcodings](https://github.com/jruby/jcodings) from 1.0.61 to 1.0.63. - [Commits](https://github.com/jruby/jcodings/compare/jcodings-1.0.61...jcodings-1.0.63) --- updated-dependencies: - dependency-name: org.jruby.jcodings:jcodings dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Updating SHAs Signed-off-by: dependabot[bot] * Update changelog Signed-off-by: dependabot[bot] --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> --- CHANGELOG.md | 1 + libs/grok/build.gradle | 2 +- libs/grok/licenses/jcodings-1.0.61.jar.sha1 | 1 - libs/grok/licenses/jcodings-1.0.63.jar.sha1 | 1 + test/framework/licenses/byte-buddy-1.15.10.jar.sha1 | 1 + test/framework/licenses/commons-codec-1.16.1.jar.sha1 | 1 + test/framework/licenses/commons-logging-1.2.jar.sha1 | 1 + test/framework/licenses/hamcrest-2.1.jar.sha1 | 1 + test/framework/licenses/junit-4.13.2.jar.sha1 | 1 + test/framework/licenses/lucene-codecs-9.12.1.jar.sha1 | 1 + test/framework/licenses/lucene-test-framework-9.12.1.jar.sha1 | 1 + test/framework/licenses/mockito-core-5.14.2.jar.sha1 | 1 + test/framework/licenses/objenesis-3.3.jar.sha1 | 1 + test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1 | 1 + 14 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 libs/grok/licenses/jcodings-1.0.61.jar.sha1 create mode 100644 libs/grok/licenses/jcodings-1.0.63.jar.sha1 create mode 100644 test/framework/licenses/byte-buddy-1.15.10.jar.sha1 create mode 100644 test/framework/licenses/commons-codec-1.16.1.jar.sha1 create mode 100644 test/framework/licenses/commons-logging-1.2.jar.sha1 create mode 100644 test/framework/licenses/hamcrest-2.1.jar.sha1 create mode 100644 test/framework/licenses/junit-4.13.2.jar.sha1 create mode 100644 test/framework/licenses/lucene-codecs-9.12.1.jar.sha1 create mode 100644 test/framework/licenses/lucene-test-framework-9.12.1.jar.sha1 create mode 100644 test/framework/licenses/mockito-core-5.14.2.jar.sha1 create mode 100644 test/framework/licenses/objenesis-3.3.jar.sha1 create mode 100644 test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index e42714c3c704e..130c2117f5679 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bump `net.minidev:json-smart` from 2.5.1 to 2.5.2 ([#17378](https://github.com/opensearch-project/OpenSearch/pull/17378)) - Bump `com.netflix.nebula.ospackage-base` from 11.10.1 to 11.11.1 ([#17374](https://github.com/opensearch-project/OpenSearch/pull/17374)) - Bump `software.amazon.awssdk` from 2.20.86 to 2.30.31 ([17396](https://github.com/opensearch-project/OpenSearch/pull/17396)) +- Bump `org.jruby.jcodings:jcodings` from 1.0.61 to 1.0.63 ([#17560](https://github.com/opensearch-project/OpenSearch/pull/17560)) ### Changed - Convert transport-reactor-netty4 to use gradle version catalog [#17233](https://github.com/opensearch-project/OpenSearch/pull/17233) diff --git a/libs/grok/build.gradle b/libs/grok/build.gradle index 9ea59bc2a77b8..3bcbb59aece56 100644 --- a/libs/grok/build.gradle +++ b/libs/grok/build.gradle @@ -31,7 +31,7 @@ dependencies { api 'org.jruby.joni:joni:2.2.3' // joni dependencies: - api 'org.jruby.jcodings:jcodings:1.0.61' + api 'org.jruby.jcodings:jcodings:1.0.63' testImplementation(project(":test:framework")) { exclude group: 'org.opensearch', module: 'opensearch-grok' diff --git a/libs/grok/licenses/jcodings-1.0.61.jar.sha1 b/libs/grok/licenses/jcodings-1.0.61.jar.sha1 deleted file mode 100644 index df675e0f40640..0000000000000 --- a/libs/grok/licenses/jcodings-1.0.61.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -51b947691d501d0b6b3c04955d82e934e190b7ad \ No newline at end of file diff --git a/libs/grok/licenses/jcodings-1.0.63.jar.sha1 b/libs/grok/licenses/jcodings-1.0.63.jar.sha1 new file mode 100644 index 0000000000000..244c6685e0b52 --- /dev/null +++ b/libs/grok/licenses/jcodings-1.0.63.jar.sha1 @@ -0,0 +1 @@ +b8c386790e72f0bad666c8f1a8af12d0528992e0 \ No newline at end of file diff --git a/test/framework/licenses/byte-buddy-1.15.10.jar.sha1 b/test/framework/licenses/byte-buddy-1.15.10.jar.sha1 new file mode 100644 index 0000000000000..b89163a2aa842 --- /dev/null +++ b/test/framework/licenses/byte-buddy-1.15.10.jar.sha1 @@ -0,0 +1 @@ +635c873fadd853c084f84fdc3cbd58c5dd8537f9 \ No newline at end of file diff --git a/test/framework/licenses/commons-codec-1.16.1.jar.sha1 b/test/framework/licenses/commons-codec-1.16.1.jar.sha1 new file mode 100644 index 0000000000000..6b8803089c6d7 --- /dev/null +++ b/test/framework/licenses/commons-codec-1.16.1.jar.sha1 @@ -0,0 +1 @@ +47bd4d333fba53406f6c6c51884ddbca435c8862 \ No newline at end of file diff --git a/test/framework/licenses/commons-logging-1.2.jar.sha1 b/test/framework/licenses/commons-logging-1.2.jar.sha1 new file mode 100644 index 0000000000000..f40f0242448e8 --- /dev/null +++ b/test/framework/licenses/commons-logging-1.2.jar.sha1 @@ -0,0 +1 @@ +4bfc12adfe4842bf07b657f0369c4cb522955686 \ No newline at end of file diff --git a/test/framework/licenses/hamcrest-2.1.jar.sha1 b/test/framework/licenses/hamcrest-2.1.jar.sha1 new file mode 100644 index 0000000000000..b3084acb6e26c --- /dev/null +++ b/test/framework/licenses/hamcrest-2.1.jar.sha1 @@ -0,0 +1 @@ +9420ba32c29217b54eebd26ff7f9234d31c3fbb2 \ No newline at end of file diff --git a/test/framework/licenses/junit-4.13.2.jar.sha1 b/test/framework/licenses/junit-4.13.2.jar.sha1 new file mode 100644 index 0000000000000..7d065692bff1a --- /dev/null +++ b/test/framework/licenses/junit-4.13.2.jar.sha1 @@ -0,0 +1 @@ +8ac9e16d933b6fb43bc7f576336b8f4d7eb5ba12 \ No newline at end of file diff --git a/test/framework/licenses/lucene-codecs-9.12.1.jar.sha1 b/test/framework/licenses/lucene-codecs-9.12.1.jar.sha1 new file mode 100644 index 0000000000000..25b44c392c2da --- /dev/null +++ b/test/framework/licenses/lucene-codecs-9.12.1.jar.sha1 @@ -0,0 +1 @@ +cf88c401660f80fd7a3c0896c180581126880697 \ No newline at end of file diff --git a/test/framework/licenses/lucene-test-framework-9.12.1.jar.sha1 b/test/framework/licenses/lucene-test-framework-9.12.1.jar.sha1 new file mode 100644 index 0000000000000..beee8fb78b31f --- /dev/null +++ b/test/framework/licenses/lucene-test-framework-9.12.1.jar.sha1 @@ -0,0 +1 @@ +d348aac4eff0371888f45b2aaa9034922b96b466 \ No newline at end of file diff --git a/test/framework/licenses/mockito-core-5.14.2.jar.sha1 b/test/framework/licenses/mockito-core-5.14.2.jar.sha1 new file mode 100644 index 0000000000000..a9fe959400ceb --- /dev/null +++ b/test/framework/licenses/mockito-core-5.14.2.jar.sha1 @@ -0,0 +1 @@ +f7bf936008d7664e2002c3faf0c02071c8d10e7c \ No newline at end of file diff --git a/test/framework/licenses/objenesis-3.3.jar.sha1 b/test/framework/licenses/objenesis-3.3.jar.sha1 new file mode 100644 index 0000000000000..5af6ca9301a38 --- /dev/null +++ b/test/framework/licenses/objenesis-3.3.jar.sha1 @@ -0,0 +1 @@ +1049c09f1de4331e8193e579448d0916d75b7631 \ No newline at end of file diff --git a/test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1 b/test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1 new file mode 100644 index 0000000000000..ff3471361e7e5 --- /dev/null +++ b/test/framework/licenses/randomizedtesting-runner-2.7.1.jar.sha1 @@ -0,0 +1 @@ +e917f4983144c3b969eb7d3648338ecde5e3ba89 \ No newline at end of file