hyrax 3.3.0 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95d9c34fb76fd8e3ac06d6605962c16bbdad32ffa2c1f5ab24958740fc175507
-  data.tar.gz: 8be6a02dc887f93076d84a5dc47b8e4cc7ecf916415e23fd00df24078f20ebbf
+  metadata.gz: 9b16b002450d8ab2e549a1e79a558df2cdcc5a4f906d5cad461a010de5d3083d
+  data.tar.gz: e31cfe1456a09806f220c3a80582c708ea04707fb927dce8bcd1fa897d738c94
 SHA512:
-  metadata.gz: b6e519190cda4bdcdb4a68577b682ad6fd138756da25ce69228429755e3ee3a2fb3ac95d9140831d623f75e0aa8a9115d378abafe8f301850c200fb8080b9942
-  data.tar.gz: 90610095bd1b82e79bc7ebaa8de11a2f3c8452803a15d60a4595308b67ab85724b118c7343b2a46fb2bafb3a138365fdb94540e948965cc1a96d4259fd8b07d6
+  metadata.gz: c559a06ad78eb3b2e13ab6f11cc7fd0a5ee94a0da1670b0c67557610cf0d65fde294a6998ce46c634bff1a24ad3a17d6eb4755ec7ddf87e7c339ef7c46a0e717
+  data.tar.gz: d95bd5690258a422be6913a1fb7bed33c225288948c74d6864ec3f7740d4791fd7dcca321b89f81efc33083048965102635281ff5b0de815701125a95c8e24f7

data/.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.5.9
       bundler_version:
         type: string
         default: 1.17.3
@@ -67,7 +67,7 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.5.9
       bundler_version:
         type: string
         default: 1.17.3
@@ -86,6 +86,15 @@ jobs:
     steps:
       - attach_workspace:
           at: ~/
