🎁 Hyrax 5 upgrade

.env

@@ -1,5 +1,6 @@
 CHROME_HOSTNAME=chrome
 COMPOSE_DOCKER_CLI_BUILD=1
+DATABASE_CLEANER_ALLOW_REMOTE_DATABASE_URL=true
 DB_ADAPTER=postgresql
 DB_HOST=db
 DB_HOST=db
@@ -13,25 +14,28 @@ FCREPO_BASE_PATH=/hykudemo
 FCREPO_HOST=fcrepo
 FCREPO_PORT=8080
 FCREPO_REST_PATH=rest
+HYRAX_ACTIVE_JOB_QUEUE=good_job
+HYRAX_FITS_PATH=/app/fits/fits.sh
 INITIAL_ADMIN_EMAIL=admin@example.com
 INITIAL_ADMIN_PASSWORD=testing123
-JAVA_OPTS=-Xmx4g -Xms1g
 IN_DOCKER=true
+JAVA_OPTS=
+JAVA_OPTS=-Xmx4g -Xms1g
 LD_LIBRARY_PATH=/opt/fits/tools/mediainfo/linux
+NEGATIVE_CAPTCHA_SECRET=default-value-change-me
 PASSENGER_APP_ENV=development
 RAILS_LOG_TO_STDOUT=true
 REDIS_HOST=redis
 SECRET_KEY_BASE=asdf
-HYRAX_ACTIVE_JOB_QUEUE=sidekiq
-HYRAX_FITS_PATH=/app/fits/fits.sh
-NEGATIVE_CAPTCHA_SECRET=default-value-change-me
 SOLR_ADMIN_PASSWORD=SolrRocks
 SOLR_ADMIN_USER=solr
 SOLR_COLLECTION_NAME=hydra-development
 SOLR_CONFIGSET_NAME=hyku
 SOLR_HOST=solr
 SOLR_PORT=8983
 SOLR_URL=http://solr:SolrRocks@solr:8983/solr/
+TB_RSPEC_FORMATTER=progress
+TB_RSPEC_OPTIONS="--format RspecJunitFormatter --out rspec.xml"
 
 # Comment out these 5 for single tenancy / Uncomment for multi
 HYKU_ADMIN_HOST=hyku.test

.rubocop.yml

@@ -127,3 +127,7 @@ Metrics/BlockLength:
     - 'spec/**/*.rb'
     - 'lib/tasks/*.rake'
     - 'app/controllers/catalog_controller.rb'
+
+RSpec/FilePath:
+  Exclude:
+    - 'spec/config/application_spec.rb'

Dockerfile

@@ -1,5 +1,4 @@
-ARG HYRAX_IMAGE_VERSION=hyrax-v4.0.0.rc1
-ARG RUBY_VERSION=2.7.7
+ARG HYRAX_IMAGE_VERSION=hyrax-v5.0.0.rc2
 FROM ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_IMAGE_VERSION as hyku-base
 
 USER root

Gemfile

@@ -4,19 +4,22 @@
 source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 5.2.5'
+gem 'rails', '~> 6.0'
 
-gem 'active-fedora', '>= 11.1.4'
+gem 'active-fedora', '~> 14.0'
 gem 'active_elastic_job', github: 'active-elastic-job/active-elastic-job', ref: 'ec51c5d9dedc4a1b47f2db41f26d5fceb251e979', group: %i[aws]
 gem 'activerecord-nulldb-adapter'
 gem 'addressable', '2.8.1' # remove once https://github.com/postrank-labs/postrank-uri/issues/49 is fixed
-gem 'apartment'
+gem 'apartment', github: 'scientist-softserv/apartment', branch: 'development'
 gem 'aws-sdk-sqs', group: %i[aws]
-gem 'blacklight', '~> 6.7'
-gem 'blacklight_oai_provider', '~> 6.1', '>= 6.1.1'
+gem 'blacklight', '~> 7.29'
+gem 'blacklight_advanced_search'
+gem 'blacklight_oai_provider', '~> 7.0'
+gem 'blacklight_range_limit'
 gem 'bolognese', '>= 1.9.10'
