Chore/upgrade lucene 9.4.0 (#203)

* chore: update lucene to 9.4.0 * fix: quarkus-lucene outdated override * chore: deps and changelog
dainiusjocas · Oct 21, 2022 · 89b947d · 89b947d
1 parent 26c5a80
commit 89b947d
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 35 deletions.
diff --git a/.github/workflows/clj-kondo.yml b/.github/workflows/clj-kondo.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
       - uses: DeLaGuardo/clojure-lint-action@master
         with:
           clj-kondo-args: --lint src test

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,15 +11,15 @@ env:
   LMGREP_FEATURE_CHARSETS: true
   LMGREP_FEATURE_STEMPEL: true
   LMGREP_FEATURE_RAUDIKKO: false
-  CLOJURE_VERSION: '1.11.1.1155'
-  BABASHKA_VERSION: '0.9.161'
+  CLOJURE_VERSION: '1.11.1.1165'
+  BABASHKA_VERSION: '1.0.164'
   GRAALVM_VERSION: '22.2.0'
 
 jobs:
   create-gh-release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@master
+      - uses: actions/checkout@v3.1.0
 
       - name: Set env
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
@@ -44,7 +44,7 @@ jobs:
       - name: Set env variable with the release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
       - uses: graalvm/setup-graalvm@v1
         with:
           version: ${{ env.GRAALVM_VERSION }}
@@ -136,7 +136,7 @@ jobs:
       - name: Set env variable with the release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
       - uses: graalvm/setup-graalvm@v1
         with:
           version: ${{ env.GRAALVM_VERSION }}
@@ -186,7 +186,7 @@ jobs:
     name: docker image release per architecture
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
 
       - name: Set env variable with the release version
         run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,26 +4,26 @@ on:
   push:
 
 env:
-  CLOJURE_VERSION: '1.11.1.1155'
-  BABASHKA_VERSION: '0.9.161'
+  CLOJURE_VERSION: '1.11.1.1165'
+  BABASHKA_VERSION: '1.0.164'
 
 jobs:
   unit-test:
 
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.1.0
 
       - name: Cache maven deps
-        uses: actions/[email protected].7
+        uses: actions/[email protected].11
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/deps.edn') }}
           restore-keys: |
             ${{ runner.os }}-maven-
       - name: Prepare java
-        uses: actions/setup-java@v3.4.1
+        uses: actions/setup-java@v3.6.0
         with:
           distribution: 'zulu'
           java-version: 17

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@ For a list of breaking changes, check [here](#breaking-changes).
 
 ### Fixed/enhanced
 
-- Upgrade to Lucene 9.3.0
+- Upgrade to Lucene 9.4.0
 - Upgrade GraalVM to 22.2.0
 - Option for Lucene Monitor queries index disk storage under option `:queries-index-dir`
 - Update `lucene-text-analysis` to 1.0.17

diff --git a/deps.edn b/deps.edn
@@ -2,36 +2,36 @@
  ["src" "resources"]
  :deps
  {org.clojure/clojure                      {:mvn/version "1.11.1"}
-  org.clojure/tools.cli                    {:mvn/version "1.0.206"}
-  org.apache.lucene/lucene-core            {:mvn/version "9.3.0"}
-  org.apache.lucene/lucene-analysis-common {:mvn/version "9.3.0"}
-  org.apache.lucene/lucene-monitor         {:mvn/version "9.3.0"}
-  org.apache.lucene/lucene-queries         {:mvn/version "9.3.0"}
-  org.apache.lucene/lucene-queryparser     {:mvn/version "9.3.0"}
+  org.clojure/tools.cli                    {:mvn/version "1.0.214"}
+  org.apache.lucene/lucene-core            {:mvn/version "9.4.0"}
+  org.apache.lucene/lucene-analysis-common {:mvn/version "9.4.0"}
+  org.apache.lucene/lucene-monitor         {:mvn/version "9.4.0"}
+  org.apache.lucene/lucene-queries         {:mvn/version "9.4.0"}
+  org.apache.lucene/lucene-queryparser     {:mvn/version "9.4.0"}
   metosin/jsonista                         {:mvn/version "0.3.6"}
-  lt.jocas/lucene-custom-analyzer          {:mvn/version "1.0.21"}
+  lt.jocas/lucene-custom-analyzer          {:mvn/version "1.0.24"}
   lmgrep/lucene-monitor-helpers            {:local/root "modules/lucene-monitor-helpers"}
-  lt.jocas/lucene-query-parsing            {:mvn/version "1.0.4"}
-  lt.jocas/lucene-text-analysis            {:mvn/version "1.0.17"}
+  lt.jocas/lucene-query-parsing            {:mvn/version "1.0.6"}
+  lt.jocas/lucene-text-analysis            {:mvn/version "1.0.20"}
   babashka/fs                              {:mvn/version "0.1.11"}
   io.quarkiverse.lucene/quarkus-lucene     {:mvn/version "0.3"
                                             :exclusions  [org.apache.lucene/lucene-analyzers-common]}
-  io.quarkus/quarkus-arc                   {:mvn/version "2.12.1.Final"}
+  io.quarkus/quarkus-arc                   {:mvn/version "2.13.3.Final"}
   com.github.clj-easy/graal-build-time     {:mvn/version "0.1.4"}}
  :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 "c0ce485ddac6ad96fcc43491318c847287299d9b"}
-                 org.slf4j/slf4j-nop          {:mvn/version "2.0.0"}
+                                               :git/sha "37ce804269b2bbc2227d7101c32013a352f76e57"}
+                 org.slf4j/slf4j-nop          {:mvn/version "2.0.3"}
                  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 "2022.09.08"}}
