Merge pull request #3806 from projectblacklight/solr-10

Configuration for Solr 10, Drop solr 8 support

Author: seanaery

.github/matrix.json

@@ -42,8 +42,8 @@
     {
       "ruby": "3.2",
       "rails_version": "8.0.4",
-      "solr_version": "8.11.2",
-      "additional_name": "| Solr 8.11.2 and Ruby 3.2"
+      "solr_version": "9",
+      "additional_name": "| Solr 9 and Ruby 3.2"
     },
     {
       "ruby": "3.4",

.github/workflows/test.yml

@@ -31,7 +31,7 @@ jobs:
       matrix: ${{fromJson(needs.set_matrix.outputs.matrix)}}
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
-      SOLR_VERSION: ${{ matrix.solr_version || '9' }}
+      SOLR_VERSION: ${{ matrix.solr_version || 'latest' }}
       VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
       BOOTSTRAP_VERSION: ${{ matrix.bootstrap_version }}
       BLACKLIGHT_API_TEST: ${{ matrix.api }}

lib/generators/blacklight/templates/solr/conf/schema.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<schema name="Hydra" version="1.5">
+<schema name="Blacklight-default" version="1.6">
   <!-- NOTE: various comments and unused configuration possibilities have been purged
      from this file.  Please refer to http://wiki.apache.org/solr/SchemaXml,
      as well as the default schema file included with Solr -->
@@ -309,7 +309,7 @@
   <types>
     <fieldType name="string" class="solr.StrField" sortMissingLast="true" />
     <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" />
-    <fieldType name="rand" class="solr.RandomSortField" omitNorms="true" />
+    <fieldType name="rand" class="solr.RandomSortField" />
 
     <!-- Default numeric field types.  -->
     <fieldType name="int" class="solr.IntPointField" docValues="true" />
@@ -364,7 +364,7 @@
     <fieldType name="bbox" class="solr.BBoxField" geo="true" distanceUnits="kilometers" numberType="_bbox_coord" storeSubFields="false" />
     <fieldType name="_bbox_coord" class="solr.DoublePointField" docValues="true" stored="false" />
 
-    <fieldType name="text" class="solr.TextField" omitNorms="false">
+    <fieldType name="text" class="solr.TextField">
       <analyzer>
         <tokenizer class="solr.ICUTokenizerFactory" />
         <filter class="solr.ICUFoldingFilterFactory" />  <!-- NFKC, case folding, diacritics removed -->
@@ -381,7 +381,7 @@
     </fieldType>
 
     <!-- single token analyzed text, for sorting.  Punctuation is significant. -->
-    <fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
+    <fieldtype name="alphaSort" class="solr.TextField" sortMissingLast="true">
       <analyzer>
         <tokenizer class="solr.KeywordTokenizerFactory" />
         <filter class="solr.ICUFoldingFilterFactory" />

lib/generators/blacklight/templates/solr/conf/solrconfig.xml

@@ -4,9 +4,7 @@
      from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
      as well as the default solrconfig file included with Solr -->
 
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-
-  <luceneMatchVersion>6.1.0</luceneMatchVersion>
+  <luceneMatchVersion>9.0.0</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}" />
 
@@ -16,17 +14,11 @@
     </updateLog>
   </updateHandler>
 
-  <!-- solr lib dirs, which are needed for Solr 8 compatibility but ignored in solr 9.8 and above -->
   <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.data.dir:}</dataDir>
 
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <!-- default values for query parameters can be specified, these
-         will be overridden by parameters in the request
-      -->
+  <requestHandler name="/select" class="solr.SearchHandler">
      <lst name="defaults">
        <str name="defType">edismax</str>
        <str name="echoParams">explicit</str>