Support Es 8.16 to 8.18

Author: KHiyowa

.github/workflows/build.yml

@@ -14,24 +14,15 @@ jobs:
     strategy:
       matrix:
         es-version:
+          - 'es:8.18.3'
+          - 'es:8.17.8'
+          - 'es:8.16.6'
           - 'es:8.15.2'
           - 'es:8.14.3'
           - 'es:8.13.4'
           - 'es:8.12.2'
           - 'es:8.11.4'
           - 'es:8.10.4'
-          - 'es:8.9.2'
-          - 'es:8.8.2'
-          - 'es:8.7.1'
-          - 'es:8.6.2'
-          - 'es:8.5.3'
-          - 'es:8.4.3'
-          - 'es:8.3.3'
-          - 'es:8.2.3'
-          - 'es:7.17.24'
-          - 'es:7.17.8'
-          - 'es:7.14.2'
-          - 'es:7.10.2'
           - 'os:2.18.0'
           - 'os:2.17.1'
           - 'os:2.16.0'

CHANGELOG.md

@@ -1,10 +1,14 @@
 # Change log
 
-## [Unreleased]
+## [3.4.0](https://github.com/WorksApplications/elasticsearch-sudachi/releases/tag/v3.4.0) - 2025-08-18
 
 ### Added
 
 - Support OpenSearch 2.18.0
+- Support Elasticsearch 8.16.6, 8.17.8, and 8.18.3
+
+### Removed
+- Elasticsearch 7.x and versions earlier than 8.10 will no longer be supported.$
 
 ## [3.3.0](https://github.com/WorksApplications/elasticsearch-sudachi/releases/tag/v3.3.0) - 2024-11-13
 

README.md

@@ -7,25 +7,24 @@ analysis-sudachi is an Elasticsearch plugin for tokenization of Japanese text us
 
 # What's new?
 
