Skip to content

Commit

Permalink
Bump Lucene 9.7.0 (#218)
Browse files Browse the repository at this point in the history
* bump Lucene 9.7.0

* mention in changelog

* test word2vecsynonym token filter
  • Loading branch information
dainiusjocas authored Aug 10, 2023
1 parent 60d0cc4 commit c705745
Show file tree
Hide file tree
Showing 12 changed files with 23 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/clj-kondo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
- name: Install clojure tools-deps
uses: DeLaGuardo/[email protected]
with:
cli: '1.11.1.1347'
cli: '1.11.1.1356'
bb: '1.3.181'
clj-kondo: '2023.05.26'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
- name: Install clojure tools-deps`
uses: DeLaGuardo/setup-clojure@master
with:
cli: '1.11.1.1347'
cli: '1.11.1.1356'
bb: '1.3.181'

- name: Compile uberjar
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- name: Prepare java
uses: actions/setup-java@v3.11.0
uses: actions/setup-java@v3.12.0
with:
distribution: 'zulu'
java-version: 17

- name: Install clojure tools-deps
uses: DeLaGuardo/[email protected]
with:
cli: '1.11.1.1347'
cli: '1.11.1.1356'
bb: '1.3.181'

- name: Unit Tests
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ For a list of breaking changes, check [here](#breaking-changes).

## Unreleased

- Bump Lucene to 9.7.0
- Support for the `Word2VecSynonymFilter`
- Update `com.github.clj-easy/graal-build-time` to 1.0.5
- Load Analyzers via SPI

Expand Down
12 changes: 6 additions & 6 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
:deps
{org.clojure/clojure {:mvn/version "1.11.1"}
org.clojure/tools.cli {:mvn/version "1.0.219"}
org.apache.lucene/lucene-core {:mvn/version "9.6.0"}
org.apache.lucene/lucene-analysis-common {:mvn/version "9.6.0"}
org.apache.lucene/lucene-monitor {:mvn/version "9.6.0"}
org.apache.lucene/lucene-queries {:mvn/version "9.6.0"}
org.apache.lucene/lucene-queryparser {:mvn/version "9.6.0"}
org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
org.apache.lucene/lucene-analysis-common {:mvn/version "9.7.0"}
org.apache.lucene/lucene-monitor {:mvn/version "9.7.0"}
org.apache.lucene/lucene-queries {:mvn/version "9.7.0"}
org.apache.lucene/lucene-queryparser {:mvn/version "9.7.0"}
metosin/jsonista {:mvn/version "0.3.7"}
lt.jocas/lucene-custom-analyzer {:mvn/version "1.0.28"}
lmgrep/lucene-monitor-helpers {:local/root "modules/lucene-monitor-helpers"}
Expand All @@ -28,7 +28,7 @@
:main-opts ["-m" "cognitect.test-runner"]}
:clj-kondo
{:main-opts ["-m" "clj-kondo.main" "--lint" "src" "test"]
:extra-deps {clj-kondo/clj-kondo {:mvn/version "2023.05.26"}}
:extra-deps {clj-kondo/clj-kondo {:mvn/version "2023.07.13"}}
:jvm-opts ["-Dclojure.main.report=stderr"]}
:raudikko
{:extra-deps {lmgrep/raudikko-src {:local/root "modules/raudikko"}}
Expand Down
4 changes: 2 additions & 2 deletions modules/bundled-analyzers/deps.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:paths ["target/bundled-analyzers.jar"]
:deps {org.apache.lucene/lucene-core {:mvn/version "9.6.0"}
org.apache.lucene/lucene-analysis-common {:mvn/version "9.6.0"}}
:deps {org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
org.apache.lucene/lucene-analysis-common {:mvn/version "9.7.0"}}
:deps/prep-lib {:ensure "target/bundled-analyzers.jar"
:alias :build
:fn jar}
Expand Down
4 changes: 2 additions & 2 deletions modules/lucene-monitor-helpers/deps.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:paths ["classes"]
:deps {org.apache.lucene/lucene-core {:mvn/version "9.6.0"}
org.apache.lucene/lucene-monitor {:mvn/version "9.6.0"}}
:deps {org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
org.apache.lucene/lucene-monitor {:mvn/version "9.7.0"}}
:deps/prep-lib {:ensure "classes"
:alias :build
:fn compile-java}
Expand Down
2 changes: 1 addition & 1 deletion modules/raudikko/deps.edn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{:paths ["target/raudikko.jar"]
:deps {org.apache.lucene/lucene-core {:mvn/version "9.6.0"}
:deps {org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
fi.evident.raudikko/raudikko {:mvn/version "0.1.4"}}
:deps/prep-lib {:ensure "target/raudikko.jar"
:alias :build
Expand Down
4 changes: 2 additions & 2 deletions modules/snowball-token-filters/deps.edn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{:paths ["target/snowball-token-filters.jar"]
:deps {org.apache.lucene/lucene-core {:mvn/version "9.6.0"}
org.apache.lucene/lucene-analysis-common {:mvn/version "9.6.0"}}
:deps {org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
org.apache.lucene/lucene-analysis-common {:mvn/version "9.7.0"}}
:deps/prep-lib {:ensure "target/snowball-token-filters.jar"
:alias :build
:fn jar}
Expand Down
4 changes: 2 additions & 2 deletions modules/stempel/deps.edn
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{:paths ["resources" "src"]
:deps {org.apache.lucene/lucene-core {:mvn/version "9.6.0"}
org.apache.lucene/lucene-analysis-stempel {:mvn/version "9.6.0"}}}
:deps {org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
org.apache.lucene/lucene-analysis-stempel {:mvn/version "9.7.0"}}}
3 changes: 2 additions & 1 deletion test/lmgrep/lucene/analysis_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@
"hyphenationcompoundword" {"hyphenator" "test/resources/hyphenation_hyphenator.xml"}
"hunspellstem" {"dictionary" "test/resources/hunspell_dict.dic"
"affix" "test/resources/hunspell_dict.aff"}
"dropifflagged" {"dropFlags" "2"}}]
"dropifflagged" {"dropFlags" "2"}
"word2vecsynonym" {"model" "test/resources/word2vec-model.zip"}}]
(is (seq token-filter-names))
(doseq [token-filter-name token-filter-names]
(try
Expand Down
Binary file added test/resources/word2vec-model.zip
Binary file not shown.

0 comments on commit c705745

Please sign in to comment.