lucene 9.8.0 (#220)

* lucene 9.8.0
dainiusjocas · Sep 29, 2023 · e4ab441 · e4ab441
1 parent c705745
commit e4ab441
Show file tree

Hide file tree

Showing 12 changed files with 63 additions and 57 deletions.
diff --git a/.github/workflows/clj-kondo.yml b/.github/workflows/clj-kondo.yml
@@ -8,13 +8,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.0
       - name: Install clojure tools-deps
-        uses: DeLaGuardo/setup-clojure@11.0
+        uses: DeLaGuardo/setup-clojure@12.1
         with:
-          cli: '1.11.1.1356'
-          bb: '1.3.181'
-          clj-kondo: '2023.05.26'
+          cli: '1.11.1.1413'
+          bb: '1.3.184'
+          clj-kondo: '2023.09.07'
 
       - name: Lint the code
         run: clj-kondo --lint src test
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,7 +16,7 @@ jobs:
   create-gh-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.0
 
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
@@ -41,7 +41,7 @@ jobs:
       - name: Set env variable with the release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.0
       - uses: graalvm/setup-graalvm@v1
         with:
           java-version: '17.0.7'
@@ -52,8 +52,8 @@ jobs:
       - name: Install clojure tools-deps`
         uses: DeLaGuardo/setup-clojure@master
         with:
-          cli: '1.11.1.1356'
-          bb: '1.3.181'
+          cli: '1.11.1.1413'
+          bb: '1.3.184'
 
       - name: Compile uberjar
         run: |
@@ -129,7 +129,7 @@ jobs:
       - name: Set env variable with the release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.0
       - uses: graalvm/setup-graalvm@v1
         with:
           java-version: '17.0.7'
@@ -179,7 +179,7 @@ jobs:
     name: docker image release per architecture
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.0
 
       - name: Set env variable with the release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
@@ -190,22 +190,22 @@ jobs:
           name: static-image
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3.0.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5.0.0
         with:
           images: dainiusjocas/lmgrep
           tags: |
             type=raw,value=latest
             type=raw,value=${{ env.RELEASE_VERSION }}
 
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5.0.0
         with:
           push: true
           context: .

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,26 +9,26 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.5.3
+      - uses: actions/checkout@v4.1.0
 
       - name: Cache maven deps
-        uses: actions/[email protected].1
+        uses: actions/[email protected].2
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/deps.edn') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Prepare java
-        uses: actions/setup-java@v3.12.0
+        uses: actions/setup-java@v3.13.0
         with:
           distribution: 'zulu'
           java-version: 17
 
       - name: Install clojure tools-deps
-        uses: DeLaGuardo/setup-clojure@11.0
+        uses: DeLaGuardo/setup-clojure@12.1
         with:
-          cli: '1.11.1.1356'
-          bb: '1.3.181'
+          cli: '1.11.1.1413'
+          bb: '1.3.184'
 
       - name: Unit Tests
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,11 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ## Unreleased
 
-- Bump Lucene to 9.7.0
+- Upgrade Lucene to 9.8.0 (#220)
+
+## v2023.08.31
+
+- Upgrade 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

diff --git a/bb.edn b/bb.edn
@@ -9,22 +9,24 @@
                   {:doc  "Build the required deps"
                    :task (clojure "-T:build prep-deps")}
                   -LMGREP_VERSION
-                  {:doc "Update LMGREP_VERSION file"
+                  {:doc  "Update LMGREP_VERSION file"
                    :task (let [version (->> (shell {:out :string} "git describe --tags --abbrev=0")
                                          (:out)
                                          (str/trim))]
                            (spit "resources/LMGREP_VERSION" (str version "-SNAPSHOT")))}
                   uberjar
-                  {:doc  "Build an uberjar"
-                   :depends [deps-prep -pom.xml -LMGREP_VERSION]
-                   :task (clojure "-T:build uberjar")}
+                  {:doc              "Build an uberjar"
+                   :override-builtin true
+                   :depends          [deps-prep -pom.xml -LMGREP_VERSION]
+                   :task             (clojure "-T:build uberjar")}
                   run
-                  {:requires ([script.env-profiles :as e])
-                   :doc      "Run lmgrep on JVM with required profiles"
-                   :task     (let [profiles (e/profiles)]
-                               (println "Running lmgrep on JVM with profiles: " profiles)
-                               (apply clojure (cond-> [(str "-M:" (clojure.string/join ":" profiles) " -m lmgrep.core")]
-                                                (not (empty? *command-line-args*)) (concat *command-line-args*))))}
+                  {:requires         ([script.env-profiles :as e])
+                   :override-builtin true
+                   :doc              "Run lmgrep on JVM with required profiles"
+                   :task             (let [profiles (e/profiles)]
+                                       (println "Running lmgrep on JVM with profiles: " profiles)
+                                       (apply clojure (cond-> [(str "-M:" (clojure.string/join ":" profiles) " -m lmgrep.core")]
+                                                        (not (empty? *command-line-args*)) (concat *command-line-args*))))}
                   test
                   {:requires ([script.env-profiles :as e])
                    :doc      "Run tests with the required profiles"

diff --git a/deps.edn b/deps.edn
@@ -3,32 +3,32 @@
  :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.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"}
+  org.apache.lucene/lucene-core            {:mvn/version "9.8.0"}
+  org.apache.lucene/lucene-analysis-common {:mvn/version "9.8.0"}
+  org.apache.lucene/lucene-monitor         {:mvn/version "9.8.0"}
+  org.apache.lucene/lucene-queries         {:mvn/version "9.8.0"}
+  org.apache.lucene/lucene-queryparser     {:mvn/version "9.8.0"}
+  metosin/jsonista                         {:mvn/version "0.3.8"}
+  lt.jocas/lucene-custom-analyzer          {:mvn/version "1.0.37"}
   lmgrep/lucene-monitor-helpers            {:local/root "modules/lucene-monitor-helpers"}
-  lt.jocas/lucene-query-parsing            {:mvn/version "1.0.8"}
-  lt.jocas/lucene-text-analysis            {:mvn/version "1.0.21"}
+  lt.jocas/lucene-query-parsing            {:mvn/version "1.0.12"}
+  lt.jocas/lucene-text-analysis            {:mvn/version "1.0.26"}
   babashka/fs                              {:mvn/version "0.4.19"}
   com.github.clj-easy/graal-build-time     {:mvn/version "1.0.5"}}
  :aliases
  {:dev
   {:extra-paths ["dev" "test" "test/resources"]
    :extra-deps  {org.clojure/tools.deps.alpha {:git/url "https://github.com/clojure/tools.deps.alpha"
                                                :git/sha "5b8909bdb072d66c9f643bae50cd2878a0f694c2"}
-                 org.slf4j/slf4j-nop          {:mvn/version "2.0.7"}
+                 org.slf4j/slf4j-nop          {:mvn/version "2.0.9"}
                  criterium/criterium          {:mvn/version "0.4.6"}}}
   :test
   {:extra-paths ["test" "test/resources" "modules/text-analysis/test"]
    :extra-deps  {io.github.cognitect-labs/test-runner {:git/tag "v0.5.1" :git/sha "dfb30dd"}}
    :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.07.13"}}
+   :extra-deps {clj-kondo/clj-kondo {:mvn/version "2023.09.07"}}
    :jvm-opts   ["-Dclojure.main.report=stderr"]}
   :raudikko
   {:extra-deps {lmgrep/raudikko-src {:local/root "modules/raudikko"}}
@@ -43,6 +43,6 @@
   {:extra-deps {lmgrep/bundled-analyzers {:local/root "modules/bundled-analyzers"}}
    :env        "LMGREP_FEATURE_BUNDLED_ANALYZERS"}
   :build
-  {:deps       {io.github.clojure/tools.build {:mvn/version "0.9.4"}
+  {:deps       {io.github.clojure/tools.build {:mvn/version "0.9.5"}
                 org.clojure/tools.deps.cli    {:mvn/version "0.9.43"}}
    :ns-default build}}}
diff --git a/modules/bundled-analyzers/deps.edn b/modules/bundled-analyzers/deps.edn
@@ -1,11 +1,11 @@
 {:paths         ["target/bundled-analyzers.jar"]
- :deps          {org.apache.lucene/lucene-core            {:mvn/version "9.7.0"}
-                 org.apache.lucene/lucene-analysis-common {:mvn/version "9.7.0"}}
+ :deps          {org.apache.lucene/lucene-core            {:mvn/version "9.8.0"}
+                 org.apache.lucene/lucene-analysis-common {:mvn/version "9.8.0"}}
  :deps/prep-lib {:ensure "target/bundled-analyzers.jar"
                  :alias  :build
                  :fn     jar}
  :aliases
  {:build
   {:deps       {org.clojure/clojure           {:mvn/version "1.11.1"}
-                io.github.clojure/tools.build {:mvn/version "0.9.4"}}
+                io.github.clojure/tools.build {:mvn/version "0.9.5"}}
    :ns-default build}}}
diff --git a/modules/lucene-monitor-helpers/deps.edn b/modules/lucene-monitor-helpers/deps.edn
@@ -1,11 +1,11 @@
 {:paths         ["classes"]
- :deps          {org.apache.lucene/lucene-core    {:mvn/version "9.7.0"}
-                 org.apache.lucene/lucene-monitor {:mvn/version "9.7.0"}}
+ :deps          {org.apache.lucene/lucene-core    {:mvn/version "9.8.0"}
+                 org.apache.lucene/lucene-monitor {:mvn/version "9.8.0"}}
  :deps/prep-lib {:ensure "classes"
                  :alias  :build
                  :fn     compile-java}
  :aliases
  {:build
   {:deps       {org.clojure/clojure           {:mvn/version "1.11.1"}
-                io.github.clojure/tools.build {:mvn/version "0.9.4"}}
+                io.github.clojure/tools.build {:mvn/version "0.9.5"}}
    :ns-default build}}}
diff --git a/modules/raudikko/deps.edn b/modules/raudikko/deps.edn
@@ -1,11 +1,11 @@
 {:paths         ["target/raudikko.jar"]
- :deps          {org.apache.lucene/lucene-core {:mvn/version "9.7.0"}
+ :deps          {org.apache.lucene/lucene-core {:mvn/version "9.8.0"}
                  fi.evident.raudikko/raudikko  {:mvn/version "0.1.4"}}
  :deps/prep-lib {:ensure "target/raudikko.jar"
                  :alias  :build
                  :fn     jar}
  :aliases
  {:build
   {:deps       {org.clojure/clojure           {:mvn/version "1.11.1"}
-                io.github.clojure/tools.build {:mvn/version "0.9.4"}}
+                io.github.clojure/tools.build {:mvn/version "0.9.5"}}
    :ns-default build}}}
diff --git a/modules/snowball-token-filters/deps.edn b/modules/snowball-token-filters/deps.edn
@@ -1,11 +1,11 @@
 {:paths         ["target/snowball-token-filters.jar"]
- :deps          {org.apache.lucene/lucene-core            {:mvn/version "9.7.0"}
-                 org.apache.lucene/lucene-analysis-common {:mvn/version "9.7.0"}}
+ :deps          {org.apache.lucene/lucene-core            {:mvn/version "9.8.0"}
+                 org.apache.lucene/lucene-analysis-common {:mvn/version "9.8.0"}}
  :deps/prep-lib {:ensure "target/snowball-token-filters.jar"
                  :alias  :build
                  :fn     jar}
  :aliases
  {:build
   {:deps       {org.clojure/clojure           {:mvn/version "1.11.1"}
-                io.github.clojure/tools.build {:mvn/version "0.9.4"}}
+                io.github.clojure/tools.build {:mvn/version "0.9.5"}}
    :ns-default build}}}
diff --git a/modules/stempel/deps.edn b/modules/stempel/deps.edn
@@ -1,3 +1,3 @@
 {:paths         ["resources" "src"]
- :deps          {org.apache.lucene/lucene-core             {:mvn/version "9.7.0"}
-                 org.apache.lucene/lucene-analysis-stempel {:mvn/version "9.7.0"}}}
+ :deps          {org.apache.lucene/lucene-core             {:mvn/version "9.8.0"}
+                 org.apache.lucene/lucene-analysis-stempel {:mvn/version "9.8.0"}}}
diff --git a/script/compile b/script/compile
@@ -26,7 +26,7 @@ args=( "-jar"
        "-H:+ReportExceptionStackTraces"
        "-H:IncludeResources=LMGREP_VERSION"
        "-H:+BuildReport"
-       "-march=native"
+       "-march=compatibility"
        "-H:ReflectionConfigurationFiles=$(pwd)/graalvm/lucene-reflect-config.json" )
 
 LMGREP_STATIC=${LMGREP_STATIC:-}