diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 322f61d..d07f0cd 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -13,18 +13,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
java-version: 11
+ distribution: 'temurin'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
- name: Build with Maven
- run: mvn -B package --file pom.xml -Dvespa.version='7.244.2'
+ run: mvn -B package --file pom.xml -Dvespa.version='7.594.36'
- name: Publish to GitHub Packages Apache Maven
- run: mvn deploy:deploy-file@deploy-file -s $GITHUB_WORKSPACE/settings.xml -Dvespa.version='7.244.2'
+ run: mvn deploy:deploy-file@deploy-file -s $GITHUB_WORKSPACE/settings.xml -Dvespa.version='7.594.36'
env:
GITHUB_TOKEN: ${{ github.token }}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 9715c59..6050f50 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -15,10 +15,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
- name: Set up JDK 11
- uses: actions/setup-java@v1
+ uses: actions/setup-java@v3
with:
java-version: 11
+ distribution: 'temurin'
- name: Build with Maven
- run: mvn -B package --file pom.xml -Dvespa.version='7.244.2'
+ run: mvn -B package --file pom.xml -Dvespa.version='7.594.36'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3be6b01..de29ceb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
# Changelog
+## [2.0.3] - 2022-12-20
+### Fixed
+- コード本体の変更点はありません
+
+## [2.0.2] - 2022-10-07
+### Fixed
+- コード本体の変更点はありません
+
+## [2.0.1] - 2022-05-25
+### Fixed
+- Vespa-7.585.20 以降に対応するための修正(以前の互換性は維持)
+
+## [2.0.0] - 2021-09-06
+### Cnahged
+- Vespa-7.447.10 以降に対応するための修正
+
## [1.0.1] - 2020-10-21
### Fixed
- 一部の文字がトークナイズの際にエラー原因になる問題の修正
diff --git a/README.md b/README.md
index 622f6e9..74ba08b 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ JDK (>= 11) and maven are required to build package.
Execute mvn command as below, and you can get package as target/kuromoji-linguistics-${VERSION}-deploy.jar
```
-$ mvn package -Dvespa.version='7.244.2' # You can specify 7.244.2 or later.
+$ mvn package -Dvespa.version='7.594.36' # You can specify 7.594.36 or later.
```
## Use Package
diff --git a/pom.xml b/pom.xml
index db3382d..08a6e3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
jp.co.yahoo.vespa
kuromoji-linguistics
- 1.0.1
+ 2.0.3
container-plugin
kuromoji-linguistics
@@ -30,7 +30,7 @@
11
3.5.1
- 7-SNAPSHOT
+ 7.594.36
3.0
0.9.0
@@ -68,7 +68,13 @@
${vespa.version}
provided
-
+
+ com.yahoo.vespa
+ annotations
+ ${vespa.version}
+ provided
+
+
com.atilika.kuromoji
kuromoji-ipadic
diff --git a/src/main/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguistics.java b/src/main/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguistics.java
index e26d579..8e0450a 100644
--- a/src/main/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguistics.java
+++ b/src/main/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguistics.java
@@ -141,4 +141,12 @@ public GramSplitter getGramSplitter() {
public CharacterClasses getCharacterClasses() {
return characterClasses;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean equals(Linguistics other) {
+ return (other instanceof KuromojiLinguistics);
+ }
}
diff --git a/src/test/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguisticsTest.java b/src/test/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguisticsTest.java
index e3e9f2a..2a1428d 100644
--- a/src/test/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguisticsTest.java
+++ b/src/test/java/jp/co/yahoo/vespa/language/lib/kuromoji/KuromojiLinguisticsTest.java
@@ -142,7 +142,7 @@ public void testGramSplitter() throws Exception {
String input = "お寿司が食べたい。";
String[] expecteds = new String[]{"お寿", "寿司", "司が", "が食", "食べ", "べた", "たい"};
GramSplitterIterator actualIter = gramSplitter.split(input, 2);
-
+
for (String expected : expecteds) {
Gram gram = actualIter.next();
assertEquals(expected, input.substring(gram.getStart(), gram.getStart() + gram.getCodePointCount()));