diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 1fe450b83ec..12f7bc81709 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -8,6 +8,8 @@ com.carrotsearch.randomizedtesting.version = 2.7.2 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} +/com.carrotsearch.thirdparty/simple-xml-safe = 2.7.1 + /com.carrotsearch/hppc = 0.8.1 /com.cybozu.labs/langdetect = 1.1-20120112 @@ -302,8 +304,6 @@ org.restlet.jee.version = 2.3.0 /org.rrd4j/rrd4j = 3.5 -/org.simpleframework/simple-xml = 2.7.1 - org.slf4j.version = 1.7.24 /org.slf4j/jcl-over-slf4j = ${org.slf4j.version} /org.slf4j/jul-to-slf4j = ${org.slf4j.version} diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 9b8e69c9e08..a2415f27aa6 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -223,6 +223,8 @@ Bug Fixes Other Changes ---------------------- +* SOLR-13779: Use the safe fork of simple-xml for clustering contrib. (Dawid Weiss) + * SOLR-13585: Factor out SearchGroupsResultTransformer.[de]serializeOneSearchGroup methods. (Christine Poerschke, Diego Ceccarelli) * SOLR-12870: Use StandardCharsets instead of String values (Peter Somogyi via Munendra S N) diff --git a/solr/contrib/clustering/ivy.xml b/solr/contrib/clustering/ivy.xml index a799c79fbf4..1de378ceb89 100644 --- a/solr/contrib/clustering/ivy.xml +++ b/solr/contrib/clustering/ivy.xml @@ -27,7 +27,7 @@ - + diff --git a/solr/licenses/simple-xml-2.7.1.jar.sha1 b/solr/licenses/simple-xml-2.7.1.jar.sha1 deleted file mode 100644 index d790fb404a1..00000000000 --- a/solr/licenses/simple-xml-2.7.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dd91fb744c2ff921407475cb29a1e3fee397d411 diff --git a/solr/licenses/simple-xml-NOTICE.txt b/solr/licenses/simple-xml-NOTICE.txt deleted file mode 100644 index 6f139d6e8d6..00000000000 --- a/solr/licenses/simple-xml-NOTICE.txt +++ /dev/null @@ -1,2 +0,0 @@ -This product includes software developed by -the SimpleXML project (http://simple.sourceforge.net). diff --git a/solr/licenses/simple-xml-safe-2.7.1.jar.sha1 b/solr/licenses/simple-xml-safe-2.7.1.jar.sha1 new file mode 100644 index 00000000000..75e4299c12c --- /dev/null +++ b/solr/licenses/simple-xml-safe-2.7.1.jar.sha1 @@ -0,0 +1 @@ +045fda5ac6087bc82a209d8cdb73f8d0dbdcfc7b diff --git a/solr/licenses/simple-xml-LICENSE-ASL.txt b/solr/licenses/simple-xml-safe-LICENSE-ASL.txt similarity index 100% rename from solr/licenses/simple-xml-LICENSE-ASL.txt rename to solr/licenses/simple-xml-safe-LICENSE-ASL.txt diff --git a/solr/licenses/simple-xml-safe-NOTICE.txt b/solr/licenses/simple-xml-safe-NOTICE.txt new file mode 100644 index 00000000000..154ac0a6b49 --- /dev/null +++ b/solr/licenses/simple-xml-safe-NOTICE.txt @@ -0,0 +1,2 @@ +This product includes software developed by +the SimpleXML project (http://simple.sourceforge.net). \ No newline at end of file