Skip to content

Commit d491580

Browse files
Upgrade to Elasticsearch to 9.1.4 (#1126)
* Upgrade to ES 9.1.4 * Update job names in test workflow for clarity * Update test.yml * Bump JDK dependency to 21 because ES9/Lucene 10 requires it * Update Maven compiler target version to 21 * Update test.yml * Move ES/OS version tags to respective pom.xml files
1 parent fc1c2e0 commit d491580

File tree

7 files changed

+81
-41
lines changed

7 files changed

+81
-41
lines changed

.github/workflows/maven.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/test.yml

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches: ['*']
6+
pull_request:
7+
branches: ['*']
8+
9+
jobs:
10+
test-elasticsearch:
11+
name: Test Elasticsearch=${{ matrix.elasticsearch }} JDK=${{ matrix.java }}
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
java: [21, 24]
18+
elasticsearch: ['9.0.0', '9.0.7', '9.1.0', '9.1.4']
19+
20+
steps:
21+
- name: Checkout code
22+
uses: actions/checkout@v4
23+
24+
- name: Setup JDK ${{ matrix.java }}
25+
uses: actions/setup-java@v4
26+
with:
27+
java-version: ${{ matrix.java }}
28+
distribution: 'temurin'
29+
cache: 'maven'
30+
31+
- name: Set Elasticsearch ${{ matrix.elasticsearch }} in POM
32+
run: |
33+
sed -i "s/<elasticsearch.version>.*<\/elasticsearch.version>/<elasticsearch.version>${{ matrix.elasticsearch }}<\/elasticsearch.version>/" elasticsearch/pom.xml
34+
echo "Updated Elasticsearch version to ${{ matrix.elasticsearch }}"
35+
grep -A 2 "<elasticsearch.version>" elasticsearch/pom.xml
36+
37+
- name: Build and test
38+
run: mvn verify -B
39+
40+
test-opensearch:
41+
name: Test OpenSearch=${{ matrix.opensearch }} JDK=${{ matrix.java }}
42+
runs-on: ubuntu-latest
43+
44+
strategy:
45+
fail-fast: false
46+
matrix:
47+
java: [21, 24]
48+
opensearch: ['2.0.1']
49+
50+
steps:
51+
- name: Checkout code
52+
uses: actions/checkout@v4
53+
54+
- name: Setup JDK ${{ matrix.java }}
55+
uses: actions/setup-java@v4
56+
with:
57+
java-version: ${{ matrix.java }}
58+
distribution: 'temurin'
59+
cache: 'maven'
60+
61+
- name: Set OpenSearch ${{ matrix.opensearch }} in POM
62+
run: |
63+
sed -i "s/<opensearch.version>.*<\/opensearch.version>/<opensearch.version>${{ matrix.opensearch }}<\/opensearch.version>/" opensearch/pom.xml
64+
echo "Updated OpenSearch version to ${{ matrix.opensearch }}"
65+
grep -A 2 "<opensearch.version>" opensearch/pom.xml
66+
67+
- name: Build and test
68+
run: mvn verify -B

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ IK Analysis for Elasticsearch and OpenSearch
22
==================================
33

44
![](./assets/banner.png)
5+
[![Test](https://github.com/infinilabs/analysis-ik/actions/workflows/test.yml/badge.svg)](https://github.com/infinilabs/analysis-ik/actions/workflows/test.yml)
6+
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE.txt)
57

68
The IK Analysis plugin integrates Lucene IK analyzer, and support customized dictionary. It supports major versions of Elasticsearch and OpenSearch. Maintained and supported with ❤️ by [INFINI Labs](https://infinilabs.com).
79

@@ -23,7 +25,7 @@ Alternatively, you can use the `plugin` CLI to install the plugin. Here's how:
2325

2426
#### For Elasticsearch:
2527
```bash
26-
bin/elasticsearch-plugin install https://get.infini.cloud/elasticsearch/analysis-ik/8.4.1
28+
bin/elasticsearch-plugin install https://get.infini.cloud/elasticsearch/analysis-ik/9.1.4
2729
```
2830

2931
#### For OpenSearch:

core/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<packaging>jar</packaging>
1414

1515
<properties>
16-
<maven.compiler.source>1.8</maven.compiler.source>
17-
<maven.compiler.target>1.8</maven.compiler.target>
16+
<maven.compiler.source>17</maven.compiler.source>
17+
<maven.compiler.target>17</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1919
</properties>
2020

@@ -31,7 +31,7 @@
3131
<scope>provided</scope>
3232
<version>${lucene.version}</version>
3333
</dependency>
34-
34+
3535
<dependency>
3636
<groupId>org.apache.httpcomponents</groupId>
3737
<artifactId>httpclient</artifactId>
@@ -41,7 +41,7 @@
4141
<dependency>
4242
<groupId>org.apache.logging.log4j</groupId>
4343
<artifactId>log4j-api</artifactId>
44-
<version>2.18.0</version>
44+
<version>2.19.0</version>
4545
<scope>provided</scope>
4646
</dependency>
4747

elasticsearch/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@
1414
<description>IK Analyzer for Elasticsearch</description>
1515
<packaging>jar</packaging>
1616

17-
1817
<properties>
18+
<elasticsearch.version>9.1.4</elasticsearch.version>
19+
<maven.compiler.target>21</maven.compiler.target>
1920
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2021
<elasticsearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</elasticsearch.assembly.descriptor>
2122
<elasticsearch.plugin.name>analysis-ik</elasticsearch.plugin.name>

opensearch/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616

1717

1818
<properties>
19+
<opensearch.version>2.0.1</opensearch.version>
20+
<maven.compiler.target>17</maven.compiler.target>
1921
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2022
<opensearch.assembly.descriptor>${project.basedir}/src/main/assemblies/plugin.xml</opensearch.assembly.descriptor>
2123
<opensearch.plugin.name>analysis-ik</opensearch.plugin.name>

pom.xml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
<inceptionYear>2011</inceptionYear>
1818

1919
<properties>
20-
<lucene.version>9.3.0</lucene.version>
21-
<elasticsearch.version>9.0.0</elasticsearch.version>
22-
<opensearch.version>2.0.1</opensearch.version>
23-
<maven.compiler.target>1.8</maven.compiler.target>
20+
<lucene.version>10.2.2</lucene.version>
21+
<maven.compiler.target>17</maven.compiler.target>
2422

2523
<tests.rest.load_packaged>false</tests.rest.load_packaged>
2624
<skip.unit.tests>true</skip.unit.tests>

0 commit comments

Comments
 (0)