Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0 (#981)

Dawid Weissa922c7dfbddf
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 0ed98370755..ca1d95898f4 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -120,6 +120,8 @@ Bug Fixes
Other Changes
---------------------
+* SOLR-16351: Upgrade Carrot2 to 4.4.3, upgrade randomizedtesting to 2.8.0. (Dawid Weiss)
+
* SOLR-16245: Make DenseVectorField codec agnostic (Elia Porciani via Alessandro Benedetti)
* SOLR-15897: Remove <jmx/> from all unit test solrconfig.xml files. (Eric Pugh)
diff --git a/solr/licenses/carrot2-core-4.4.2.jar.sha1 b/solr/licenses/carrot2-core-4.4.2.jar.sha1
deleted file mode 100644
index 9bdf9a6c06e..00000000000
--- a/solr/licenses/carrot2-core-4.4.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-20f170227ddbbf1e012bf504a3ab21f5696f19d2
diff --git a/solr/licenses/carrot2-core-4.4.3.jar.sha1 b/solr/licenses/carrot2-core-4.4.3.jar.sha1
new file mode 100644
index 00000000000..5f41e10f8cc
--- /dev/null
+++ b/solr/licenses/carrot2-core-4.4.3.jar.sha1
@@ -0,0 +1 @@
+df52360694057e0d3a0d6f38334d72616c584db2
diff --git a/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txt b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txt
index a6d985098e2..aef40034692 100644
--- a/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txt
+++ b/solr/modules/clustering/src/test-files/org/apache/solr/handler/clustering/ClusteringComponentTest-testStcAlgorithm.txt
@@ -4,7 +4,7 @@
- Analysis [5]
- Applications [5]
- Software [5]
-- Business [4]
+- Businesses [4]
- Predictive [4]
- Process [4]
- Hidden Predictive Information [2]
diff --git a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java
index 743bbfa2b86..1a9398a6ba5 100644
--- a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java
+++ b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentDistributedTest.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.util.List;
import java.util.function.Consumer;
import java.util.stream.Collectors;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.BaseDistributedSearchTestCase;
import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
import org.apache.solr.client.solrj.response.Cluster;
@@ -73,7 +72,6 @@ public class ClusteringComponentDistributedTest extends BaseDistributedSearchTes
}));
}
- @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/carrot2/carrot2/issues/149")
@Test
@ShardsFixed(num = 2)
public void testStcAlgorithm() throws Exception {
diff --git a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
index 8506f7f1726..0c6c968444b 100644
--- a/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
+++ b/solr/modules/clustering/src/test/org/apache/solr/handler/clustering/ClusteringComponentTest.java
@@ -31,7 +31,6 @@ import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.apache.commons.io.FileUtils;
-import org.apache.lucene.tests.util.LuceneTestCase;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.response.ClusteringResponse;
import org.apache.solr.common.SolrDocument;
@@ -87,7 +86,6 @@ public class ClusteringComponentTest extends SolrTestCaseJ4 {
compareToExpected(clusters("lingo", QUERY_TESTSET_SAMPLE_DOCUMENTS));
}
- @LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/carrot2/carrot2/issues/149")
@Test
public void testStcAlgorithm() throws Exception {
compareToExpected(clusters("stc", QUERY_TESTSET_SAMPLE_DOCUMENTS));
diff --git a/versions.lock b/versions.lock
index f504e882211..d0f3c5cac4e 100644
--- a/versions.lock
+++ b/versions.lock
@@ -1,7 +1,7 @@
# Run ./gradlew --write-locks to regenerate this file
com.beust:jcommander:1.82 (2 constraints: 2b123714)
-com.carrotsearch:hppc:0.9.1 (2 constraints: ac0fc8a6)
-com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.0 (2 constraints: d51555e3)
+com.carrotsearch:hppc:0.9.1 (2 constraints: ad0fc9a6)
+com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.8.0 (2 constraints: cd15cfe1)
com.cybozu.labs:langdetect:1.1-20120112 (1 constraints: 5c066d5e)
com.epam:parso:2.0.14 (1 constraints: 8e0c750e)
com.esri.geometry:esri-geometry-api:2.2.0 (1 constraints: 5c0db22c)
@@ -210,7 +210,7 @@ org.bouncycastle:bcpkix-jdk15on:1.70 (2 constraints: ce1b11b3)
org.bouncycastle:bcprov-jdk15on:1.70 (4 constraints: 1f34ee12)
org.bouncycastle:bcutil-jdk15on:1.70 (2 constraints: 961ad454)
org.brotli:dec:0.1.2 (1 constraints: 5a0ce101)
-org.carrot2:carrot2-core:4.4.2 (1 constraints: 0c050d36)
+org.carrot2:carrot2-core:4.4.3 (1 constraints: 0d050e36)
org.carrot2:morfologik-fsa:2.1.9 (1 constraints: db0d9c36)
org.carrot2:morfologik-polish:2.1.9 (1 constraints: d312541e)
org.carrot2:morfologik-stemming:2.1.9 (2 constraints: d81fb300)
diff --git a/versions.props b/versions.props
index 20248173a96..ab856bdcc9c 100644
--- a/versions.props
+++ b/versions.props
@@ -1,5 +1,5 @@
com.adobe.testing:s3mock-junit4=2.1.34
-com.carrotsearch.randomizedtesting:*=2.7.9
+com.carrotsearch.randomizedtesting:*=2.8.0
com.carrotsearch:hppc=0.9.1
com.cybozu.labs:langdetect=1.1-20120112
com.fasterxml.jackson:jackson-bom=2.13.3
@@ -53,7 +53,7 @@ org.apache.opennlp:opennlp-tools=1.9.4
org.apache.tika:*=1.28.1
org.apache.zookeeper:*=3.7.0
org.bitbucket.b_c:jose4j=0.7.9
-org.carrot2:carrot2-core=4.4.2
+org.carrot2:carrot2-core=4.4.3
org.codehaus.woodstox:stax2-api=4.2.1
org.eclipse.jetty*:*=9.4.48.v20220622
org.hamcrest:*=2.2