Migrated to Solr 9.10.1 and Lucene 9.12.3

1 files changed, 43 insertions, 35 deletions

diff --git a/ivy.xml b/ivy.xml
index 558394ab3..25cd0a882 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -16,7 +16,9 @@
       <dependency org="com.cybozu.labs" name="langdetect" rev="1.1-20120112" conf="compile->master"/>
       <dependency org="com.drewnoakes" name="metadata-extractor" rev="2.20.0"  />
       <dependency org="com.fasterxml.jackson.core" name="jackson-databind" rev="2.22.1"/>
+      <dependency org="com.fasterxml.jackson.dataformat" name="jackson-dataformat-cbor" rev="2.22.1"/>
       <dependency org="com.github.ben-manes.caffeine" name="caffeine" rev="3.2.4"/>
+      <dependency org="com.carrotsearch" name="hppc" rev="0.10.0"/>
       <dependency org="com.google.guava" name="guava" rev="33.6.0-jre" conf="compile->master"/>
       <dependency org="com.google.guava" name="failureaccess" rev="1.0.3" />
       <dependency org="com.ibm.icu" name="icu4j" rev="78.3"/>
@@ -53,19 +55,26 @@
       <dependency org="org.apache.httpcomponents" name="httpmime" rev="4.5.14"/>
       <dependency org="org.apache.james" name="apache-mime4j-core" rev="0.8.14" conf="compile->master"/>
       <dependency org="org.apache.james" name="apache-mime4j-dom" rev="0.8.14" conf="compile->master"/>
-      <dependency org="org.apache.lucene" name="lucene-analysis-common" rev="9.0.0"/>
-      <dependency org="org.apache.lucene" name="lucene-backward-codecs" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-classification" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-codecs" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-grouping" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-highlighter" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-join" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-memory" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-misc" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-queries" rev="9.0.0" />
-      <dependency org="org.apache.lucene" name="lucene-queryparser" rev="9.0.0" conf="compile->master"/>
-      <dependency org="org.apache.lucene" name="lucene-spatial-extras" rev="9.0.0" conf="compile->master"/>
-      <dependency org="org.apache.lucene" name="lucene-suggest" rev="9.0.0"/>
+      <dependency org="jakarta.ws.rs" name="jakarta.ws.rs-api" rev="3.1.0" conf="compile->master"/>
+      <!-- Solr 9.10 initializes its Jersey API resources even in embedded mode. -->
+      <dependency org="org.glassfish.jersey.core" name="jersey-common" rev="3.1.11"/>
+      <dependency org="org.glassfish.jersey.core" name="jersey-server" rev="3.1.11"/>
+      <dependency org="org.glassfish.jersey.inject" name="jersey-hk2" rev="3.1.11"/>
+      <dependency org="org.glassfish.jersey.media" name="jersey-media-json-jackson" rev="3.1.11"/>
+      <dependency org="org.apache.lucene" name="lucene-analysis-common" rev="9.12.3"/>
+      <dependency org="org.apache.lucene" name="lucene-backward-codecs" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-classification" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-codecs" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-expressions" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-grouping" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-highlighter" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-join" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-memory" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-misc" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-queries" rev="9.12.3" />
+      <dependency org="org.apache.lucene" name="lucene-queryparser" rev="9.12.3" conf="compile->master"/>
+      <dependency org="org.apache.lucene" name="lucene-spatial-extras" rev="9.12.3" conf="compile->master"/>
+      <dependency org="org.apache.lucene" name="lucene-suggest" rev="9.12.3"/>
       
       <dependency org="org.apache.pdfbox" name="pdfbox" rev="3.0.7" />
       <dependency org="org.apache.poi" name="poi" rev="5.5.1" />
@@ -73,22 +82,25 @@
       
       <!--
         Solr is embedded and its Jetty-backed runner and HTTP/2 clients are not used directly by YaCy.
