You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by st...@apache.org on 2013/01/02 12:56:06 UTC
svn commit: r1427753 - in /lucene/dev/branches/branch_4x/solr: ./ contrib/
contrib/clustering/
contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/
licenses/
Author: stanislaw
Date: Wed Jan 2 11:56:06 2013
New Revision: 1427753
URL: http://svn.apache.org/viewvc?rev=1427753&view=rev
Log:
SOLR-3279: upgrade Carrot2 to version 3.6.2
Added:
lucene/dev/branches/branch_4x/solr/licenses/attributes-binder-1.0.1.jar.sha1
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/attributes-binder-1.0.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/attributes-binder-LICENSE-ASL.txt
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/attributes-binder-LICENSE-ASL.txt
lucene/dev/branches/branch_4x/solr/licenses/attributes-binder-NOTICE.txt
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/attributes-binder-NOTICE.txt
lucene/dev/branches/branch_4x/solr/licenses/carrot2-core-3.6.2.jar.sha1
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/carrot2-core-3.6.2.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/hppc-0.4.1.jar.sha1
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/hppc-0.4.1.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/mahout-collections-1.0.jar.sha1
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/mahout-collections-1.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/mahout-math-0.6.jar.sha1
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/mahout-math-0.6.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/simple-xml-2.6.4.jar.sha1
- copied unchanged from r1427747, lucene/dev/trunk/solr/licenses/simple-xml-2.6.4.jar.sha1
Removed:
lucene/dev/branches/branch_4x/solr/licenses/carrot2-core-3.5.0.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/hppc-0.3.3.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/mahout-collections-0.3.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/mahout-math-0.3.jar.sha1
lucene/dev/branches/branch_4x/solr/licenses/simple-xml-2.4.1.jar.sha1
Modified:
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/CHANGES.txt
lucene/dev/branches/branch_4x/solr/contrib/ (props changed)
lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml
lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
lucene/dev/branches/branch_4x/solr/licenses/ (props changed)
Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1427753&r1=1427752&r2=1427753&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jan 2 11:56:06 2013
@@ -29,7 +29,7 @@ $Id$
Versions of Major Components
---------------------
Apache Tika 1.2
-Carrot2 3.5.0
+Carrot2 3.6.2
Velocity 1.6.4 and Velocity Tools 2.0
Apache UIMA 2.3.1
Apache ZooKeeper 3.4.5
@@ -466,6 +466,9 @@ Other Changes
* SOLR-4248: "ant eclipse" should declare .svn directories as derived.
(Shawn Heisey via Mark Miller)
+* SOLR-3279: Upgrade Carrot2 to 3.6.2 (StanisÅaw OsiÅski)
+
+
================== 4.0.0 ==================
Versions of Major Components
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml?rev=1427753&r1=1427752&r2=1427753&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/ivy.xml Wed Jan 2 11:56:06 2013
@@ -19,13 +19,14 @@
<ivy-module version="2.0">
<info organisation="org.apache.solr" module="clustering"/>
<dependencies>
- <dependency org="org.carrot2" name="carrot2-core" rev="3.5.0" transitive="false"/>
- <dependency org="com.carrotsearch" name="hppc" rev="0.3.3" transitive="false"/>
+ <dependency org="org.carrot2" name="carrot2-core" rev="3.6.2" transitive="false"/>
+ <dependency org="org.carrot2.attributes" name="attributes-binder" rev="1.0.1" transitive="false"/>
+ <dependency org="com.carrotsearch" name="hppc" rev="0.4.1" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.7.4" transitive="false"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.7.4" transitive="false"/>
- <dependency org="org.apache.mahout" name="mahout-collections" rev="0.3" transitive="false"/>
- <dependency org="org.apache.mahout" name="mahout-math" rev="0.3" transitive="false"/>
- <dependency org="org.simpleframework" name="simple-xml" rev="2.4.1" transitive="false"/>
+ <dependency org="org.apache.mahout" name="mahout-collections" rev="1.0" transitive="false"/>
+ <dependency org="org.apache.mahout" name="mahout-math" rev="0.6" transitive="false"/>
+ <dependency org="org.simpleframework" name="simple-xml" rev="2.6.4" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java?rev=1427753&r1=1427752&r2=1427753&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java (original)
+++ lucene/dev/branches/branch_4x/solr/contrib/clustering/src/test/org/apache/solr/handler/clustering/carrot2/CarrotClusteringEngineTest.java Wed Jan 2 11:56:06 2013
@@ -116,7 +116,7 @@ public class CarrotClusteringEngineTest
@Test
public void testCarrotStc() throws Exception {
- checkEngine(getClusteringEngine("stc"), 1);
+ checkEngine(getClusteringEngine("stc"), 2);
}
@Test