-- [3.3.0]
-  - `allow_empty_morpheme` is added to the `sudachi_tokenizer` settings (#151)
-  - Offset correction of `SudachiSplitFilter` now works properly with char filters (#149)
-  - spi changed to implement #149
+- [3.4.0]
+  - Support Elasticsearch 8.16.6, 8.17.8, and 8.18.3.
+  - Elasticsearch 7.x and versions earlier than 8.10 will no longer be supported.
 
 Check [changelog](./CHANGELOG.md) for more.
 
 # Build (if necessary)
 
 1. Build analysis-sudachi.
 ```
-   $ ./gradlew -PengineVersion=es:8.15.2 build
+   $ ./gradlew -PengineVersion=es:8.19.2 build
 ```
 
 Use `-PengineVersion=os:2.18.0` for OpenSearch.
 
 ## Supported ElasticSearch versions
 
-1. 8.10.* until 8.15.* supported, integration tests in CI
+1. 8.10.* until 8.19.* supported, integration tests in CI
 
 ## Supported OpenSearch versions
 

buildSrc/src/main/groovy/com/worksap/nlp/tools/engines.groovy

@@ -7,6 +7,8 @@ trait EngineSupport {
 enum EsSupport implements EngineSupport {
     Es810("es-8.10"),
     Es812("es-8.12"),
+    Es816("es-8.16"),
+    Es818("es-8.18"),
 
     String tag
     List<String> keys
@@ -21,8 +23,12 @@ enum EsSupport implements EngineSupport {
             throw new IllegalArgumentException("versions below 8.10 are not supported")
         } else if (vers.ge(8, 10) && vers.lt(8, 12)) {
             return Es810
-        } else if (vers.ge(8, 12) && vers.lt(9, 0)) {
+        } else if (vers.ge(8, 12) && vers.lt(8, 16)) {
             return Es812
+        } else if (vers.ge(8, 16) && vers.lt(8, 18)) {
+            return Es816
+        } else if (vers.ge(8, 18) && vers.lt(9, 0)) {
+            return Es818
         } else {
             throw new IllegalArgumentException("unsupported ElasticSearch version: " + vers.raw)
         }

gradle.properties

@@ -1,7 +1,8 @@
-# elasticsearch versions: 8.15.2, 8.14.3, 8.13.4, 8.12.2, 8.11.4, 8.10.4
+# elasticsearch versions: 8.18.3, 8.17.8, 8.16.6, 8.15.2, 8.14.3, 8.13.4, 8.12.2,
+#     8.11.4, 8.10.4
 # opensearch version: 2.18.0, 2.17.1, 2.16.0, 2.15.0, 2.14.0, 2.13.0, 2.12.0, 2.11.1, 
 #     2.10.0, 2.9.0, 2.8.0, 2.7.0, 2.6.0
-engineVersion=es:8.15.2
+engineVersion=es:8.19.2
 org.gradle.jvmargs=-XX:MaxMetaspaceSize=350m \
   --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
   --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \

integration/src/test/ext/es-8.12-ge/SudachiInSearchEngineEnv.kt renamed to integration/src/test/ext/es-8.12/SudachiInSearchEngineEnv.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Works Applications Co., Ltd.
+ * Copyright (c) 2024-2025 Works Applications Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

integration/src/test/ext/es-8.16/SudachiInSearchEngineEnv.kt

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2024-2025 Works Applications Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.worksap.nlp.elasticsearch.sudachi
+
+import org.elasticsearch.indices.analysis.AnalysisModule
+import org.elasticsearch.plugins.AnalysisPlugin
+import org.elasticsearch.plugins.PluginsService
+
+typealias PluginsServiceAlias = PluginsService
+
+fun SudachiInSearchEngineEnv.makePluginService(): PluginsServiceAlias {
+  return PluginsService(settings(), configPath, null, pluginsPath)
+}
+
+fun SudachiInSearchEngineEnv.makeAnalysisModule(): AnalysisModule {
+  val plugins = makePluginService()
+  val analysisPlugins = plugins.filterPlugins(AnalysisPlugin::class.java).toList()
+  val env = environment()
+  return AnalysisModule(env, analysisPlugins, plugins.stablePluginRegistry)
+}

integration/src/test/ext/es-8.18/SudachiInSearchEngineEnv.kt

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2024-2025 Works Applications Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.worksap.nlp.elasticsearch.sudachi
+
+import org.elasticsearch.indices.analysis.AnalysisModule
+import org.elasticsearch.plugins.AnalysisPlugin
+import org.elasticsearch.plugins.PluginsLoader
+import org.elasticsearch.plugins.PluginsService
+
+typealias PluginsServiceAlias = PluginsService
+
+fun SudachiInSearchEngineEnv.makePluginService(): PluginsServiceAlias {
+  return PluginsService(
+      settings(),
+      configPath,
+      PluginsLoader.createPluginsLoader(
+          null, PluginsLoader.loadPluginsBundles(pluginsPath), null, false))
+}
+
+fun SudachiInSearchEngineEnv.makeAnalysisModule(): AnalysisModule {
+  val plugins = makePluginService()
+  val analysisPlugins = plugins.filterPlugins(AnalysisPlugin::class.java).toList()
+  val env = environment()
+  return AnalysisModule(env, analysisPlugins, plugins.stablePluginRegistry)
+}

src/main/ext/es-8.18-lt/ConfigAdapter.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Works Applications Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.worksap.nlp.elasticsearch.sudachi
+
+import com.worksap.nlp.search.aliases.Environment
+import com.worksap.nlp.search.aliases.Settings
+import java.nio.file.Path
+
+fun resourcesPath(env: Environment, settings: Settings): Path {
+  return env.configFile()
+      .resolve(
+          settings.get(ConfigAdapter.PARAM_RESOURCES_PATH, ConfigAdapter.DEFAULT_RESOURCE_PATH))
+}

src/main/ext/es-8.18/ConfigAdapter.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2025 Works Applications Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.worksap.nlp.elasticsearch.sudachi
+
+import com.worksap.nlp.search.aliases.Environment
+import com.worksap.nlp.search.aliases.Settings
+import java.nio.file.Path
+
+fun resourcesPath(env: Environment, settings: Settings): Path {
+  return env.configDir()
+      .resolve(
+          settings.get(ConfigAdapter.PARAM_RESOURCES_PATH, ConfigAdapter.DEFAULT_RESOURCE_PATH))
+}