diff --git a/pom.xml b/pom.xml index b1feb12..25688e5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.codelibs elasticsearch-analysis-kuromoji-ipadic-neologd - 7.2.1-SNAPSHOT + 7.17.1-SNAPSHOT jar This plugin provides an analysis library for Kuromoji with UniDic and Neologd. 2011 @@ -26,30 +26,30 @@ 9 - 7.2.1 + 7.17.1 org.codelibs.elasticsearch.kuromoji.ipadic.neologd.KuromojiNeologdPlugin 1.8 1.8 - 8.0.0 - 20190808 + 8.11.1 + 20200910 codelibs.org CodeLibs Repository - http://maven.codelibs.org/ + https://maven.codelibs.org/ oss.sonatype.org oss.sonatype.org - http://oss.sonatype.org/content/groups/public/ + https://oss.sonatype.org/content/groups/public/ maven-compiler-plugin - 3.8.1 + 3.10.1 ${maven.compiler.source} ${maven.compiler.target} @@ -66,7 +66,7 @@ maven-source-plugin - 3.1.0 + 3.2.1 attach-sources @@ -78,7 +78,7 @@ maven-assembly-plugin - 3.1.1 + 3.4.2 false ${project.build.directory}/releases/ @@ -112,7 +112,7 @@ org.codelibs analyzers - 8.0.0.0 + 8.11.1.0 org.codelibs diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiAnalyzerProvider.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiAnalyzerProvider.java index 25f26a4..46e0580 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiAnalyzerProvider.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiAnalyzerProvider.java @@ -22,9 +22,9 @@ import java.util.Set; import org.apache.lucene.analysis.CharArraySet; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseAnalyzer; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseTokenizer; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.dict.UserDictionary; +import org.apache.lucene.analysis.ja.JapaneseAnalyzer; +import org.apache.lucene.analysis.ja.JapaneseTokenizer; +import org.apache.lucene.analysis.ja.dict.UserDictionary; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiBaseFormFilterFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiBaseFormFilterFactory.java index c517d06..6d9cbd1 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiBaseFormFilterFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiBaseFormFilterFactory.java @@ -20,7 +20,7 @@ package org.codelibs.elasticsearch.kuromoji.ipadic.neologd.index.analysis; import org.apache.lucene.analysis.TokenStream; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseBaseFormFilter; +import org.apache.lucene.analysis.ja.JapaneseBaseFormFilter; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiIterationMarkCharFilterFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiIterationMarkCharFilterFactory.java index 1ac56fc..e17d2d0 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiIterationMarkCharFilterFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiIterationMarkCharFilterFactory.java @@ -21,7 +21,7 @@ import java.io.Reader; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseIterationMarkCharFilter; +import org.apache.lucene.analysis.ja.JapaneseIterationMarkCharFilter; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiKatakanaStemmerFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiKatakanaStemmerFactory.java index fc6e908..334fc7d 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiKatakanaStemmerFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiKatakanaStemmerFactory.java @@ -20,7 +20,7 @@ package org.codelibs.elasticsearch.kuromoji.ipadic.neologd.index.analysis; import org.apache.lucene.analysis.TokenStream; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseKatakanaStemFilter; +import org.apache.lucene.analysis.ja.JapaneseKatakanaStemFilter; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiNumberFilterFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiNumberFilterFactory.java index 31307cb..487d463 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiNumberFilterFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiNumberFilterFactory.java @@ -19,7 +19,7 @@ package org.codelibs.elasticsearch.kuromoji.ipadic.neologd.index.analysis; import org.apache.lucene.analysis.TokenStream; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseNumberFilter; +import org.apache.lucene.analysis.ja.JapaneseNumberFilter; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiPartOfSpeechFilterFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiPartOfSpeechFilterFactory.java index d68150d..d70d232 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiPartOfSpeechFilterFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiPartOfSpeechFilterFactory.java @@ -24,8 +24,8 @@ import java.util.Set; import org.apache.lucene.analysis.TokenStream; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseAnalyzer; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapanesePartOfSpeechStopFilter; +import org.apache.lucene.analysis.ja.JapaneseAnalyzer; +import org.apache.lucene.analysis.ja.JapanesePartOfSpeechStopFilter; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiReadingFormFilterFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiReadingFormFilterFactory.java index 5e24822..6000cc1 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiReadingFormFilterFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiReadingFormFilterFactory.java @@ -20,7 +20,7 @@ package org.codelibs.elasticsearch.kuromoji.ipadic.neologd.index.analysis; import org.apache.lucene.analysis.TokenStream; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseReadingFormFilter; +import org.apache.lucene.analysis.ja.JapaneseReadingFormFilter; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiTokenizerFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiTokenizerFactory.java index c78376a..e8374fd 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiTokenizerFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/KuromojiTokenizerFactory.java @@ -23,9 +23,9 @@ import java.io.Reader; import org.apache.lucene.analysis.Tokenizer; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseTokenizer; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.JapaneseTokenizer.Mode; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.dict.UserDictionary; +import org.apache.lucene.analysis.ja.JapaneseTokenizer; +import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode; +import org.apache.lucene.analysis.ja.dict.UserDictionary; import org.elasticsearch.ElasticsearchException; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; @@ -47,7 +47,7 @@ public class KuromojiTokenizerFactory extends AbstractTokenizerFactory { private boolean discartPunctuation; public KuromojiTokenizerFactory(IndexSettings indexSettings, Environment env, String name, Settings settings) { - super(indexSettings, settings); + super(indexSettings, settings, name); mode = getMode(settings); userDictionary = getUserDictionary(env, settings); discartPunctuation = settings.getAsBoolean("discard_punctuation", true); diff --git a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/PosConcatenationFilterFactory.java b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/PosConcatenationFilterFactory.java index 9863dae..b7fb9c7 100644 --- a/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/PosConcatenationFilterFactory.java +++ b/src/main/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/index/analysis/PosConcatenationFilterFactory.java @@ -7,7 +7,7 @@ import org.apache.lucene.analysis.TokenStream; import org.codelibs.analysis.ja.PosConcatenationFilter; import org.codelibs.analysis.ja.PosConcatenationFilter.PartOfSpeechSupplier; -import org.codelibs.neologd.ipadic.lucene.analysis.ja.tokenattributes.PartOfSpeechAttribute; +import org.apache.lucene.analysis.ja.tokenattributes.PartOfSpeechAttribute; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.env.Environment; import org.elasticsearch.index.IndexSettings; diff --git a/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/KuromojiNeologdPluginTest.java b/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/KuromojiNeologdPluginTest.java index 4c7bc97..f8e3194 100644 --- a/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/KuromojiNeologdPluginTest.java +++ b/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/KuromojiNeologdPluginTest.java @@ -20,9 +20,9 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings.Builder; -import org.elasticsearch.common.xcontent.XContentBuilder; -import org.elasticsearch.common.xcontent.XContentFactory; -import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.xcontent.XContentBuilder; +import org.elasticsearch.xcontent.XContentFactory; +import org.elasticsearch.xcontent.XContentType; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.node.Node; import org.elasticsearch.rest.RestStatus; diff --git a/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/analysis/PosConcatenationFilterFactoryTest.java b/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/analysis/PosConcatenationFilterFactoryTest.java index fb98eb1..8bd4ef1 100644 --- a/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/analysis/PosConcatenationFilterFactoryTest.java +++ b/src/test/java/org/codelibs/elasticsearch/kuromoji/ipadic/neologd/analysis/PosConcatenationFilterFactoryTest.java @@ -18,7 +18,7 @@ import org.codelibs.elasticsearch.runner.net.EcrCurl; import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings.Builder; -import org.elasticsearch.common.xcontent.XContentType; +import org.elasticsearch.xcontent.XContentType; import org.elasticsearch.node.Node; import org.junit.After; import org.junit.Before; @@ -43,8 +43,8 @@ public void setUp() throws Exception { public void build(final int number, final Builder settingsBuilder) { settingsBuilder.put("http.cors.enabled", true); settingsBuilder.put("http.cors.allow-origin", "*"); - settingsBuilder.putList("discovery.seed_hosts", "127.0.0.1:9301"); - settingsBuilder.putList("cluster.initial_master_nodes", "127.0.0.1:9301"); + settingsBuilder.putList("discovery.seed_hosts", "127.0.0.1:9300"); + settingsBuilder.putList("cluster.initial_master_nodes", "127.0.0.1:9300"); } }).build(newConfigs().clusterName(clusterName).numOfNode(numOfNode).pluginTypes("org.codelibs.elasticsearch.kuromoji.ipadic.neologd.KuromojiNeologdPlugin"));