From 4427ce191f671408e17aa8655fb17cc22bc93e85 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 1 May 2024 02:27:18 +0000 Subject: [PATCH 1/2] chore(deps): update apache lucene packages to v9.10.0 --- Source/Server/equellaserver/build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt index d2b8f77782..602f75c5e9 100644 --- a/Source/Server/equellaserver/build.sbt +++ b/Source/Server/equellaserver/build.sbt @@ -29,7 +29,7 @@ val jsoupVersion = "1.16.2" val prometheusVersion = "0.16.0" val sttpVersion = "2.3.0" val tikaVersion = "2.9.1" -val luceneVersion = "9.8.0" +val luceneVersion = "9.10.0" libraryDependencies ++= Seq( "io.circe" %% "circe-core", From 29be805e4dbf8e7b5791fb1922ebcf36160d4655 Mon Sep 17 00:00:00 2001 From: Penghai Date: Fri, 17 May 2024 16:36:16 +1000 Subject: [PATCH 2/2] chore: update boolean to Pruning for the signature of FieldComparatorSource This for the upgrade to Lucene v9.10.0. --- .../src/com/tle/web/workflow/tasks/TaskSortSection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Plugins/Core/com.equella.core/src/com/tle/web/workflow/tasks/TaskSortSection.java b/Source/Plugins/Core/com.equella.core/src/com/tle/web/workflow/tasks/TaskSortSection.java index 1fa84c2b8c..ae3cb0f793 100644 --- a/Source/Plugins/Core/com.equella.core/src/com/tle/web/workflow/tasks/TaskSortSection.java +++ b/Source/Plugins/Core/com.equella.core/src/com/tle/web/workflow/tasks/TaskSortSection.java @@ -34,6 +34,7 @@ import java.util.List; import org.apache.lucene.search.FieldComparator; import org.apache.lucene.search.FieldComparatorSource; +import org.apache.lucene.search.Pruning; @SuppressWarnings("nls") public class TaskSortSection extends AbstractSortOptionsSection { @@ -103,7 +104,7 @@ private static FieldComparatorSource createCurrentUserFirstComparator() { @Override public FieldComparator newComparator( - String fieldName, int numHits, boolean enableSkipping, boolean reversed) { + String fieldName, int numHits, Pruning pruning, boolean reversed) { return new CustomLuceneSortComparator(numHits, fieldName, CurrentUser.getUserID()); } };