Update Solr to latest release 10

.gitignore

@@ -14,6 +14,8 @@
 /downloads
 /Gruntfile.local.js
 /solr/vendor
+# Generated at startup by solr.sh (see solr.sh for details)
+/solr/vufind/biblio/lib/
 /themes/minktest
 /vendor
 ChangeLog

build.xml

@@ -62,7 +62,7 @@
   <property name="default_test_retry_count" value="5" /><!-- default retry count for Mink tests; increase when tests fail on slow systems -->
   <property name="solr_startup_sleep" value="0" />
   <property name="solr_additional_jvm_options" value="-Dlog4j2.formatMsgNoLookups=true" />
-  <property name="solr_version" value="9.8.1" />
+  <property name="solr_version" value="10.0.0" />
   <property name="solr_port" value="8983" />
   <property name="skip_phpdoc" value="false" />
   <property name="phpdoc_version" value="3.10.0" />

solr.sh

@@ -97,4 +97,33 @@ then
 fi
 
 export SOLR_LOGS_DIR=$SOLR_LOGS_DIR
-"$SOLR_BIN/solr" "$1" ${SOLR_ADDITIONAL_START_OPTIONS} --port "$SOLR_PORT" --solr-home "$SOLR_HOME" -m "$SOLR_HEAP" --user-managed --jvm-opts "-Ddisable.configEdit=true -Dsolr.log=$SOLR_LOGS_DIR -Dsolr.config.lib.enabled=true $SOLR_ADDITIONAL_JVM_OPTIONS"
+
+# The biblio core needs several jars on its classpath. Solr 10 no longer
+# supports <lib/> entries in solrconfig.xml, and the core lib/ directory only
+# picks up jar files directly inside it (not subdirectories). We therefore
+# (re)generate the lib/ symlinks on every start, from:
+#   - the stable jars checked into the VuFind repo, and
+#   - the "analysis-extras" module (e.g. ICU4J for the browse normalizers).
+# Every symlink in lib/ is regenerated, so the directory is a pure runtime
+# artifact (git-ignored) and self-heals across Solr upgrades.
+BIBLIO_LIB="$SOLR_HOME/biblio/lib"
+mkdir -p "$BIBLIO_LIB"
+for link in "$BIBLIO_LIB"/*
+do
+  [ -L "$link" ] && rm -f "$link"
+done
+for jar in "$SOLR_HOME/jars"/*.jar \
+           "$VUFIND_HOME/import"/solrmarc_core_*.jar \
+           "$VUFIND_HOME/import/lib"/marc4j-*.jar
+do
+  [ -e "$jar" ] && ln -sf "$jar" "$BIBLIO_LIB/"
+done
+if [ -d "$VUFIND_HOME/solr/vendor/modules/analysis-extras/lib" ]
+then
+  for jar in "$VUFIND_HOME/solr/vendor/modules/analysis-extras/lib"/*.jar
+  do
+    ln -sf "$jar" "$BIBLIO_LIB/"
+  done
+fi
+
+"$SOLR_BIN/solr" "$1" ${SOLR_ADDITIONAL_START_OPTIONS} --port "$SOLR_PORT" --solr-home "$SOLR_HOME" -m "$SOLR_HEAP" --user-managed --jvm-opts "-Ddisable.configEdit=true -Dsolr.log=$SOLR_LOGS_DIR $SOLR_ADDITIONAL_JVM_OPTIONS"

solr/vufind/authority/conf/solrconfig.xml

@@ -32,7 +32,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>9.11</luceneMatchVersion>
+  <luceneMatchVersion>10.3.2</luceneMatchVersion>
 
   <!-- Use the classic schema style by default for VuFind -->
   <schemaFactory class="ClassicIndexSchemaFactory"/>

solr/vufind/biblio/conf/solrconfig.xml

@@ -32,7 +32,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>9.11</luceneMatchVersion>
+  <luceneMatchVersion>10.3.2</luceneMatchVersion>
 
   <!-- Use the classic schema style by default for VuFind -->
   <schemaFactory class="ClassicIndexSchemaFactory"/>
@@ -42,11 +42,6 @@
        If replication is in use, this should match the replication configuration. -->
   <dataDir>${solr.solr.home:./solr}/biblio</dataDir>
 
-  <lib dir="../../../import/lib" regex="marc4j.*\.jar" />
-  <lib dir="../../../import" regex="solrmarc_core.*\.jar" />
-  <lib dir="../../vendor/modules/analysis-extras/lib" regex=".*\.jar" />
-  <lib dir="../jars" regex=".*\.jar" />
-
   <indexConfig>
 
     <useCompoundFile>false</useCompoundFile>

solr/vufind/reserves/conf/solrconfig.xml

@@ -32,7 +32,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>9.11</luceneMatchVersion>
+  <luceneMatchVersion>10.3.2</luceneMatchVersion>
 
   <!-- Use the classic schema style by default for VuFind -->
   <schemaFactory class="ClassicIndexSchemaFactory"/>

solr/vufind/solr.xml

@@ -32,13 +32,8 @@
 
     <str name="host">${host:}</str>
     <int name="hostPort">${jetty.port:8983}</int>
-    <str name="hostContext">${hostContext:solr}</str>
-
-    <bool name="genericCoreNodeNames">${genericCoreNodeNames:true}</bool>
 
     <int name="zkClientTimeout">${zkClientTimeout:30000}</int>
-    <int name="distribUpdateSoTimeout">${distribUpdateSoTimeout:600000}</int>
-    <int name="distribUpdateConnTimeout">${distribUpdateConnTimeout:60000}</int>
 
   </solrcloud>
 

solr/vufind/website/conf/solrconfig.xml

@@ -32,7 +32,7 @@
        that you fully re-index after changing this setting as it can
        affect both how text is indexed and queried.
     -->
-  <luceneMatchVersion>9.11</luceneMatchVersion>
+  <luceneMatchVersion>10.3.2</luceneMatchVersion>
 
   <!-- Use the classic schema style by default for VuFind -->
   <schemaFactory class="ClassicIndexSchemaFactory"/>