IU-Libraries-Joint-Development · cjcolvar · Jun 10, 2025 · Jun 10, 2025 · Jun 10, 2025 · Jun 10, 2025
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,13 +7,15 @@ jobs:
   build:
     docker:
     # legacy needed for phantomjs
-    - image: circleci/ruby:2.3-node-browsers-legacy
+    - image: circleci/ruby:2.4-node-browsers-legacy
     - image: circleci/redis:4
     - image: ualbertalib/docker-fcrepo4:4.7
       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:6
+    - image: solr:9
       command: bin/solr -cloud -noprompt -f -p 8985
+      environment:
+        - SOLR_MODULES=analysis-extras,extraction
 
     # Specify service dependencies here if necessary
     # CircleCI maintains a library of pre-built images
@@ -63,8 +65,10 @@ jobs:
     - run:
         name: Install dependencies
         command: |
-          sudo npm install eslint -g
-          gem update --system
+          npm install node@12.22.12
+          export PATH=/home/circleci/repo/node_modules/node/bin:$PATH
+          npm install eslint@8.57.1
+          gem i rubygems-update -v '<3' && update_rubygems
           gem update bundler
           bundle config path $CIRCLE_WORKING_DIRECTORY/vendor/bundle
           bundle install
@@ -100,13 +104,13 @@ jobs:
           cd solr/config
           zip -1 -r solr_pumpkin_config.zip ./*
           curl -H "Content-type:application/octet-stream" --data-binary @solr_pumpkin_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=pumpkin"
-          curl -d action=CREATE -d name=hydra-test -d collection.configName=pumpkin -d numShards=1 http://localhost:8985/solr/admin/collections
-          ## Solr 7+ (API v2): curl -H 'Content-type: application/json' http://localhost:8985/api/collections/ -d '{create: {name: hydra-test, config: pumpkin, numShards: 1}}'
+          curl "http://localhost:8985/solr/admin/collections?action=CREATE&name=hydra-test&numShards=1&collection.configName=pumpkin"
 
     - run:
         name: Run Javascript tests
         command: |
-          eslint app/assets/javascripts/*.es6
+          export PATH=/home/circleci/repo/node_modules/node/bin:$PATH
+          npx eslint app/assets/javascripts/*.es6
           bundle exec rake spec:javascript
 
     - run:

diff --git a/.rubocop.yml b/.rubocop.yml
@@ -17,6 +17,7 @@ AllCops:
     # below added temporarily to hold back effects of version upgrade
     - 'app/views/search/*'
     - 'lib/tasks/*'
+    - 'lib/iu_dev_ops/reindex_solr_to_solr.rb'
 
 Rails:
   Enabled: true

diff --git a/.solr_wrapper b/.solr_wrapper
@@ -1,7 +1,9 @@
 # Place any default configuration for solr_wrapper here
-version: 6.2.0
+# version: 9.8
 port: 8983
 instance_dir: tmp/solr-development
+env:
+  SOLR_MODULES: analysis-extras,extraction
 collection:
   persist: true
   dir: solr/config/

diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ gem 'devise', '>= 4.6.0'
 gem 'devise-guests', '~> 0.3'
 gem 'hydra-role-management', '~> 0.2.0'
 gem 'iiif-presentation', git: 'https://github.com/iiif/osullivan', branch: 'development'
-gem 'ldap_groups_lookup', '~> 0.7.0'
+gem 'ldap_groups_lookup', '~> 0.11'
 gem 'pul_metadata_services', git: 'https://github.com/IU-Libraries-Joint-Development/pul_metadata_services.git', branch: :master
 gem 'rsolr', '~> 1.1.0'
 gem 'simple_form', '~> 3.2', '< 3.5'
@@ -57,7 +57,7 @@ gem 'active_fedora-noid', '~> 2.0.0'
 gem 'hydra-derivatives' # , github: 'projecthydra/hydra-derivatives', branch: 'master'
 gem 'hydra-pcdm' # , github: 'projecthydra-labs/hydra-pcdm', branch: 'master'
 gem 'hydra-works' # , github: 'projecthydra-labs/hydra-works', branch: 'master'
-gem 'net-http-persistent', '~> 2.9.4'
+gem 'net-http-persistent'
 gem 'rake', '~> 12.3.3'
 
 group :development, :test do
@@ -84,6 +84,8 @@ gem 'coveralls', require: false
 gem 'fcrepo_wrapper', '~> 0.7.0'
 gem 'solr_wrapper', '~> 0.19.0'
 
+gem 'crack', '< 0.4.6'
+
 group :development do
   gem 'capistrano', '3.4.0'
   gem 'capistrano-passenger'
@@ -101,7 +103,7 @@ group :test do
   gem "launchy"
   gem 'rspecproxies'
   gem "vcr", '~> 2.9'
-  gem "webmock", '~> 1.0', require: false
+  gem "webmock", '~> 2.3', require: false
 end
 
 group :production do

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -238,8 +238,8 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (>= 1.6.0, < 2)
-    crack (0.4.3)
-      safe_yaml (~> 1.0.0)
+    crack (0.4.5)
+      rexml
     crass (1.0.6)
     daemons (1.2.4)
     dalli (2.7.6)
@@ -320,7 +320,7 @@ GEM
       rubocop (~> 0.20)
     hamster (3.0.0)
       concurrent-ruby (~> 1.0)
-    hashdiff (0.3.0)
+    hashdiff (1.2.0)
     hashery (2.1.2)
     hashie (3.4.6)
     httmultiparty (0.3.16)
@@ -414,7 +414,7 @@ GEM
     kgio (2.11.0)
     launchy (2.4.3)
       addressable (~> 2.3)
-    ldap_groups_lookup (0.7.0)
+    ldap_groups_lookup (0.11.0)
       net-ldap
     ldp (0.6.4)
       deprecation
@@ -462,8 +462,9 @@ GEM
     multipart-post (2.0.0)
     mysql2 (0.4.10)
     nenv (0.3.0)
-    net-http-persistent (2.9.4)
-    net-ldap (0.16.2)
+    net-http-persistent (4.0.5)
+      connection_pool (~> 2.2)
+    net-ldap (0.19.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (3.2.0)
@@ -589,6 +590,7 @@ GEM
       actionpack (>= 4.2.0, < 6.0)
       railties (>= 4.2.0, < 6.0)
     retriable (2.1.0)
+    rexml (3.2.5)
     rsolr (1.1.2)
       builder (>= 2.1.2)
     rspec (3.5.0)
@@ -636,7 +638,6 @@ GEM
     ruby-rc4 (0.1.5)
     ruby_dep (1.3.1)
     rubyzip (1.3.0)
-    safe_yaml (1.0.4)
     sass (3.4.22)
     sass-rails (5.0.6)
       railties (>= 4.0.0, < 6)
@@ -739,7 +740,7 @@ GEM
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
-    webmock (1.24.6)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
@@ -765,6 +766,7 @@ DEPENDENCIES
   capybara
   coffee-rails (~> 4.1.0)
   coveralls
+  crack (< 0.4.6)
   curation_concerns!
   dalli
   devise (>= 4.6.0)
@@ -787,11 +789,11 @@ DEPENDENCIES
   jquery-ui-rails
   kgio
   launchy
-  ldap_groups_lookup (~> 0.7.0)
+  ldap_groups_lookup (~> 0.11)
   mimemagic (~> 0.3.7)
   modernizr-rails
   mysql2
-  net-http-persistent (~> 2.9.4)
+  net-http-persistent
   okcomputer
   omniauth-cas
   openseadragon
@@ -833,7 +835,7 @@ DEPENDENCIES
   uglifier (>= 1.3.0)
   vcr (~> 2.9)
   web-console (~> 2.0)
-  webmock (~> 1.0)
+  webmock (~> 2.3)
 
 RUBY VERSION
    ruby 2.3.1p112

diff --git a/app/jobs/save_structure_job.rb b/app/jobs/save_structure_job.rb
@@ -3,6 +3,8 @@ class SaveStructureJob < ActiveJob::Base
   queue_as :default
 
   # rubocop:disable Metrics/AbcSize
+  # rubocop:disable Metrics/CyclomaticComplexity
+  # rubocop:disable Metrics/MethodLength
   def perform(curation_concern, structure)
     return unless curation_concern.respond_to?(:logical_order)
     # Remove existing logical order object to avoid accumulation of fragments.
@@ -31,4 +33,6 @@ def perform(curation_concern, structure)
     raise
   end
   # rubocop:ensable Metrics/AbcSize
+  # rubocop:enable Metrics/CyclomaticComplexity
+  # rubocop:enable Metrics/MethodLength
 end
diff --git a/bin/ci_kakadu_install.sh b/bin/ci_kakadu_install.sh
@@ -1,8 +1,8 @@
 if [ ! -d "kakadu" ]; then
   mkdir ~/downloads
-  wget http://kakadusoftware.com/wp-content/uploads/KDU805_Demo_Apps_for_Linux-x86-64_200602.zip -O ~/downloads/kakadu.zip
+  wget http://kakadusoftware.com/wp-content/uploads/KDU841_Demo_Apps_for_Linux-x86-64_231117.zip -O ~/downloads/kakadu.zip
   unzip ~/downloads/kakadu.zip
-  mv KDU805_Demo_Apps_for_Linux-x86-64_200602 kakadu
+  mv KDU841_Demo_Apps_for_Linux-x86-64_231117 kakadu
 fi
 sudo cp kakadu/*.so /usr/lib
 sudo cp kakadu/* /usr/bin