From 722fbfdef5ca2995e1a2a091fc20677260b3a0c0 Mon Sep 17 00:00:00 2001 From: Vacha Shah Date: Wed, 26 Oct 2022 17:16:52 -0700 Subject: [PATCH] Upgrade woodstox (#4947) * Bump woodstox-core to 6.4.0 Signed-off-by: Vacha Shah * Update CHANGELOG Signed-off-by: Vacha Shah Signed-off-by: Vacha Shah --- CHANGELOG.md | 1 + buildSrc/version.properties | 1 + plugins/repository-azure/build.gradle | 2 +- plugins/repository-azure/licenses/woodstox-core-6.2.8.jar.sha1 | 1 - plugins/repository-azure/licenses/woodstox-core-6.4.0.jar.sha1 | 1 + plugins/repository-hdfs/build.gradle | 2 +- plugins/repository-hdfs/licenses/woodstox-core-6.3.1.jar.sha1 | 1 - plugins/repository-hdfs/licenses/woodstox-core-6.4.0.jar.sha1 | 1 + test/fixtures/hdfs-fixture/build.gradle | 1 + 9 files changed, 7 insertions(+), 4 deletions(-) delete mode 100644 plugins/repository-azure/licenses/woodstox-core-6.2.8.jar.sha1 create mode 100644 plugins/repository-azure/licenses/woodstox-core-6.4.0.jar.sha1 delete mode 100644 plugins/repository-hdfs/licenses/woodstox-core-6.3.1.jar.sha1 create mode 100644 plugins/repository-hdfs/licenses/woodstox-core-6.4.0.jar.sha1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4701894f067c2..c60d79679a9b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -78,6 +78,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Upgrade netty to 4.1.84.Final ([#4893](https://github.com/opensearch-project/OpenSearch/pull/4893)) - Dependency updates: asm 9.3 -> 9.4, bytebuddy 1.12.12 -> 1.12.18 ([#4889](https://github.com/opensearch-project/OpenSearch/pull/4889)) - Update Apache Lucene to 9.4.1 ([#4922](https://github.com/opensearch-project/OpenSearch/pull/4922)) +- Bump `woodstox-core` to 6.4.0 ([#4947](https://github.com/opensearch-project/OpenSearch/pull/4947)) ### Changed - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308)) diff --git a/buildSrc/version.properties b/buildSrc/version.properties index ccd90bcf7d802..f224c7d0ecc38 100644 --- a/buildSrc/version.properties +++ b/buildSrc/version.properties @@ -19,6 +19,7 @@ log4j = 2.17.1 slf4j = 1.7.36 asm = 9.4 jettison = 1.5.1 +woodstox = 6.4.0 # when updating the JNA version, also update the version in buildSrc/build.gradle jna = 5.12.1 diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 87f3a25d3036b..063851b3a7edf 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -67,7 +67,7 @@ dependencies { api "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:${versions.jackson}" api "com.fasterxml.jackson.module:jackson-module-jaxb-annotations:${versions.jackson}" api 'org.codehaus.woodstox:stax2-api:4.2.1' - implementation 'com.fasterxml.woodstox:woodstox-core:6.2.8' + implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" runtimeOnly 'com.google.guava:guava:31.1-jre' api 'org.apache.commons:commons-lang3:3.12.0' testImplementation project(':test:fixtures:azure-fixture') diff --git a/plugins/repository-azure/licenses/woodstox-core-6.2.8.jar.sha1 b/plugins/repository-azure/licenses/woodstox-core-6.2.8.jar.sha1 deleted file mode 100644 index ae65cdebf26de..0000000000000 --- a/plugins/repository-azure/licenses/woodstox-core-6.2.8.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -670748292899c53b1963730d9eb7f8ab71314e90 \ No newline at end of file diff --git a/plugins/repository-azure/licenses/woodstox-core-6.4.0.jar.sha1 b/plugins/repository-azure/licenses/woodstox-core-6.4.0.jar.sha1 new file mode 100644 index 0000000000000..cac5f37205956 --- /dev/null +++ b/plugins/repository-azure/licenses/woodstox-core-6.4.0.jar.sha1 @@ -0,0 +1 @@ +c47579857bbf12c85499f431d4ecf27d77976b7c \ No newline at end of file diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 07dc8b8547b80..f6363f24ff783 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -85,7 +85,7 @@ dependencies { api 'net.minidev:json-smart:2.4.8' api 'org.apache.zookeeper:zookeeper:3.8.0' api "io.netty:netty-all:${versions.netty}" - implementation 'com.fasterxml.woodstox:woodstox-core:6.3.1' + implementation "com.fasterxml.woodstox:woodstox-core:${versions.woodstox}" implementation 'org.codehaus.woodstox:stax2-api:4.2.1' hdfsFixture project(':test:fixtures:hdfs-fixture') diff --git a/plugins/repository-hdfs/licenses/woodstox-core-6.3.1.jar.sha1 b/plugins/repository-hdfs/licenses/woodstox-core-6.3.1.jar.sha1 deleted file mode 100644 index fb4e67404cd42..0000000000000 --- a/plugins/repository-hdfs/licenses/woodstox-core-6.3.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -bf29b07ca4dd81ef3c0bc18c8bd5617510a81c5d \ No newline at end of file diff --git a/plugins/repository-hdfs/licenses/woodstox-core-6.4.0.jar.sha1 b/plugins/repository-hdfs/licenses/woodstox-core-6.4.0.jar.sha1 new file mode 100644 index 0000000000000..cac5f37205956 --- /dev/null +++ b/plugins/repository-hdfs/licenses/woodstox-core-6.4.0.jar.sha1 @@ -0,0 +1 @@ +c47579857bbf12c85499f431d4ecf27d77976b7c \ No newline at end of file diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle index b35cb7eb1cfd5..6c00465b6c842 100644 --- a/test/fixtures/hdfs-fixture/build.gradle +++ b/test/fixtures/hdfs-fixture/build.gradle @@ -46,6 +46,7 @@ dependencies { api "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}" 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.4.8' api "org.mockito:mockito-core:${versions.mockito}" api "com.google.protobuf:protobuf-java:3.21.8"