From cecae3c1e3284b0d377fba580275546ae8956d46 Mon Sep 17 00:00:00 2001 From: mnagaya Date: Mon, 8 May 2023 13:27:43 +0900 Subject: [PATCH 1/4] =?UTF-8?q?Vespa-7.447.10=20=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven-publish.yml | 4 ++-- .github/workflows/maven.yml | 2 +- CHANGELOG.md | 4 ++++ README.md | 2 +- pom.xml | 2 +- .../vespa/language/lib/kuromoji/KuromojiLinguistics.java | 8 ++++++++ .../language/lib/kuromoji/KuromojiLinguisticsTest.java | 2 +- 7 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 322f61d..0086014 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -22,9 +22,9 @@ jobs: 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.447.10' - 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.447.10' env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9715c59..4de79c1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,4 +21,4 @@ jobs: with: java-version: 11 - 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.447.10' diff --git a/CHANGELOG.md b/CHANGELOG.md index 3be6b01..dfdfd5d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [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..a465c56 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.447.10' # You can specify 7.447.10 or later. ``` ## Use Package diff --git a/pom.xml b/pom.xml index db3382d..7760f53 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ jp.co.yahoo.vespa kuromoji-linguistics - 1.0.1 + 2.0.0 container-plugin kuromoji-linguistics 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())); From 2b9cacd69cad3f166c9a8dbed4fa711019ad3b52 Mon Sep 17 00:00:00 2001 From: mnagaya Date: Mon, 8 May 2023 13:30:25 +0900 Subject: [PATCH 2/4] =?UTF-8?q?Vespa-7.585.20=20=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven-publish.yml | 4 ++-- .github/workflows/maven.yml | 2 +- CHANGELOG.md | 4 ++++ README.md | 2 +- pom.xml | 10 ++++++++-- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 0086014..d0f8f25 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -22,9 +22,9 @@ jobs: settings-path: ${{ github.workspace }} # location for the settings.xml file - name: Build with Maven - run: mvn -B package --file pom.xml -Dvespa.version='7.447.10' + run: mvn -B package --file pom.xml -Dvespa.version='7.585.20' - name: Publish to GitHub Packages Apache Maven - run: mvn deploy:deploy-file@deploy-file -s $GITHUB_WORKSPACE/settings.xml -Dvespa.version='7.447.10' + run: mvn deploy:deploy-file@deploy-file -s $GITHUB_WORKSPACE/settings.xml -Dvespa.version='7.585.20' env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4de79c1..68ba011 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,4 +21,4 @@ jobs: with: java-version: 11 - name: Build with Maven - run: mvn -B package --file pom.xml -Dvespa.version='7.447.10' + run: mvn -B package --file pom.xml -Dvespa.version='7.585.20' diff --git a/CHANGELOG.md b/CHANGELOG.md index dfdfd5d..ddc5fa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [2.0.1] - 2022-05-25 +### Fixed +- Vespa-7.585.20 以降に対応するための修正（以前の互換性は維持） + ## [2.0.0] - 2021-09-06 ### Cnahged - Vespa-7.447.10 以降に対応するための修正 diff --git a/README.md b/README.md index a465c56..fec642f 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.447.10' # You can specify 7.447.10 or later. +$ mvn package -Dvespa.version='7.585.20' # You can specify 7.585.20 or later. ``` ## Use Package diff --git a/pom.xml b/pom.xml index 7760f53..a032ee2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ jp.co.yahoo.vespa kuromoji-linguistics - 2.0.0 + 2.0.1 container-plugin kuromoji-linguistics @@ -68,7 +68,13 @@ ${vespa.version} provided - + + com.yahoo.vespa + annotations + ${vespa.version} + provided + + com.atilika.kuromoji kuromoji-ipadic From 11411b60f966dee189e1e319ebe527103cedbb38 Mon Sep 17 00:00:00 2001 From: mnagaya Date: Mon, 8 May 2023 13:32:13 +0900 Subject: [PATCH 3/4] =?UTF-8?q?Vespa-7.594.36=20=E4=BB=A5=E9=99=8D?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=99=E3=82=8B=E3=81=9F=E3=82=81?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/maven-publish.yml | 8 ++++---- .github/workflows/maven.yml | 6 +++--- CHANGELOG.md | 8 ++++++++ README.md | 2 +- pom.xml | 4 ++-- 5 files changed, 18 insertions(+), 10 deletions(-) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index d0f8f25..18184d0 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -13,18 +13,18 @@ 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 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.585.20' + 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.585.20' + 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 68ba011..e98a962 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -15,10 +15,10 @@ 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 - name: Build with Maven - run: mvn -B package --file pom.xml -Dvespa.version='7.585.20' + run: mvn -B package --file pom.xml -Dvespa.version='7.594.36' diff --git a/CHANGELOG.md b/CHANGELOG.md index ddc5fa6..de29ceb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # 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 以降に対応するための修正（以前の互換性は維持） diff --git a/README.md b/README.md index fec642f..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.585.20' # You can specify 7.585.20 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 a032ee2..08a6e3a 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ jp.co.yahoo.vespa kuromoji-linguistics - 2.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 From b9e3a4032f43942b10fd55d722282f53e4bfe5f7 Mon Sep 17 00:00:00 2001 From: mnagaya Date: Mon, 8 May 2023 13:49:37 +0900 Subject: [PATCH 4/4] Fix build error --- .github/workflows/maven-publish.yml | 1 + .github/workflows/maven.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 18184d0..d07f0cd 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -18,6 +18,7 @@ jobs: 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 diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e98a962..6050f50 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -20,5 +20,6 @@ jobs: 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.594.36'