+      - when:
+          condition:
+            equal: [ '2.5.9', << parameters.ruby_version >> ]
+          steps:
+            - run:
+                name: "Lock browse everything for Ruby 2.5"
+                command: |
+                  sed -i.bak "s/browse-everything.*/browse-everything\', \'1.1.2\'/" hyrax.gemspec
+                  bundle
       - samvera/engine_cart_generate:
           cache_key: v1-internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum ".regen" }}-{{ checksum ".circleci/config.yml" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
       - samvera/bundle:
@@ -101,7 +110,7 @@ jobs:
     parameters:
       ruby_version:
         type: string
-        default: 2.5.8
+        default: 2.5.9
       bundler_version:
         type: string
         default: 1.17.3
@@ -150,43 +159,43 @@ jobs:
             --header 'Content-Type: application/json'
 workflows:
   version: 2
-  ruby2-5-8:
+  ruby2-5:
     jobs:
       - bundle:
-          ruby_version: "2.5.8"
+          ruby_version: "2.5.9"
           rails_version: "5.2.6"
       - build:
-          ruby_version: "2.5.8"
+          ruby_version: "2.5.9"
           rails_version: "5.2.6"
           requires:
             - bundle
       - test:
-          name: "ruby2-5-8"
-          ruby_version: "2.5.8"
+          name: "ruby2-5"
+          ruby_version: "2.5.9"
           requires:
             - build
-  ruby2-6-6:
+  ruby2-6:
     jobs:
       - bundle:
-          ruby_version: "2.6.6"
+          ruby_version: "2.6.7"
           rails_version: "5.2.6"
       - build:
-          ruby_version: "2.6.6"
+          ruby_version: "2.6.7"
           rails_version: "5.2.6"
           requires:
             - bundle
       - test:
-          name: "ruby2-6-6"
-          ruby_version: "2.6.6"
+          name: "ruby2-6"
+          ruby_version: "2.6.7"
           requires:
             - build
       - test:
-          name: "ruby2-6-6-valkyrie"
-          ruby_version: "2.6.6"
+          name: "ruby2-6-valkyrie"
+          ruby_version: "2.6.7"
           hyrax_valkyrie: "true"
           requires:
             - build
-  ruby2-7-4:
+  ruby2-7:
     jobs:
       - bundle:
           ruby_version: "2.7.4"
@@ -199,7 +208,7 @@ workflows:
           requires:
             - bundle
       - test:
-          name: "ruby2-7-4"
+          name: "ruby2-7"
           ruby_version: "2.7.4"
           bundler_version: "2.1.4"
           requires:

data/.dassie/.env

@@ -1,3 +1,4 @@
 MEMCACHED_HOST=memcached
 REDIS_PROVIDER=SIDEKIQ_REDIS_URL
-SIDEKIQ_REDIS_URL=redis://redis:6379/0
+SEED_DASSIE=true
+SIDEKIQ_REDIS_URL=redis://redis:6379/0

data/.dassie/Gemfile

@@ -8,7 +8,7 @@ else
 end
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.7.4'
+ruby '2.7.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.4', '>= 5.2.4.4'

data/.dassie/app/forms/collection_resource_form.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResourceForm < Hyrax::Forms::PcdmCollectionForm
+  include Hyrax::FormFields(:basic_metadata)
+  include Hyrax::FormFields(:collection_resource)
+end

data/.dassie/app/indexers/collection_resource_indexer.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResourceIndexer < Hyrax::PcdmCollectionIndexer
+  include Hyrax::Indexer(:basic_metadata)
+  include Hyrax::Indexer(:collection_resource)
+end

data/.dassie/app/models/collection_resource.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+class CollectionResource < Hyrax::PcdmCollection
+  # @note Do not directly update `basic_metadata.yaml`.  It is also used by works.
+  #
+  # To change metadata for collections
+  # * extend by adding fields to `/config/metadata/collection_resource.yaml`
+  # * remove all basic metadata
+  #   * if you generated `with_basic_metadata` and now don't want any basic metadata,
+  #       comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  # * remove some basic metadata
+  #   * comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy fields you want to keep from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/collection_resource.yaml`
+  # * override some basic metadata
+  #   * fields are not allowed to repeat, so to override any basic metadata, you
+  #       must first comment out or delete the schema include statement for `:basic_metadata`
+  #   * update form and indexer classes to also remove the `:basic_metadata` schema include
+  #   * copy all fields you want to keep unchanged or to override from `/config/metadata/basic_metadata.yaml`
+  #       to `/config/metadata/collection_resource.yaml`
+  #   * update them in `config/metadata/collection_resource.yaml to have the desired
+  #       characteristics
+  #
+  # Alternative:
+  # * comment out or delete schema include statements
+  # * add Valkyrie attributes to this class
+  # * update form and indexer to process the attributes
+  #
+  include Hyrax::Schema(:basic_metadata)
+  include Hyrax::Schema(:collection_resource)
+end

data/.dassie/config/initializers/file_services.rb

@@ -0,0 +1,4 @@
+ActiveSupport::Reloader.to_prepare do
+  Hydra::Derivatives.config.output_file_service = Hyrax::ValkyriePersistDerivatives
+  Hydra::Derivatives.config.source_file_service = Hyrax::LocalFileService
+end

data/.dassie/config/initializers/hyrax.rb

@@ -15,6 +15,8 @@ Hyrax.config do |config|
   config.register_curation_concern :monograph
 
   config.iiif_image_server = true
+  config.work_requires_files = false
+  config.citations = true
 
   # Returns a URL that resolves to an image provided by a IIIF image server
   config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
@@ -38,14 +40,23 @@ Hyrax.config do |config|
     config.browse_everything = nil
   end
 
+  # config.geonames_username = ''
+
   ##
   # Set the system-wide virus scanner
   config.virus_scanner = Hyrax::VirusScanner
 
   ##
-  # To index to the Valkyrie core, uncomment the following two lines.
+  # To index to the Valkyrie core, uncomment the following lines.
   # config.query_index_from_valkyrie = true
   # config.index_adapter = :solr_index
+
+  ##
+  # NOTE: To Valkyrie works, use Monograph which is_a Hyrax::Work is_a Valkyrie::Resource
+  # To use Valkyrie models, uncomment the following lines.
+  # config.collection_model = 'Hyrax::PcdmCollection' # collection without basic metadata
+  # config.collection_model = 'CollectionResource'    # collection with basic metadata
+  # config.admin_set_model = 'Hyrax::AdministrativeSet'
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/.dassie/config/metadata/collection_resource.yaml

@@ -0,0 +1,23 @@
+# Simple yaml config-driven schema which is used to define model attributes,
+# index key names, and form properties.
+#
+# Originally generated with no metadata via
+#  `rails generate hyrax:collection_resource CollectionResource`
+#
+# A few custom fields are added for testing purposes.
+
+---
+attributes:
+  target_audience:
+    type: string
+    form:
+      primary: true
+      multiple: true
+  department:
+    type: string
+    form:
+      primary: true
+  course:
+    type: string
+    form:
+      primary: false

data/.dassie/db/seeds.rb

@@ -1,22 +1,79 @@
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).
-#
-# Examples:
-#
-#   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
-#   Character.create(name: 'Luke', movie: movies.first)
-
-Hyrax::Engine.load_seed unless ActiveModel::Type::Boolean.new.cast(ENV["SKIP_HYRAX_ENGINE_SEED"])
-
-puts "\n== Loading users"
-User.where(email: 'admin@example.com').first_or_create do |f|
-  f.password = 'admin_password'
+wipe_data = ActiveModel::Type::Boolean.new.cast(ENV.fetch('WIPE_DATA', false))
+seed_release_testing = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SEED_RELEASE_TESTING', false))
+seed_dassie = ActiveModel::Type::Boolean.new.cast(ENV.fetch('SEED_DASSIE', false))
+
+unless wipe_data || seed_release_testing
+  puts 'NAME'
+  puts '     rails db:seed (Hyrax)'
+  puts
+  puts 'SYNOPSIS'
+  puts '     bundle exec rails db:seed [WIPE_DATA=true|false] [SEED_RELEASE_TESTING=true|false] [SEED_DASSIE=true|false]'
+  puts
+  puts 'DESCRIPTION'
+  puts '     Hyrax defined db:seed provides a means to clear repository metadata from the datastore (e.g. Fedora, Postgres) and from Solr.'
+  puts '     Seeds can be run to pre-populate metadata to help with release testing and local development testing.'
+  puts
+  puts '     NOTE: Options can be passed in with the command on the command line or set as ENV variables.'
+  puts
+  puts '     The options are as follows:'
+  puts
+  puts '     WIPE_DATA'
+  puts '             USE WITH CAUTION - Deleted data cannot be recovered.'
+  puts
+  puts '             When true, it will clear all repository metadata from the datastore (e.g. Fedora, Postgres) and from Solr.  It also'
+  puts '             clears data from the application database that are tightly coupled to repository metadata.  See Hyrax::DataMaintenance'
+  puts '             for more information on what data will be destroyed by this process.'
+  puts
+  puts '             The wipe_data process will also restore required repository metadata including collection types and the default admin'
+  puts '             set.  See Hyrax::RequiredDataSeeder for more information on what data will be created by this process.'
+  puts
+  puts '     SEED_RELEASE_TESTING'
+  puts '             When true, it will run the set of seeds for release testing creating a repository metadata and support data, including'
+  puts '             test users, collection types, collections, and works with and without files.  See Hyrax::TestDataSeeder for more information'
+  puts '             on what data will be created by this process.'
+  puts
+  puts '     SEED_DASSIE'
+  puts '             When true, it will run a minimal set of seeds for dassie test app, including required collection types, default admin set,'
+  puts '             and test users.'
+  puts
+  puts '     ALLOW_RELEASE_SEEDING_IN_PRODUCTION'
+  puts '             USE WITH EXTERME CAUTION WHEN USED IN PRODUCTION - Deleted data cannot be recovered.  Attempts are made to not overwrite'
+  puts '             existing data, but use in production is not recommended.'
+  puts
+  puts '             If this is NOT true, the process will abort when Rails environment is production.'
+  puts
+end
+
+allow_release_seeding_in_production = ActiveModel::Type::Boolean.new.cast(ENV.fetch('ALLOW_RELEASE_SEEDING_IN_PRODUCTION', false))
+
+if Rails.env == 'production' && !allow_release_seeding_in_production
+  puts "Seeding data for release testing is not for use in production!"
+  exit
 end
 
-User.where(email: 'basic_user@example.com').first_or_create do |f|
-  f.password = 'password'
+if wipe_data
+  puts '####################################################################################'
+  puts
+  puts 'WARNING: You are about to clear all repository metadata from the datastore and solr.'
+  puts 'Are you sure? [YES|n]'
+  answer = STDIN.gets.chomp
+  unless answer == 'YES'
+    puts '   Aborting!'
+    puts '####################################################################################'
+    exit
+  end
+
+  Hyrax::DataMaintenance.new.destroy_repository_metadata_and_related_data
+  Hyrax::RequiredDataSeeder.new.generate_seed_data
+end
+
+if seed_dassie
+  puts 'Seeding Dassie ...'
+
+  Hyrax::RequiredDataSeeder.new.generate_seed_data
+  Hyrax::TestDataSeeders::UserSeeder.generate_seeds
 end
 
-User.where(email: 'another_user@example.com').first_or_create do |f|
-  f.password = 'password'
+if seed_release_testing
+  Hyrax::TestDataSeeder.new.generate_seed_data
 end

data/.dassie/spec/forms/collection_resource_form_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'valkyrie/specs/shared_specs'
+
+RSpec.describe CollectionResourceForm do
+  let(:change_set) { described_class.new(resource) }
+  let(:resource)   { CollectionResource.new }
+
+  it_behaves_like 'a Valkyrie::ChangeSet'
+end

data/.dassie/spec/indexers/collection_resource_indexer_spec.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/indexers'
+
+RSpec.describe CollectionResourceIndexer do
+  let(:indexer_class) { described_class }
+  let(:resource)      { CollectionResource.new }
+
+  it_behaves_like 'a Hyrax::Resource indexer'
+  it_behaves_like 'a Basic metadata indexer'
+end

data/.dassie/spec/models/collection_resource_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Generated via
+#  `rails generate hyrax:collection_resource CollectionResource`
+require 'rails_helper'
+require 'hyrax/specs/shared_specs/hydra_works'
+
+RSpec.describe CollectionResource do
+  subject(:collection) { described_class.new }
+
+  it_behaves_like 'a Hyrax::PcdmCollection'
+  it_behaves_like 'a model with basic metadata'
+end

data/.github/release.yml

@@ -0,0 +1,26 @@
+changelog:
+  categories:
+    - title: Major Changes (Potentially breaking changes)
+      labels:
+        - notes-major
+    - title: New Features
+      labels:
+        - notes-minor
+    - title: Deprecations
+      labels:
+        - notes-deprecation
+    - title: Bug Fixes
+      labels:
+        - notes-bugfix
+    - title: Valkyrie Progress
+      labels:
+        - notes-valkyrie
+    - title: Documentation
+      labels:
+        - notes-docs
+    - title: Containerization
+      labels:
+        - notes-container
+    - title: Other
+      labels:
+        - "*"

data/.gitignore

@@ -49,6 +49,8 @@ coverage
 rdoc
 /.bundle
 tmp
+/.idea
+
 
 *.log
 *~
@@ -71,6 +73,7 @@ db/schema.rb
 
 .*_app
 .byebug_history
+.tool-versions
 
 ## Carried over from hyrax-models (RIP)
 *.gem

data/.regen

@@ -1 +1 @@
-40
+46

data/.rubocop.yml

@@ -5,7 +5,7 @@ inherit_gem:
   bixby: bixby_default.yml
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   Exclude:
     - 'db/**/*'

data/.rubocop_fixme.yml

@@ -63,6 +63,7 @@ RSpec/ExampleLength:
     - 'spec/jobs/content_restored_version_event_job_spec.rb'
     - 'spec/jobs/content_new_version_event_job_spec.rb'
     - 'spec/jobs/content_depositor_change_event_job_spec.rb'
+    - 'spec/jobs/change_depositor_event_job_spec.rb'
     - 'spec/jobs/content_deposit_event_job_spec.rb'
     - 'spec/jobs/content_delete_event_job_spec.rb'
     - 'spec/jobs/ingest_file_job_spec.rb'
@@ -100,7 +101,6 @@ RSpec/SubjectStub:
     - 'spec/models/hyrax/operation_spec.rb'
     - 'spec/controllers/hyrax/accepts_batches_controller_spec.rb'
     - 'spec/indexers/hyrax/repository_reindexer_spec.rb'
-    - 'spec/jobs/content_depositor_change_event_job_spec.rb'
     - 'spec/lib/hyrax/analytics_spec.rb'
     - 'spec/models/job_io_wrapper_spec.rb'
     - 'spec/search_builders/hyrax/abstract_type_relation_spec.rb'
@@ -114,6 +114,8 @@ RSpec/AnyInstance:
     - 'spec/controllers/hyrax/batch_edits_controller_spec.rb'
     - 'spec/controllers/hyrax/stats_controller_spec.rb'
     - 'spec/controllers/hyrax/users_controller_spec.rb'
+    - 'spec/hyrax/transactions/steps/delete_access_control_spec.rb'
+    - 'spec/hyrax/transactions/steps/save_access_control_spec.rb'
     - 'spec/jobs/content_restored_version_event_job_spec.rb'
     - 'spec/jobs/file_set_attached_event_job_spec.rb'
     - 'spec/jobs/hyrax/grant_edit_to_members_job_spec.rb'
@@ -169,14 +171,31 @@ RSpec/RepeatedDescription:
     - 'spec/models/sipity/workflow_state_action_spec.rb'
     - 'spec/models/sipity/workflow_state_spec.rb'
 
-# Offense count: 1
+# Offense count: 2
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
 Rails/HasManyOrHasOneDependent:
   Exclude:
     - 'app/models/admin_set.rb'
+    - 'app/models/hyrax/permission_template.rb'
 
 # Offense count: 1
-Style/MethodMissingSuper:
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'app/services/hyrax/works/migration_service.rb'
+
+# Offense count: 12
+Lint/MissingSuper:
   Exclude:
+    - 'app/actors/hyrax/actors/interpret_visibility_actor.rb'
+    - 'app/actors/hyrax/actors/ordered_members_actor.rb'
     - 'app/models/concerns/hyrax/file_set/characterization.rb'
+    - 'app/presenters/hyrax/file_usage.rb'
+    - 'app/presenters/hyrax/work_usage.rb'
+    - 'app/services/hyrax/batch_create_failure_service.rb'
+    - 'app/services/hyrax/batch_create_success_service.rb'
+    - 'app/services/hyrax/collection_types/create_service.rb'
+    - 'app/services/hyrax/solr_query_service.rb'
+    - 'lib/hyrax/form_fields.rb'
+    - 'lib/hyrax/health_checks/solr_check.rb'
+    - 'lib/hyrax/schema.rb'

data/CONTAINERS.md

@@ -143,28 +143,32 @@ _This is for applications that mount Hyrax and is separate from the docker conta
 
 ### Maintaining
 
-We publish several Hyrax images to hub.docker.com under the
-[`samveralabs` group][dockerhub-samveralabs]. To build them, do:
+We publish several Hyrax images to the [GitHub container registry][ghcr] under
+the [Samvera organization][samvera-packages].  To build them:
 
 ```sh
-# build an image for an app using Postgresql (`gem 'pg'`)
-docker build --target hyrax --tag samveralabs/hyrax:(git rev-parse HEAD) .
-docker push samveralabs/hyrax:(git rev-parse HEAD)
+export HYRAX_VERSION=v3.4.1 # or desired version
+git checkout $HYRAX_VERSION
 
-# or; build a development image with sqlite
-docker build --target hyrax --tag samveralabs/hyrax:(git rev-parse HEAD)-sqlite --build-arg DATABASE_APK_PACKAGE="sqlite" .
-docker push samveralabs/hyrax:(git rev-parse HEAD)-sqlite
+docker build --target hyrax-base --tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) .
+
+docker tag ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD) ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_VERSION
+
+docker push ghcr.io/samvera/hyrax/hyrax-base:$(git rev-parse HEAD)
+docker push ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_VERSION
 ```
 
+Do the same for `hyrax-worker-base`.
+
 We also publish an image for the stable test application `dassie`:
 
 ```sh
-docker build --target hyrax-engine-dev --tag samveralabs/dassie:(git rev-parse HEAD) .
+docker build --target hyrax-engine-dev --tag ghcr.io/samvera/hyrax/dassie:$(git rev-parse HEAD) .
 
-docker tag samveralabs/dassie:(git rev-parse HEAD) samveralabs/dassie:$HYRAX_VERSION
+docker tag ghcr.io/samvera/hyrax/dassie:$(git rev-parse HEAD) ghcr.io/samvera/hyrax/dassie:$HYRAX_VERSION
 
-docker push samveralabs/dassie:(git rev-parse HEAD)
-docker push samveralabs/dassie:$HYRAX_VERSION
+docker push ghcr.io/samvera/hyrax/dassie:$(git rev-parse HEAD)
+docker push ghcr.io/samvera/hyrax/dassie:$HYRAX_VERSION
 ```
 
 ## Deploying to Production
@@ -180,4 +184,5 @@ helm dependency update chart/hyrax
 helm install -n hyrax --set image.tag=(git rev-parse HEAD) dassie chart/hyrax
 ```
 
-[dockerhub-samveralabs]: https://hub.docker.com/r/samveralabs
+[ghcr]: https://docs.github.com/en/enterprise-cloud@latest/packages/working-with-a-github-packages-registry/working-with-the-container-registry
+[samvera-packages]: https://github.com/orgs/samvera/packages

data/Dockerfile

@@ -1,5 +1,5 @@
-ARG RUBY_VERSION=2.7.4
-FROM ruby:$RUBY_VERSION-alpine3.14 as hyrax-base
+ARG RUBY_VERSION=2.7.5
+FROM ruby:$RUBY_VERSION-alpine3.15 as hyrax-base
 
 ARG DATABASE_APK_PACKAGE="postgresql-dev"
 ARG EXTRA_APK_PACKAGES="git"
@@ -7,6 +7,7 @@ ARG EXTRA_APK_PACKAGES="git"
 RUN apk --no-cache upgrade && \
   apk --no-cache add build-base \
   curl \
+  gcompat \
   imagemagick \
   tzdata \
   nodejs \
@@ -57,7 +58,7 @@ USER app
 
 RUN mkdir -p /app/fits && \
     cd /app/fits && \
-    wget https://github.com/harvard-lts/fits/releases/download/1.5.0/fits-1.5.0.zip -O fits.zip && \
+    wget https://github.com/harvard-lts/fits/releases/download/1.5.1/fits-1.5.1.zip -O fits.zip && \
     unzip fits.zip && \
     rm fits.zip && \
     chmod a+x /app/fits/fits.sh

data/app/actors/hyrax/actors/file_actor.rb

@@ -76,6 +76,8 @@ module Hyrax
       end
 
       def perform_ingest_file_through_valkyrie(io) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        Deprecation.warn "FileActor support for Valkyrie was experimental and " \
+                         "is slated to be removed in favor of WorkUploadsHandler."
         file =
           begin
             Hyrax.storage_adapter.upload(resource: file_set, file: io, original_filename: io.original_name, use: relation)
@@ -85,12 +87,12 @@ module Hyrax
           end
         file_metadata = Hyrax.custom_queries.find_file_metadata_by(id: file.id)
         create_version(file_metadata, user)
-        id = file_metadata.file_identifier
-        file_set.file_ids << id
-        file_set.original_file_id = id
+
+        file_set.file_ids << file_metadata.id
+        file_set.original_file_id = file_metadata.id
         Hyrax.persister.save(resource: file_set)
         Hyrax.publisher.publish('object.metadata.updated', object: file_set, user: user)
-        CharacterizeJob.perform_later(file_set, id.to_s, pathhint(io))
+        CharacterizeJob.perform_later(file_set, file_metadata.id.to_s, pathhint(io))
         file_metadata
       end
 

data/app/actors/hyrax/actors/transfer_request_actor.rb

@@ -1,17 +1,12 @@
 # frozen_string_literal: true
 module Hyrax
   module Actors
-    ##
-    # @deprecated transfer requests are now carried out in response to published
-    # 'object.deposited' events.
-    #
     # Notify the provided owner that their proxy wants to make a
     # deposit on their behalf
     class TransferRequestActor < AbstractActor
       # @param [Hyrax::Actors::Environment] env
       # @return [Boolean] true if create was successful
       def create(env)
-        Deprecation.warn('Use Hyrax::Listeners::ProxyDepositListener instead.')
         next_actor.create(env) && create_proxy_deposit_request(env)
       end
 
@@ -20,8 +15,9 @@ module Hyrax
       def create_proxy_deposit_request(env)
         proxy = env.curation_concern.on_behalf_of
         return true if proxy.blank?
-        ContentDepositorChangeEventJob.perform_later(env.curation_concern,
-                                                     ::User.find_by_user_key(proxy))
+        work = env.curation_concern
+        user = ::User.find_by_user_key(proxy)
+        Hyrax::ChangeDepositorService.call(work, user, false)
         true
       end
     end