Release 0.8.6: Solr 9.6 compatibility

- Migrated timeout logic to new pattern used from Solr 9.5 on, somewhat
  simplifying the code
- Removed unused `PageIndex` class
- Removed unused `HighlightTimeout` class

integration-tests/run.sh

@@ -4,7 +4,7 @@ SOLR_HOST="${SOLR_HOST:-localhost}"
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 SOLR7_VERSIONS="7.7 7.6 7.5"
 SOLR8_VERSIONS="8.11 8.10 8.9 8.8 8.7 8.6 8.5 8.4 8.3 8.2 8.1 8.0"
-SOLR9_VERSIONS="9.5 9.4 9.3 9.2 9.1 9.0"
+SOLR9_VERSIONS="9.6 9.5 9.4 9.3 9.2 9.1 9.0"
 SOLR78_PLUGIN_PATH=/tmp/solrocr-solr78
 
 wait_for_solr() {

pom.xml

@@ -6,7 +6,7 @@
 
   <groupId>de.digitalcollections</groupId>
   <artifactId>solr-ocrhighlighting</artifactId>
-  <version>0.8.5</version>
+  <version>0.8.6</version>
 
   <name>Solr OCR Highlighting Plugin</name>
   <description>
@@ -52,12 +52,12 @@
     <version.assertj>3.25.3</version.assertj>
     <version.assertj-json>1.2.0</version.assertj-json>
     <version.byteseek>2.0.3</version.byteseek>
-    <version.commons-text>1.11.0</version.commons-text>
+    <version.commons-text>1.12.0</version.commons-text>
     <version.junit>5.10.2</version.junit>
     <version.mockito>5.10.0</version.mockito>
     <version.slf4j>2.0.12</version.slf4j>
-    <version.solr>9.5.0</version.solr>
-    <version.lucene>9.9.2</version.lucene>
+    <version.solr>9.6.0</version.solr>
+    <version.lucene>9.10.0</version.lucene>
     <!-- DO NOT UPDATE THIS, this is the latest version that works with Java 8 -->
     <version.fmt-maven-plugin>2.9.1</version.fmt-maven-plugin>
     <version.maven-gpg-plugin>3.2.0</version.maven-gpg-plugin>
@@ -102,7 +102,7 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>32.1.3-jre</version>
+      <version>33.1.0-jre</version>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>

src/main/java/com/github/dbmdz/solrocr/solr/SolrOcrHighlighter.java

@@ -73,7 +73,7 @@ public NamedList<Object> doHighlighting(
 
     // Highlight OCR fields
     OcrHighlighter ocrHighlighter =
-        new OcrHighlighter(req.getSearcher(), req.getSchema().getIndexAnalyzer(), req.getParams());
+        new OcrHighlighter(req.getSearcher(), req.getSchema().getIndexAnalyzer(), req);
     OcrHighlightResult[] ocrSnippets =
         ocrHighlighter.highlightOcrFields(ocrFieldNames, query, docIDs, maxPassagesOcr, respHeader);