OAK-11042: bump elastic 8.15.0 / lucene 9.11.1

fabriziofortino · Aug 20, 2024 · e52d92d · e52d92d
1 parent 9b5c4f6
commit e52d92d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/oak-search-elastic/pom.xml b/oak-search-elastic/pom.xml
@@ -33,8 +33,8 @@
   <description>Oak Elasticsearch integration subproject</description>
 
   <properties>
-    <elasticsearch.java.client.version>8.13.2</elasticsearch.java.client.version>
-    <lucene.version>9.10.0</lucene.version>
+    <elasticsearch.java.client.version>8.15.0</elasticsearch.java.client.version>
+    <lucene.version>9.11.1</lucene.version>
   </properties>
 
   <build>

diff --git a/...in/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java b/...in/java/org/apache/jackrabbit/oak/plugins/index/elastic/util/TermQueryBuilderFactory.java
@@ -70,27 +70,27 @@ public static Query newDepthQuery(String path, FulltextIndexPlanner.PlanResult p
         int depth = PathUtils.getDepth(path) + planResult.getParentDepth() + 1;
         return Query.of(q -> q.term(t -> t.field(PATH_DEPTH).value(v->v.longValue(depth))));
     }
-    
+
     private static <R> Query newRangeQuery(String field, R first, R last, boolean firstIncluding,
-            boolean lastIncluding) {
+                                           boolean lastIncluding) {
 
-        return Query.of(fn -> fn.range(fnr -> {
+        return Query.of(fn -> fn.range(fnr -> fnr.date(date -> {
             if (first != null) {
                 if (firstIncluding) {
-                    fnr.gte(JsonData.of(first));
+                    date.gte(first.toString());
                 } else {
-                    fnr.gt(JsonData.of(first));
+                    date.gt(first.toString());
                 }
             }
             if (last != null) {
                 if (lastIncluding) {
-                    fnr.lte(JsonData.of(last));
+                    date.lte(last.toString());
                 } else {
-                    fnr.lt(JsonData.of(last));
+                    date.lt(last.toString());
                 }
             }
-            return fnr.field(field);
-        }));
+            return date.field(field);
+        })));
     }
 
     private static <R> FieldValue toFieldValue(R value) {

diff --git a/...stic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java b/...stic/src/test/java/org/apache/jackrabbit/oak/plugins/index/elastic/ElasticTestServer.java
@@ -49,9 +49,9 @@ public class ElasticTestServer implements AutoCloseable {
             "8.7.1.0", "80c8d34334b0cf4def79835ea6dab78b59ba9ee54c8f5f3cba0bde53123d7820",
             "8.10.4.0", "b2ae8faf1e272319594b4d47a72580fa4f61a5c11cbc8d3f13453fd34b153441",
             "8.11.0.0", "8d4d80b850c4da4da6dfe2d675b2e2355d2014307f8bdc54cc1b34323c81c7ae",
-            "8.11.1.0", "a00a920d4bc29f0deacde7c2ef3d3f70692b00b62bf7fb82b0fe18eeb1dafee9",
             "8.11.3.0", "1f14b496baf973fb5c64e77fc458d9814dd6905170d7b15350f9f1a009824f41",
-            "8.13.2.0", "586f553b109266d7996265f3f34a20914b569d494b49da2c0534428770e551f0");
+            "8.13.2.0", "586f553b109266d7996265f3f34a20914b569d494b49da2c0534428770e551f0",
+            "8.15.0.0", "6cbb54d68d654a3476df0b730856cfa3194bce5c6e1050a35e7a86ffec8a3e20");
 
     private static final ElasticTestServer SERVER = new ElasticTestServer();
     private static volatile ElasticsearchContainer CONTAINER;