From d130bffa8f969d027f985f47124bf9d72f5bb7e2 Mon Sep 17 00:00:00 2001 From: Dawid Weiss Date: Fri, 13 Dec 2019 15:13:26 +0100 Subject: [PATCH] LUCENE-9092: Upgrade randomizedtesting to 2.7.5 and Carrot2 to 3.16.2 --- lucene/CHANGES.txt | 2 ++ lucene/ivy-versions.properties | 4 ++-- lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 | 1 - lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 | 1 + solr/CHANGES.txt | 4 +++- solr/licenses/carrot2-mini-3.16.0.jar.sha1 | 1 - solr/licenses/carrot2-mini-3.16.2.jar.sha1 | 1 + solr/licenses/junit4-ant-2.7.2.jar.sha1 | 1 - solr/licenses/junit4-ant-2.7.5.jar.sha1 | 1 + solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 | 1 - solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 | 1 + 11 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 create mode 100644 lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 delete mode 100644 solr/licenses/carrot2-mini-3.16.0.jar.sha1 create mode 100644 solr/licenses/carrot2-mini-3.16.2.jar.sha1 delete mode 100644 solr/licenses/junit4-ant-2.7.2.jar.sha1 create mode 100644 solr/licenses/junit4-ant-2.7.5.jar.sha1 delete mode 100644 solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 create mode 100644 solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 6f67e6e55f0..39daefefb3b 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -67,6 +67,8 @@ Other * LUCENE-8768: Fix Javadocs build in Java 11. (Namgyu Kim) +* LUCENE-9092: upgrade randomizedtesting to 2.7.5 (Dawid Weiss) + ======================= Lucene 8.5.0 ======================= API Changes diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties index 160a4cd71dd..d0961539153 100644 --- a/lucene/ivy-versions.properties +++ b/lucene/ivy-versions.properties @@ -4,7 +4,7 @@ /com.adobe.xmp/xmpcore = 5.1.3 -com.carrotsearch.randomizedtesting.version = 2.7.2 +com.carrotsearch.randomizedtesting.version = 2.7.5 /com.carrotsearch.randomizedtesting/junit4-ant = ${com.carrotsearch.randomizedtesting.version} /com.carrotsearch.randomizedtesting/randomizedtesting-runner = ${com.carrotsearch.randomizedtesting.version} @@ -244,7 +244,7 @@ org.bouncycastle.version = 1.60 /org.carrot2.attributes/attributes-binder = 1.3.3 /org.carrot2.shaded/carrot2-guava = 18.0 -/org.carrot2/carrot2-mini = 3.16.0 +/org.carrot2/carrot2-mini = 3.16.2 org.carrot2.morfologik.version = 2.1.5 /org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version} diff --git a/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 deleted file mode 100644 index 9eeaf24b7ba..00000000000 --- a/lucene/licenses/randomizedtesting-runner-2.7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84ed6b5f70906f9ef173db67ccde657b43ea60df diff --git a/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 new file mode 100644 index 00000000000..197a8c07074 --- /dev/null +++ b/lucene/licenses/randomizedtesting-runner-2.7.5.jar.sha1 @@ -0,0 +1 @@ +967e89a9a46a5b15ce8bef199f01be4830af1a31 diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 0e26813aeab..944ba095358 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -23,7 +23,7 @@ Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this r Versions of Major Components --------------------- Apache Tika 1.19.1 -Carrot2 3.16.0 +Carrot2 3.16.2 Velocity 2.0 and Velocity Tools 3.0 Apache ZooKeeper 3.5.5 Jetty 9.4.19.v20190610 @@ -89,6 +89,8 @@ Other Changes * SOLR-13797: SolrResourceLoader no longer caches bad results when asked for wrong type (Mike Drob) +* LUCENE-9092: Upgrade Carrot2 to 3.16.2 (Dawid Weiss). + ================== 8.5.0 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/licenses/carrot2-mini-3.16.0.jar.sha1 b/solr/licenses/carrot2-mini-3.16.0.jar.sha1 deleted file mode 100644 index 0b34d73ce32..00000000000 --- a/solr/licenses/carrot2-mini-3.16.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -6bb27fd0dfe24a5671d9751a943728a54be48ed7 diff --git a/solr/licenses/carrot2-mini-3.16.2.jar.sha1 b/solr/licenses/carrot2-mini-3.16.2.jar.sha1 new file mode 100644 index 00000000000..3aaeaa1aac8 --- /dev/null +++ b/solr/licenses/carrot2-mini-3.16.2.jar.sha1 @@ -0,0 +1 @@ +decabb42b88a8d40c1894984f4af8adb833f766b diff --git a/solr/licenses/junit4-ant-2.7.2.jar.sha1 b/solr/licenses/junit4-ant-2.7.2.jar.sha1 deleted file mode 100644 index f51d140c941..00000000000 --- a/solr/licenses/junit4-ant-2.7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b9e4fce45b3ee7bb14c5b72804dc1e483e61340d diff --git a/solr/licenses/junit4-ant-2.7.5.jar.sha1 b/solr/licenses/junit4-ant-2.7.5.jar.sha1 new file mode 100644 index 00000000000..e14ef454722 --- /dev/null +++ b/solr/licenses/junit4-ant-2.7.5.jar.sha1 @@ -0,0 +1 @@ +e044cdd1aeaafe12df7808a3d9295a03a2717f12 diff --git a/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 deleted file mode 100644 index 9eeaf24b7ba..00000000000 --- a/solr/licenses/randomizedtesting-runner-2.7.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -84ed6b5f70906f9ef173db67ccde657b43ea60df diff --git a/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 new file mode 100644 index 00000000000..197a8c07074 --- /dev/null +++ b/solr/licenses/randomizedtesting-runner-2.7.5.jar.sha1 @@ -0,0 +1 @@ +967e89a9a46a5b15ce8bef199f01be4830af1a31