Test with Solr 9

.solr_wrapper

@@ -3,4 +3,4 @@ collection:
   dir: config/solr_configs/
   name: blacklight-core
 port: 8983
-version: 8.11.1
+version: 9.6.1

config/solr_configs/schema.xml

@@ -678,11 +678,11 @@
     <fieldType name="string_punct_stop" class="solr.TextField" omitNorms="true">
       <analyzer type="index">
         <tokenizer class="solr.KeywordTokenizerFactory" />
-        <filter class="solr.ICUNormalizer2FilterFactory" name="nfkc" mode="compose" />
+        <filter class="solr.ICUNormalizer2FilterFactory" mode="compose" />
       </analyzer>
       <analyzer type="query">
         <tokenizer class="solr.KeywordTokenizerFactory" />
-        <filter class="solr.ICUNormalizer2FilterFactory" name="nfkc" mode="compose" />
+        <filter class="solr.ICUNormalizer2FilterFactory" mode="compose" />
         <!-- removing punctuation for Lucene query parser issues -->
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords_punctuation.txt" />
       </analyzer>

config/solr_configs/solrconfig.xml

@@ -47,8 +47,9 @@
 
   <!-- NOTE:  these 2 lib dirs are here for testing only and do NOT go in the prod file -->
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
-  <lib dir="${solr.install.dir:../../../..}/contrib" regex="CJKFilterUtils-v3.0.jar" />
+  <lib dir="${solr.install.dir:../../../..}/contrib" regex="CJKFilterUtils-v4.0.jar" />
 
   <dataDir>${solr.data.dir:}</dataDir>
 

docker-compose.yml

@@ -1,9 +1,9 @@
 services:
   solr:
-    image: "solr:${SOLR_VERSION:-8.11.1}"
+    image: "solr:${SOLR_VERSION:-9.6.1}"
     volumes:
       - $PWD/config/solr_configs:/opt/solr/conf
-      - $PWD/config/solr_configs/CJKFilterUtils-v3.0.jar:/opt/solr/contrib/CJKFilterUtils-v3.0.jar
+      - $PWD/config/solr_configs/CJKFilterUtils-v4.0.jar:/opt/solr/contrib/CJKFilterUtils-v4.0.jar
     ports:
       - "${SOLR_PORT:-8983}:8983"
     entrypoint:

lib/tasks/searchworks.rake

@@ -22,15 +22,17 @@ namespace :searchworks do
   desc 'Copy necessary solr dependencies to local solr instance'
   task copy_solr_dependencies: [:environment] do
     copy_task = lambda do
+      FileUtils.mkdir_p(File.join(SolrWrapper.instance.instance_dir, 'contrib'))
+
       FileUtils.cp(
-        Rails.root.join('config', 'solr_configs', 'CJKFilterUtils-v3.0.jar'),
+        Rails.root.join('config', 'solr_configs', 'CJKFilterUtils-v4.0.jar'),
         File.join(SolrWrapper.instance.instance_dir, 'contrib')
       )
     end
 
-    begin
+    if File.directory?(File.join(SolrWrapper.instance.instance_dir))
       copy_task.call
-    rescue Errno::ENOENT # solr instance_dir does not exist
+    else
       SolrWrapper.wrap do
         copy_task.call
       end