SOLR-13779: Use the safe fork of simple-xml for clustering contrib

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}

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)

solr/contrib/clustering/ivy.xml

@@ -27,7 +27,7 @@
     <dependency org="org.carrot2.shaded" name="carrot2-guava" rev="${/org.carrot2.shaded/carrot2-guava}" conf="compile"/>
     <dependency org="org.carrot2.attributes" name="attributes-binder" rev="${/org.carrot2.attributes/attributes-binder}" conf="compile"/>
 
-    <dependency org="org.simpleframework" name="simple-xml" rev="${/org.simpleframework/simple-xml}" conf="compile"/>
+    <dependency org="com.carrotsearch.thirdparty" name="simple-xml-safe" rev="${/com.carrotsearch.thirdparty/simple-xml-safe}" conf="compile"/>
 
     <dependency org="com.fasterxml.jackson.core" name="jackson-annotations"  rev="${/com.fasterxml.jackson.core/jackson-annotations}"   conf="compile"/>
     <dependency org="com.fasterxml.jackson.core" name="jackson-databind"     rev="${/com.fasterxml.jackson.core/jackson-databind}"      conf="compile"/>

solr/licenses/simple-xml-2.7.1.jar.sha1

@@ -1 +0,0 @@
-dd91fb744c2ff921407475cb29a1e3fee397d411

solr/licenses/simple-xml-NOTICE.txt

@@ -1,2 +0,0 @@
-This product includes software developed by
-the SimpleXML project (http://simple.sourceforge.net).

solr/licenses/simple-xml-safe-2.7.1.jar.sha1

@@ -0,0 +1 @@
+045fda5ac6087bc82a209d8cdb73f8d0dbdcfc7b

solr/licenses/simple-xml-safe-NOTICE.txt

@@ -0,0 +1,2 @@
+This product includes software developed by
+the SimpleXML project (http://simple.sourceforge.net).