DRAFT [IUS-2809] update circleci config solr version, add solr reindexing

.circleci/config.yml

@@ -28,7 +28,9 @@ jobs:
       - image: ghcr.io/samvera/fcrepo4:4.7.5
         environment:
           CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
-      - image: solr:7
+      - image: solr:9
+        environment:
+          - SOLR_MODULES=analysis-extras,extraction
         command: bin/solr -cloud -noprompt -f -p 8985
 
     # Specify service dependencies here if necessary
@@ -113,7 +115,7 @@ jobs:
             cd solr/config
             zip -1 -r solr_hyrax_config.zip ./*
             curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
-            curl -H 'Content-type: application/json' http://localhost:8985/v2/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'
+            curl "http://localhost:8985/solr/admin/collections?action=CREATE&name=hydra-test&numShards=1&collection.configName=hyrax"
 
       - run:
           name: Run rspec in parallel

.solr_wrapper

@@ -0,0 +1,3 @@
+# Place any default configuration for solr_wrapper here
+version: 9.10.0
+# port: 8983

.solr_wrapper.yml

@@ -2,7 +2,7 @@
 # config in settings.yml, etc. These defaults are primarily for no-argument
 # development invocation. See config/solr_wrapper_test.yml for test values.
 # Currently, deepblue is not compatible with Solr 8.0+
-version: 7.7.2
+version: 9.10.0
 port: 8983
 instance_dir: tmp/solr-development
 collection:

Gemfile

@@ -139,7 +139,7 @@ group :development, :test do
   gem 'shoulda-matchers', '~> 3.1'
   gem 'simplecov'
   gem 'coveralls_reborn'
-  gem 'solr_wrapper', '~> 2.1.0'
+  gem 'solr_wrapper'#, '~> 2.1.0'
 end
 
 gem 'willow_sword', github: 'notch8/willow_sword', ref: '0a669d7'

Gemfile.lock

@@ -270,6 +270,7 @@ GEM
     diff-lcs (1.5.1)
     docile (1.4.1)
     docopt (0.5.0)
+    domain_name (0.6.20240107)
     dotenv (2.8.1)
     dotenv-rails (2.8.1)
       dotenv (= 2.8.1)
@@ -365,6 +366,9 @@ GEM
     fcrepo_wrapper (0.9.0)
       ruby-progressbar
     ffi (1.17.0)
+    ffi-compiler (1.3.2)
+      ffi (>= 1.15.5)
+      rake
     flipflop (2.6.0)
       activesupport (>= 4.0)
     flot-rails (0.0.7)
@@ -403,6 +407,14 @@ GEM
     hashie (3.6.0)
     hiredis (0.6.3)
     htmlentities (4.3.4)
+    http (5.3.1)
+      addressable (~> 2.8)
+      http-cookie (~> 1.0)
+      http-form_data (~> 2.2)
+      llhttp-ffi (~> 0.5.0)
+    http-cookie (1.1.0)
+      domain_name (~> 0.5)
+    http-form_data (2.3.0)
     http_logger (0.7.0)
     httpclient (2.8.3)
     hydra-access-controls (10.7.0)
@@ -627,6 +639,9 @@ GEM
     listen (3.0.8)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+    llhttp-ffi (0.5.1)
+      ffi-compiler (~> 1.0)
+      rake (~> 13.0)
     logger (1.6.2)
     loofah (2.19.1)
       crass (~> 1.0.2)
@@ -649,6 +664,7 @@ GEM
     mini_magick (4.13.2)
     mini_mime (1.1.5)
     mini_portile2 (2.8.8)
+    minitar (0.12.1)
     minitest (5.25.2)
     mono_logger (1.1.2)
     multi_json (1.15.0)
@@ -995,11 +1011,11 @@ GEM
     snaky_hash (2.0.1)
       hashie
       version_gem (~> 1.1, >= 1.1.1)
-    solr_wrapper (2.1.0)
-      faraday
+    solr_wrapper (4.0.2)
+      http
+      minitar
       retriable
       ruby-progressbar
-      rubyzip
     solrizer (4.1.0)
       activesupport
       nokogiri
@@ -1166,7 +1182,7 @@ DEPENDENCIES
   shoulda-matchers (~> 3.1)
   simplecov
   sinatra (~> 3.0.6)
-  solr_wrapper (~> 2.1.0)
+  solr_wrapper
   spring
   spring-watcher-listen (~> 2.0.0)
   sprockets (= 3.7.2)