-        Keep Solr's Jetty 9 runtime family out of the embedded-server classpath so Jetty can
+        Keep Solr's Jetty 10 runtime family out of the embedded-server classpath so Jetty can
         be migrated independently. The master configuration already omits transitives; the
         explicit excludes preserve that boundary if the configuration mapping changes later.
       -->
-      <dependency org="org.apache.solr" name="solr-core" rev="9.0.0" conf="solr9-bridge->master">
+      <dependency org="org.apache.solr" name="solr-core" rev="9.10.1" conf="solr9-bridge->master">
         <exclude org="org.eclipse.jetty" module="*"/>
         <exclude org="org.eclipse.jetty.http2" module="*"/>
       </dependency>
-      <dependency org="org.apache.solr" name="solr-scripting" rev="9.0.0" conf="solr9-bridge->master">
+      <dependency org="org.apache.solr" name="solr-api" rev="9.10.1" conf="solr9-bridge->master"/>
+      <dependency org="org.apache.solr" name="solr-scripting" rev="9.10.1" conf="solr9-bridge->master">
         <exclude org="org.eclipse.jetty" module="*"/>
         <exclude org="org.eclipse.jetty.http2" module="*"/>
       </dependency>
-      <dependency org="org.apache.solr" name="solr-solrj" rev="9.0.0" conf="solr9-bridge->master">
+      <dependency org="org.apache.solr" name="solr-solrj" rev="9.10.1" conf="solr9-bridge->master">
         <exclude org="org.eclipse.jetty" module="*"/>
         <exclude org="org.eclipse.jetty.http2" module="*"/>
       </dependency>
+      <dependency org="org.apache.solr" name="solr-solrj-streaming" rev="9.10.1" conf="solr9-bridge->master"/>
+      <dependency org="org.apache.solr" name="solr-solrj-zookeeper" rev="9.10.1" conf="solr9-bridge->master"/>
       <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.9.5" conf="compile->master" />
       <dependency org="org.bitlet" name="weupnp" rev="0.1.4"  />
       <dependency org="org.bouncycastle" name="bcmail-jdk18on" rev="1.84" />
@@ -96,7 +108,7 @@
       <!-- Jetty 12 Core and EE8 form the public embedded-server runtime. -->
       <dependency org="org.eclipse.jetty" name="jetty-http" rev="12.0.37" conf="compile->default"/>
       <dependency org="org.eclipse.jetty" name="jetty-io" rev="12.0.37" conf="compile->default"/>
-      <dependency org="org.eclipse.jetty" name="jetty-client" rev="9.4.58.v20250814" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty" name="jetty-client" rev="10.0.26" conf="solr9-bridge->master"/>
       <dependency org="org.eclipse.jetty" name="jetty-proxy" rev="12.0.37" conf="compile->default"/>
       <dependency org="org.eclipse.jetty" name="jetty-security" rev="12.0.37" conf="compile->default"/>
       <dependency org="org.eclipse.jetty" name="jetty-server" rev="12.0.37" conf="compile->default"/>
@@ -116,19 +128,20 @@
       <dependency org="org.eclipse.jetty.ee8" name="jetty-ee8-webapp" rev="12.0.37" conf="compile->default">
         <exclude org="org.eclipse.jetty.toolchain" module="jetty-servlet-api"/>
       </dependency>
-      <!-- Private Solr bridge inputs remain on Jetty 9. -->
-      <dependency org="org.eclipse.jetty" name="jetty-http" rev="9.4.58.v20250814" conf="solr9-bridge->master"/>
-      <dependency org="org.eclipse.jetty" name="jetty-io" rev="9.4.58.v20250814" conf="solr9-bridge->master"/>
-      <dependency org="org.eclipse.jetty" name="jetty-util" rev="9.4.58.v20250814" conf="solr9-bridge->master" />
+      <!-- Private Solr bridge inputs remain on Jetty 10. -->
+      <dependency org="org.eclipse.jetty" name="jetty-alpn-java-client" rev="10.0.26" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty" name="jetty-http" rev="10.0.26" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty" name="jetty-io" rev="10.0.26" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty" name="jetty-util" rev="10.0.26" conf="solr9-bridge->master" />
       <!--
