[Backport 1.x] Upgrade woodstox-core (#4950)

* Upgrade woodstox (#4947) * Bump woodstox-core to 6.4.0 Signed-off-by: Vacha Shah <vachshah@amazon.com> * Update CHANGELOG Signed-off-by: Vacha Shah <vachshah@amazon.com> Signed-off-by: Vacha Shah <vachshah@amazon.com> * Update CHANGELOG for 1.x Signed-off-by: Vacha Shah <vachshah@amazon.com> * Remove unused SHAs Signed-off-by: Vacha Shah <vachshah@amazon.com> Signed-off-by: Vacha Shah <vachshah@amazon.com>
opensearch-project · Oct 27, 2022 · 6d5b6fd · 6d5b6fd
1 parent c3d23ca
commit 6d5b6fd
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -21,7 +21,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))
 - Bump reactor-netty-http to 1.0.24 in repository-azure ([#4920](https://github.com/opensearch-project/OpenSearch/pull/4920))
 - Bump `tika` from 2.4.0 to 2.5.0 ([#4929](https://github.com/opensearch-project/OpenSearch/pull/4929))
-
+- Bump `woodstox-core` to 6.4.0 ([#4950](https://github.com/opensearch-project/OpenSearch/pull/4950))
 ### Changed
 - Dependency updates (httpcore, mockito, slf4j, httpasyncclient, commons-codec) ([#4308](https://github.com/opensearch-project/OpenSearch/pull/4308))
 - Use RemoteSegmentStoreDirectory instead of RemoteDirectory ([#4240](https://github.com/opensearch-project/OpenSearch/pull/4240))

diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -17,6 +17,7 @@ supercsv          = 2.4.0
 log4j             = 2.17.1
 slf4j             = 1.6.2
 jettison          = 1.5.1
+woodstox          = 6.4.0
 
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 5.5.0

diff --git 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
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
@@ -0,0 +1 @@
+c47579857bbf12c85499f431d4ecf27d77976b7c
diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -83,7 +83,7 @@ dependencies {
   api 'net.minidev:json-smart:2.4.7'
   api 'org.apache.zookeeper:zookeeper:3.7.0'
   api "io.netty:netty-all:${versions.netty}"
-  implementation 'com.fasterxml.woodstox:woodstox-core:6.2.8'
+  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.2.8.jar.sha1 b/plugins/repository-hdfs/licenses/woodstox-core-6.2.8.jar.sha1
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
@@ -0,0 +1 @@
+c47579857bbf12c85499f431d4ecf27d77976b7c
diff --git a/test/fixtures/hdfs-fixture/build.gradle b/test/fixtures/hdfs-fixture/build.gradle
@@ -45,5 +45,6 @@ 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'
 }