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 2014/03/25 13:18:14 UTC
svn commit: r1581299 - in /lucene/dev/trunk: lucene/ solr/
solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/
solr/licenses/
Author: dweiss
Date: Tue Mar 25 12:18:13 2014
New Revision: 1581299
URL: http://svn.apache.org/r1581299
Log:
SOLR-5909: Upgrade Carrot2 clustering dependency to 3.9.0.
Added:
lucene/dev/trunk/solr/licenses/attributes-binder-1.2.1.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/carrot2-mini-3.9.0.jar.sha1 (with props)
Removed:
lucene/dev/trunk/solr/licenses/attributes-binder-1.2.0.jar.sha1
lucene/dev/trunk/solr/licenses/carrot2-mini-3.8.0.jar.sha1
Modified:
lucene/dev/trunk/lucene/ivy-versions.properties
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
Modified: lucene/dev/trunk/lucene/ivy-versions.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-versions.properties?rev=1581299&r1=1581298&r2=1581299&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-versions.properties (original)
+++ lucene/dev/trunk/lucene/ivy-versions.properties Tue Mar 25 12:18:13 2014
@@ -154,8 +154,8 @@ org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
-/org.carrot2.attributes/attributes-binder = 1.2.0
-/org.carrot2/carrot2-mini = 3.8.0
+/org.carrot2.attributes/attributes-binder = 1.2.1
+/org.carrot2/carrot2-mini = 3.9.0
org.carrot2.morfologik.version = 1.7.1
/org.carrot2/morfologik-fsa = ${org.carrot2.morfologik.version}
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1581299&r1=1581298&r2=1581299&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Tue Mar 25 12:18:13 2014
@@ -25,7 +25,7 @@ $Id$
Versions of Major Components
---------------------
Apache Tika 1.5
-Carrot2 3.8.0
+Carrot2 3.9.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.6
@@ -71,7 +71,7 @@ Other Changes
Versions of Major Components
---------------------
Apache Tika 1.5
-Carrot2 3.8.0
+Carrot2 3.9.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.6
@@ -184,6 +184,8 @@ Optimizations
Other Changes
---------------------
+* SOLR-5909: Upgrade Carrot2 clustering dependency to 3.9.0. (Dawid Weiss)
+
* SOLR-5764: Fix recently added tests to not use absolute paths to load test-files,
use SolrTestCaseJ4.getFile() and getResource() instead; fix morphlines/map-reduce
to not duplicate test resources and fix dependencies among them.
Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java?rev=1581299&r1=1581298&r2=1581299&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java Tue Mar 25 12:18:13 2014
@@ -120,7 +120,7 @@ public class CarrotClusteringEngineTest
@Test
public void testCarrotStc() throws Exception {
- checkEngine(getClusteringEngine("stc"), 2);
+ checkEngine(getClusteringEngine("stc"), 3);
}
@Test
Added: lucene/dev/trunk/solr/licenses/attributes-binder-1.2.1.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/attributes-binder-1.2.1.jar.sha1?rev=1581299&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/attributes-binder-1.2.1.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/attributes-binder-1.2.1.jar.sha1 Tue Mar 25 12:18:13 2014
@@ -0,0 +1 @@
+d597da840c4f706a1b0bcf55935c6c30c0fbb5f2
Added: lucene/dev/trunk/solr/licenses/carrot2-mini-3.9.0.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/carrot2-mini-3.9.0.jar.sha1?rev=1581299&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/carrot2-mini-3.9.0.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/carrot2-mini-3.9.0.jar.sha1 Tue Mar 25 12:18:13 2014
@@ -0,0 +1 @@
+8eafc39444cd8d80802b2712d52ae751f3007cad