-        Temporary Solr 9.0 runtime bridge: CoreContainer eagerly constructs an
+        Temporary Solr 9.10 runtime bridge: CoreContainer eagerly constructs an
         Http2SolrClient for its shard/update handlers even in standalone mode.
-        YaCy source must not use these clients. Remove this Jetty 9 island only
-        after the relocated Solr 9.0 bridge replaces these unrelocated jars.
+        YaCy source must not use these clients. Remove this Jetty 10 island only
+        after the relocated Solr 9.10 bridge replaces these unrelocated jars.
       -->
-      <dependency org="org.eclipse.jetty.http2" name="http2-client" rev="9.4.58.v20250814" conf="solr9-bridge->master"/>
-      <dependency org="org.eclipse.jetty.http2" name="http2-common" rev="9.4.58.v20250814" conf="solr9-bridge->master"/>
-      <dependency org="org.eclipse.jetty.http2" name="http2-http-client-transport" rev="9.4.58.v20250814" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty.http2" name="http2-client" rev="10.0.26" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty.http2" name="http2-common" rev="10.0.26" conf="solr9-bridge->master"/>
+      <dependency org="org.eclipse.jetty.http2" name="http2-http-client-transport" rev="10.0.26" conf="solr9-bridge->master"/>
       <dependency org="org.jsoup" name="jsoup" rev="1.22.2"  />
       <dependency org="org.jwat" name="jwat-warc" rev="1.2.1">
         <exclude module="bcprov-jdk15to18" />
@@ -136,24 +149,19 @@
       <dependency org="org.locationtech.spatial4j" name="spatial4j" rev="0.8"/>
       <dependency org="org.rrd4j" name="rrd4j" rev="3.10"/>
       <!--
-        YaCy and the public Jetty runtime use SLF4J 2 with JUL as their single
-        provider. Solr 9.0.0 directly references the removed SLF4J 1.7
-        StaticLoggerBinder API, so its API and JUL binding are relocated into
-        the private Solr bridge instead of being exposed on this classpath.
+        YaCy, Jetty and Solr 9.10 use SLF4J 2 with JUL as their single provider.
       -->
       <dependency org="org.slf4j" name="slf4j-api" rev="2.0.17" conf="compile->master" force="true"/>
       <dependency org="org.slf4j" name="jcl-over-slf4j" rev="2.0.17" conf="compile->master"/>
       <dependency org="org.slf4j" name="log4j-over-slf4j" rev="2.0.17" conf="compile->master"/>
       <dependency org="org.slf4j" name="slf4j-jdk14" rev="2.0.17" conf="compile->master"/>
-      <dependency org="org.slf4j" name="slf4j-api" rev="1.7.36" conf="solr9-bridge->master"/>
-      <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.7.36" conf="solr9-bridge->master"/>
       <!-- This does not match langdetect.jar from pre-ivy -->
       <dependency org="org.tukaani" name="xz" rev="1.12"/>
       <dependency org="oro" name="oro" rev="2.0.8"/>
 
       <dependency org="junit" name="junit" rev="4.13.2" conf="test->default"/>
       <dependency org="org.hamcrest" name="hamcrest-core" rev="3.0" conf="test->default"/>
-      <!-- Build-time bytecode relocation for the private Solr 9.0 Jetty client island. -->
+      <!-- Build-time bytecode relocation for the private Solr 9.10 Jetty client island. -->
       <dependency org="org.ow2.asm" name="asm" rev="9.9" conf="solr9-bridge-tool->master"/>
       <dependency org="org.ow2.asm" name="asm-commons" rev="9.9" conf="solr9-bridge-tool->master"/>
       <dependency org="com.github.luben" name="zstd-jni" rev="1.5.7-11"></dependency>