From 2e03681712e6a77cc9d53d3550a943001a6e4f8c Mon Sep 17 00:00:00 2001 From: Koji Sekiguchi Date: Mon, 10 Jan 2011 10:58:57 +0000 Subject: [PATCH] SOLR-2296: Upgrade Carrot2 binaries to version 3.4.2 git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1057149 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 +- solr/contrib/clustering/lib/carrot2-core-3.4.0.jar | 2 -- solr/contrib/clustering/lib/carrot2-core-3.4.2.jar | 2 ++ .../clustering/carrot2/LuceneLanguageModelFactory.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 solr/contrib/clustering/lib/carrot2-core-3.4.0.jar create mode 100644 solr/contrib/clustering/lib/carrot2-core-3.4.2.jar diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 7affd988920..cb1d6450d84 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -26,7 +26,7 @@ Versions of Major Components --------------------- Apache Lucene trunk Apache Tika 0.8-SNAPSHOT -Carrot2 3.1.0 +Carrot2 3.4.2 Velocity 1.6.4 and Velocity Tools 2.0 diff --git a/solr/contrib/clustering/lib/carrot2-core-3.4.0.jar b/solr/contrib/clustering/lib/carrot2-core-3.4.0.jar deleted file mode 100644 index a09b28ac477..00000000000 --- a/solr/contrib/clustering/lib/carrot2-core-3.4.0.jar +++ /dev/null @@ -1,2 +0,0 @@ -AnyObjectId[96c3bdbdaacd5289b0e654842e435689fbcf22e2] was removed in git history. -Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar b/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar new file mode 100644 index 00000000000..6b8fdb5699c --- /dev/null +++ b/solr/contrib/clustering/lib/carrot2-core-3.4.2.jar @@ -0,0 +1,2 @@ +AnyObjectId[f872cbc8eec94f7d5b29a73f99cd13089848a3cd] was removed in git history. +Apache SVN contains full history. \ No newline at end of file diff --git a/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneLanguageModelFactory.java b/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneLanguageModelFactory.java index d7b2ace1f6b..ddb3d59bce8 100644 --- a/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneLanguageModelFactory.java +++ b/solr/contrib/clustering/src/main/java/org/apache/solr/handler/clustering/carrot2/LuceneLanguageModelFactory.java @@ -31,7 +31,7 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute; import org.carrot2.core.LanguageCode; import org.carrot2.text.analysis.ExtendedWhitespaceTokenizer; import org.carrot2.text.analysis.ITokenizer; -import org.carrot2.text.linguistic.BaseLanguageModelFactory; +import org.carrot2.text.linguistic.DefaultLanguageModelFactory; import org.carrot2.text.linguistic.IStemmer; import org.carrot2.text.linguistic.IdentityStemmer; import org.carrot2.text.util.MutableCharArray; @@ -62,7 +62,7 @@ import org.tartarus.snowball.ext.TurkishStemmer; * change, the changes can be made in this class. */ @Bindable(prefix = "DefaultLanguageModelFactory") -public class LuceneLanguageModelFactory extends BaseLanguageModelFactory { +public class LuceneLanguageModelFactory extends DefaultLanguageModelFactory { final static Logger logger = org.slf4j.LoggerFactory .getLogger(LuceneLanguageModelFactory.class);