+gem 'bootstrap', '~> 4.6'
 gem 'bootstrap-datepicker-rails'
-gem 'bulkrax', '~> 5.3'
+gem 'bulkrax', '~> 5.4'
 gem 'byebug', group: %i[development test]
 gem 'capybara', group: %i[test]
 gem 'capybara-screenshot', '~> 1.0', group: %i[test]
@@ -28,16 +31,17 @@ gem 'database_cleaner', group: %i[test]
 gem 'devise'
 gem 'devise-guests', '~> 0.3'
 gem 'devise-i18n'
-gem 'devise_invitable', '~> 1.6'
-gem 'dry-monads', '~> 1.4.0' # Locked because 1.5.0 was not compatible with Hyrax v.3.4.2
+gem 'devise_invitable', '~> 2.0'
+gem 'dry-monads', '~> 1.5'
 gem 'easy_translate', group: %i[development]
 gem 'factory_bot_rails', group: %i[test]
 gem 'fcrepo_wrapper', '~> 0.4', group: %i[development test]
-gem 'flipflop', '~> 2.6.0' # waiting for hyrax 4 upgrade
 gem 'flutie'
-gem 'hyrax', '~> 3.5.0'
-gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'main'
-gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'main'
+gem 'good_job', '~> 2.99'
+gem 'googleauth', '= 1.8.1' # 1.9.0 got yanked from rubygems, hard pinning until we can upgrade
+gem 'hyrax', github: 'samvera/hyrax', branch: 'double_combo'
+gem 'hyrax-doi', github: 'samvera-labs/hyrax-doi', branch: 'rails_hyrax_upgrade'
+gem 'hyrax-iiif_av', github: 'samvera-labs/hyrax-iiif_av', branch: 'rails_hyrax_upgrade'
 gem 'i18n-debug', require: false, group: %i[development test]
 gem 'i18n-tasks', group: %i[development test]
 gem 'iiif_print', github: 'scientist-softserv/iiif_print', branch: 'main'
@@ -56,16 +60,17 @@ gem 'omniauth-multi-provider'
 gem 'omniauth-rails_csrf_protection', '~> 1.0'
 gem 'omniauth-saml', '~> 2.1'
 gem 'omniauth_openid_connect'
+gem 'order_already'
 gem 'parser', '~> 2.5.3'
 gem 'pg'
 gem 'postrank-uri', '>= 1.0.24'
 gem 'pry-byebug', group: %i[development test]
 gem 'puma', '~> 5.6' # Use Puma as the app server
 gem 'rack-test', '0.7.0', group: %i[test] # rack-test >= 0.71 does not work with older Capybara versions (< 2.17). See #214 for more details
 gem 'rails-controller-testing', group: %i[test]
-gem 'rdf', '~> 3.1.15' # rdf 3.2.0 removed SerializedTransaction which ldp requires
+gem 'rdf', '~> 3.2'
 gem 'redlock', '>= 0.1.2', '< 2.0' # lock redlock per https://github.com/samvera/hyrax/pull/5961
-gem 'riiif', '~> 1.1'
+gem 'riiif', '~> 2.0'
 gem 'rolify'
 gem 'rsolr', '~> 2.0'
 gem 'rspec', group: %i[development test]
@@ -76,7 +81,7 @@ gem 'rspec-retry', group: %i[test]
 gem 'rspec_junit_formatter', group: %i[test]
 gem 'rubocop', '~> 0.50', '<= 0.52.1', group: %i[development test]
 gem 'rubocop-rspec', '~> 1.22', '<= 1.22.2', group: %i[development test]
-gem 'sass-rails', '~> 5.0' # Use SCSS for stylesheets
+gem 'sass-rails', '~> 6.0' # Use SCSS for stylesheets
 gem 'scss_lint', require: false, group: %i[development]
 gem 'secure_headers'
 gem 'selenium-webdriver', '4.8.1', group: %i[test]