Skip to content

Commit 677211a

Browse files
committed
Update to Lucene 4.10.0
Closes #44.
1 parent 6e48989 commit 677211a

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<properties>
3535
<elasticsearch.version>2.0.0-SNAPSHOT</elasticsearch.version>
36-
<lucene.version>4.9.0</lucene.version>
36+
<lucene.version>4.10.0</lucene.version>
3737
<tests.jvms>1</tests.jvms>
3838
<tests.shuffle>true</tests.shuffle>
3939
<tests.output>onerror</tests.output>

src/main/java/org/elasticsearch/index/analysis/KuromojiAnalyzerProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public KuromojiAnalyzerProvider(Index index, @IndexSettings Settings indexSettin
4444
final Set<?> stopWords = Analysis.parseStopWords(env, settings, JapaneseAnalyzer.getDefaultStopSet(), version);
4545
final JapaneseTokenizer.Mode mode = KuromojiTokenizerFactory.getMode(settings);
4646
final UserDictionary userDictionary = KuromojiTokenizerFactory.getUserDictionary(env, settings);
47-
analyzer = new JapaneseAnalyzer(version, userDictionary, mode, CharArraySet.copy(version, stopWords), JapaneseAnalyzer.getDefaultStopTags());
47+
analyzer = new JapaneseAnalyzer(userDictionary, mode, CharArraySet.copy(stopWords), JapaneseAnalyzer.getDefaultStopTags());
4848
}
4949

5050
@Override

src/main/java/org/elasticsearch/index/analysis/KuromojiPartOfSpeechFilterFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter;
2424
import org.elasticsearch.common.inject.Inject;
2525
import org.elasticsearch.common.inject.assistedinject.Assisted;
26-
import org.elasticsearch.common.lucene.Lucene;
2726
import org.elasticsearch.common.settings.Settings;
2827
import org.elasticsearch.env.Environment;
2928
import org.elasticsearch.index.Index;
@@ -48,7 +47,7 @@ public KuromojiPartOfSpeechFilterFactory(Index index, @IndexSettings Settings in
4847

4948
@Override
5049
public TokenStream create(TokenStream tokenStream) {
51-
return new JapanesePartOfSpeechStopFilter(Lucene.ANALYZER_VERSION, tokenStream, stopTags);
50+
return new JapanesePartOfSpeechStopFilter(tokenStream, stopTags);
5251
}
5352

5453
}

src/main/java/org/elasticsearch/indices/analysis/KuromojiIndicesAnalysis.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
2626
import org.elasticsearch.common.component.AbstractComponent;
2727
import org.elasticsearch.common.inject.Inject;
28-
import org.elasticsearch.common.lucene.Lucene;
2928
import org.elasticsearch.common.settings.Settings;
3029
import org.elasticsearch.index.analysis.*;
3130

@@ -44,7 +43,7 @@ public KuromojiIndicesAnalysis(Settings settings,
4443

4544
indicesAnalysisService.analyzerProviderFactories().put("kuromoji",
4645
new PreBuiltAnalyzerProviderFactory("kuromoji", AnalyzerScope.INDICES,
47-
new JapaneseAnalyzer(Lucene.ANALYZER_VERSION)));
46+
new JapaneseAnalyzer()));
4847

4948
indicesAnalysisService.charFilterFactories().put("kuromoji_iteration_mark",
5049
new KurumojiCharFilterFactoryFactory(new CharFilterFactory() {
@@ -98,8 +97,7 @@ public String name() {
9897

9998
@Override
10099
public TokenStream create(TokenStream tokenStream) {
101-
return new JapanesePartOfSpeechStopFilter(Lucene.ANALYZER_VERSION,
102-
tokenStream, JapaneseAnalyzer
100+
return new JapanesePartOfSpeechStopFilter(tokenStream, JapaneseAnalyzer
103101
.getDefaultStopTags());
104102
}
105103
}));

0 commit comments

Comments
 (0)