+   :extra-deps {clj-kondo/clj-kondo {:mvn/version "2022.10.14"}}
    :jvm-opts   ["-Dclojure.main.report=stderr"]}
   :raudikko
   {:extra-deps {lmgrep/raudikko-src {:local/root "modules/raudikko"}}

diff --git a/modules/bundled-analyzers/deps.edn b/modules/bundled-analyzers/deps.edn
@@ -1,3 +1,3 @@
 {:paths ["src"]
- :deps  {org.apache.lucene/lucene-core            {:mvn/version "9.3.0"}
-         org.apache.lucene/lucene-analysis-common {:mvn/version "9.3.0"}}}
+ :deps  {org.apache.lucene/lucene-core            {:mvn/version "9.4.0"}
+         org.apache.lucene/lucene-analysis-common {:mvn/version "9.4.0"}}}
diff --git a/modules/lucene-monitor-helpers/deps.edn b/modules/lucene-monitor-helpers/deps.edn
@@ -1,6 +1,6 @@
 {:paths         ["classes"]
- :deps          {org.apache.lucene/lucene-core    {:mvn/version "9.3.0"}
-                 org.apache.lucene/lucene-monitor {:mvn/version "9.3.0"}}
+ :deps          {org.apache.lucene/lucene-core    {:mvn/version "9.4.0"}
+                 org.apache.lucene/lucene-monitor {:mvn/version "9.4.0"}}
  :deps/prep-lib {:ensure "classes"
                  :alias  :build
                  :fn     compile-java}

diff --git a/modules/lucene-monitor-helpers/java/org/apache/lucene/store/MMapDirectoryReplacementJDK.java b/modules/lucene-monitor-helpers/java/org/apache/lucene/store/MMapDirectoryReplacementJDK.java
@@ -0,0 +1,7 @@
+package org.apache.lucene.store;
+
+/**
+ * The class to override quarkus-lucene class
+ */
+final class MMapDirectoryReplacementJDK {
+}
diff --git a/modules/raudikko/deps.edn b/modules/raudikko/deps.edn
@@ -1,5 +1,5 @@
 {:paths         ["target/raudikko.jar"]
- :deps          {org.apache.lucene/lucene-core {:mvn/version "9.3.0"}
+ :deps          {org.apache.lucene/lucene-core {:mvn/version "9.4.0"}
                  fi.evident.raudikko/raudikko  {:mvn/version "0.1.1"}}
  :deps/prep-lib {:ensure "target/raudikko.jar"
                  :alias  :build

diff --git a/modules/snowball-token-filters/deps.edn b/modules/snowball-token-filters/deps.edn
@@ -1,6 +1,6 @@
 {:paths         ["target/snowball-token-filters.jar"]
- :deps          {org.apache.lucene/lucene-core            {:mvn/version "9.3.0"}
-                 org.apache.lucene/lucene-analysis-common {:mvn/version "9.3.0"}}
+ :deps          {org.apache.lucene/lucene-core            {:mvn/version "9.4.0"}
+                 org.apache.lucene/lucene-analysis-common {:mvn/version "9.4.0"}}
  :deps/prep-lib {:ensure "target/snowball-token-filters.jar"
                  :alias  :build
                  :fn     jar}

diff --git a/modules/stempel/deps.edn b/modules/stempel/deps.edn
@@ -1,3 +1,3 @@
 {:paths         ["src"]
- :deps          {org.apache.lucene/lucene-core             {:mvn/version "9.3.0"}
-                 org.apache.lucene/lucene-analysis-stempel {:mvn/version "9.3.0"}}}
+ :deps          {org.apache.lucene/lucene-core             {:mvn/version "9.4.0"}
+                 org.apache.lucene/lucene-analysis-stempel {:mvn/version "9.4.0"}}}