feat: bump elastic version 8.6.2

DostonAkhmedov · May 15, 2023 · 8c00d17 · 8c00d17
1 parent 5b9de24
commit 8c00d17
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 19 deletions.
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -18,5 +18,5 @@ idea {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21")
 }
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -63,6 +63,7 @@ object Versions {
         EsVersion(7, 12) to "8.8.0",
         EsVersion(7, 13) to "8.8.2",
         EsVersion(7, 14) to "8.9.0",
+        EsVersion(8, 6) to "9.4.2",
     )
 }
 

diff --git a/jmorphy2-core/build.gradle.kts b/jmorphy2-core/build.gradle.kts
@@ -25,7 +25,8 @@ tasks.register<Jar>(
     name = "jarTest"
 ) {
     dependsOn("testClasses")
-    classifier = "tests"
+    archiveClassifier.convention("tests");
+    archiveClassifier.set("tests");
     from(sourceSets.test)
 }
 

diff --git a/jmorphy2-elasticsearch/build.gradle.kts b/jmorphy2-elasticsearch/build.gradle.kts
@@ -7,7 +7,7 @@ buildscript {
     }
     dependencies {
         classpath("org.elasticsearch.gradle:build-tools:${project.getElasticsearchVersion()}")
-        classpath("com.netflix.nebula:gradle-ospackage-plugin:8.5.6")
+        classpath("com.netflix.nebula:gradle-ospackage-plugin:9.1.1")
     }
 }
 

diff --git a/...arch/src/main/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2AnalyzerProvider.java b/...arch/src/main/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2AnalyzerProvider.java
@@ -36,7 +36,7 @@ public Jmorphy2AnalyzerProvider(IndexSettings indexSettings,
                                     String name,
                                     Settings settings,
                                     Jmorphy2Service jmorphy2Service) {
-        super(indexSettings, name, settings);
+        super(name, settings);
         analyzer = new Jmorphy2Analyzer(
             jmorphy2Service.getMorphAnalyzer(
                 DEFAULT_LANGUAGE, null, Jmorphy2StemTokenFilterFactory.DEFAULT_CACHE_SIZE

diff --git a/...rc/main/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2StemTokenFilterFactory.java b/...rc/main/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2StemTokenFilterFactory.java
@@ -47,7 +47,7 @@ public Jmorphy2StemTokenFilterFactory(IndexSettings indexSettings,
                                           String name,
                                           Settings settings,
                                           Jmorphy2Service jmorphy2Service) {
-        super(indexSettings, name, settings);
+        super(name, settings);
 
         String lang = settings.get("lang", settings.get("name"));
         String substitutesPath = settings.get("char_substitutes_path");

diff --git a/...main/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2SubjectTokenFilterFactory.java b/...main/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2SubjectTokenFilterFactory.java
@@ -41,7 +41,7 @@ public Jmorphy2SubjectTokenFilterFactory(IndexSettings indexSettings,
                                              String name,
                                              Settings settings,
                                              Jmorphy2Service jmorphy2Service) {
-        super(indexSettings, name, settings);
+        super(name, settings);
 
         String lang = settings.get("lang", settings.get("name"));
         if (lang == null) {

diff --git a/...st/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2StemTokenFilterFactoryTests.java b/...st/java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2StemTokenFilterFactoryTests.java
@@ -22,7 +22,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 
 import org.apache.lucene.analysis.Analyzer;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;

diff --git a/...java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2SubjectTokenFilterFactoryTests.java b/...java/company/evo/jmorphy2/elasticsearch/index/Jmorphy2SubjectTokenFilterFactoryTests.java
@@ -22,7 +22,7 @@
 import static org.hamcrest.Matchers.instanceOf;
 
 import org.apache.lucene.analysis.Analyzer;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
 
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;

diff --git a/jmorphy2-lucene/build.gradle.kts b/jmorphy2-lucene/build.gradle.kts
@@ -4,7 +4,7 @@ version = getLibraryVersion()
 
 dependencies {
     implementation("org.apache.lucene:lucene-core:${project.getLuceneVersion()}")
-    implementation("org.apache.lucene:lucene-analyzers-common:${project.getLuceneVersion()}")
+    implementation("org.apache.lucene:lucene-analysis-common:${project.getLuceneVersion()}")
     testImplementation("org.apache.lucene:lucene-test-framework:${project.getLuceneVersion()}")
 
     api(project(":jmorphy2-core"))

diff --git a/jmorphy2-lucene/src/main/java/company/evo/jmorphy2/lucene/Jmorphy2StemFilterFactory.java b/jmorphy2-lucene/src/main/java/company/evo/jmorphy2/lucene/Jmorphy2StemFilterFactory.java
@@ -11,9 +11,9 @@
 import java.util.ArrayList;
 
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
-import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.util.ResourceLoader;
+import org.apache.lucene.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.TokenFilterFactory;
 
 import company.evo.jmorphy2.JSONUtils;
 import company.evo.jmorphy2.MorphAnalyzer;

diff --git a/jmorphy2-lucene/src/main/java/company/evo/jmorphy2/lucene/Jmorphy2SubjectFilterFactory.java b/jmorphy2-lucene/src/main/java/company/evo/jmorphy2/lucene/Jmorphy2SubjectFilterFactory.java
@@ -6,9 +6,9 @@
 import java.util.HashMap;
 
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.util.ResourceLoader;
-import org.apache.lucene.analysis.util.ResourceLoaderAware;
-import org.apache.lucene.analysis.util.TokenFilterFactory;
+import org.apache.lucene.util.ResourceLoader;
+import org.apache.lucene.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.TokenFilterFactory;
 
 import company.evo.jmorphy2.MorphAnalyzer;
 import company.evo.jmorphy2.JSONUtils;

diff --git a/jmorphy2-lucene/src/main/java/company/evo/jmorphy2/lucene/LuceneFileLoader.java b/jmorphy2-lucene/src/main/java/company/evo/jmorphy2/lucene/LuceneFileLoader.java
@@ -4,7 +4,7 @@
 import java.io.File;
 import java.io.InputStream;
 
-import org.apache.lucene.analysis.util.ResourceLoader;
+import org.apache.lucene.util.ResourceLoader;
 
 import company.evo.jmorphy2.FileLoader;
 

diff --git a/jmorphy2-lucene/src/test/java/company/evo/jmorphy2/lucene/Jmorphy2AnalyzerTest.java b/jmorphy2-lucene/src/test/java/company/evo/jmorphy2/lucene/Jmorphy2AnalyzerTest.java
@@ -9,7 +9,7 @@
 import java.io.IOException;
 
 import org.apache.lucene.analysis.Analyzer;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
 
 
 @RunWith(RandomizedRunner.class)

diff --git a/jmorphy2-lucene/src/test/java/company/evo/jmorphy2/lucene/Jmorphy2StemFilterTest.java b/jmorphy2-lucene/src/test/java/company/evo/jmorphy2/lucene/Jmorphy2StemFilterTest.java
@@ -14,7 +14,7 @@
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
 
 
 @RunWith(RandomizedRunner.class)

diff --git a/jmorphy2-lucene/src/test/java/company/evo/jmorphy2/lucene/Jmorphy2SubjectFilterTest.java b/jmorphy2-lucene/src/test/java/company/evo/jmorphy2/lucene/Jmorphy2SubjectFilterTest.java
@@ -12,7 +12,7 @@
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.TokenFilter;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.tests.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
 
 import company.evo.jmorphy2.nlp.Ruleset;
 import company.evo.jmorphy2.nlp.Tagger;