You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2019/09/19 10:35:23 UTC
[lucene-solr] branch branch_8x updated: SOLR-13779: Use the safe
fork of simple-xml for clustering contrib
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch branch_8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
The following commit(s) were added to refs/heads/branch_8x by this push:
new 8c308a9 SOLR-13779: Use the safe fork of simple-xml for clustering contrib
8c308a9 is described below
commit 8c308a940b41a398450656a686b694a5c9caf8d4
Author: Dawid Weiss <dw...@apache.org>
AuthorDate: Thu Sep 19 12:24:26 2019 +0200
SOLR-13779: Use the safe fork of simple-xml for clustering contrib
---
lucene/ivy-versions.properties | 4 ++--
solr/CHANGES.txt | 2 ++
solr/contrib/clustering/ivy.xml | 2 +-
solr/licenses/simple-xml-2.7.1.jar.sha1 | 1 -
solr/licenses/simple-xml-NOTICE.txt | 2 --
solr/licenses/simple-xml-safe-2.7.1.jar.sha1 | 1 +
.../{simple-xml-LICENSE-ASL.txt => simple-xml-safe-LICENSE-ASL.txt} | 0
solr/licenses/simple-xml-safe-NOTICE.txt | 2 ++
8 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 1fe450b..12f7bc8 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 b273b2a..31ceba4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -166,6 +166,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 a799c79..1de378c 100644
--- a/solr/contrib/clustering/ivy.xml
+++ b/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"/>
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 d790fb4..0000000
--- 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 6f139d6..0000000
--- 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 0000000..75e4299
--- /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 0000000..154ac0a
--- /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