Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16568: Update FasterXML Woodstox to 6.4.0 (#1209)

kiratraynor84b726030713
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index b84be39d6e8..8575b0e0034 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -158,7 +158,9 @@ Other Changes
* SOLR-15861: ConcurrentUpdateSolrClient should work with ManagedExecutorService (Sammy Chu, Kevin Risden)
-SOLR-16575: splitshard should honour createNodeSet (noble)
+* SOLR-16575: splitshard should honour createNodeSet (noble)
+
+* SOLR-16568: Upgrade woodstox-core to 6.4.0 (Kira Traynor)
================== 9.1.0 ==================
diff --git a/solr/licenses/woodstox-core-6.3.1.jar.sha1 b/solr/licenses/woodstox-core-6.3.1.jar.sha1
deleted file mode 100644
index ff23ca0a9e0..00000000000
--- a/solr/licenses/woodstox-core-6.3.1.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-bf29b07ca4dd81ef3c0bc18c8bd5617510a81c5d
diff --git a/solr/licenses/woodstox-core-6.4.0.jar.sha1 b/solr/licenses/woodstox-core-6.4.0.jar.sha1
new file mode 100644
index 00000000000..f1a5d351ed0
--- /dev/null
+++ b/solr/licenses/woodstox-core-6.4.0.jar.sha1
@@ -0,0 +1 @@
+c47579857bbf12c85499f431d4ecf27d77976b7c
diff --git a/versions.lock b/versions.lock
index 2abf7a6207b..3648ec1eb19 100644
--- a/versions.lock
+++ b/versions.lock
@@ -12,7 +12,7 @@ com.fasterxml.jackson.core:jackson-core:2.13.4 (13 constraints: 3c026a27)
com.fasterxml.jackson.core:jackson-databind:2.13.4.2 (18 constraints: 3a6455da)
com.fasterxml.jackson.dataformat:jackson-dataformat-smile:2.13.4 (1 constraints: ba0ea766)
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4 (2 constraints: a624c1e0)
-com.fasterxml.woodstox:woodstox-core:6.3.1 (3 constraints: b5283aba)
+com.fasterxml.woodstox:woodstox-core:6.4.0 (3 constraints: af28dab7)
com.github.ben-manes.caffeine:caffeine:3.1.1 (1 constraints: 0705fe35)
com.github.jai-imageio:jai-imageio-core:1.4.0 (1 constraints: 5c0ced01)
com.github.junrar:junrar:7.5.2 (1 constraints: 650c1002)
diff --git a/versions.props b/versions.props
index 612bdec8463..95a10dc8226 100644
--- a/versions.props
+++ b/versions.props
@@ -4,7 +4,7 @@ com.carrotsearch.randomizedtesting:*=2.8.1
com.carrotsearch:hppc=0.9.1
com.cybozu.labs:langdetect=1.1-20120112
com.fasterxml.jackson:jackson-bom=2.13.4.20221013
-com.fasterxml.woodstox:woodstox-core=6.2.8
+com.fasterxml.woodstox:woodstox-core=6.4.0
com.github.ben-manes.caffeine:caffeine=3.1.1
com.github.spotbugs:*=4.7.2
com.google.cloud:google-cloud-bom=0.178.0