hyrax 3.4.2 → 4.0.0.beta2

data/config/locales/hyrax.es.yml

@@ -601,6 +601,7 @@ es:
         legend_html: Miniatura
       form_visibility_component:
         visibility: La visibilidad
+        subtitle_html: <small>¿Quién debería poder ver o descargar este contenido?</small>
       inspect_work:
         back_to: De regreso
         entity_id: ID de entidad
@@ -1091,14 +1092,14 @@ es:
       no_transfers: No ha transferido ningún trabajo
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Cambiar imagen
+          change_picture: <i class = "fa fa-camera"> </i> Cambiar imagen
           delete_picture: Eliminar foto
           delete_picture_data_content: Si desea eliminar su imagen por completo, marque la casilla y guarde su perfil.
           delete_picture_data_original_title: Eliminar imagen
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </i> Asa de Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Manija de Google+
           help_change_picture_type: JPG, GIF o PNG (menos de 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Guardar perfil
+          save_profile: <i class = "fa fa-floppy-o"> </i> Guardar perfil
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </i> Twitter Handle
       proxy_activity: Actividad de Proxy
       proxy_add_deny: No puedes hacerte un proxy
@@ -1456,7 +1457,7 @@ es:
         changes_required:
           message: |-
             %{title} (%{link}) requiere cambios adicionales antes de la aprobación.
-             '%{comment}'
+             '%{comment}'
           subject: Su depósito requiere cambios
         deposited:
           message: "%{title} (%{link}) fue aprobado por %{user}. %{comment}"
@@ -1490,7 +1491,7 @@ es:
       read: Ver descarga
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Ir
+        html: <span class="fa fa-search"></span> Ir
         text: Buscar
       form:
         option:
@@ -1836,7 +1837,7 @@ es:
         find_child_work: Busque un trabajo ...
         member_of_collection_ids: Seleccione una colección ...
     required:
-      html: <span class="label label-info required-tag">obligatorio</span>
+      html: <span class="badge badge-info required-tag">obligatorio</span>
   total_view:
     one: Este trabajo tiene 1 vista total
-    other: Este trabajo tiene un total de %{count} visualizaciones
+    other: Este trabajo tiene un total de %{count} visualizaciones

data/config/locales/hyrax.fr.yml

@@ -440,7 +440,7 @@ fr:
           end_label: Terminer [par défaut pour le moment]
           headers:
             main: Statistiques de travail
-            total: 'Total des travaux :'
+            total: 'Total des travaux :'
             visibility: Totaux par visibilité
           heading: Afficher les fichiers déposés par les utilisateurs
           start_label: Départ
@@ -563,7 +563,7 @@ fr:
           actions: action
           title: Titre de la collection
       form_permission:
-        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </ Small>
+        visibility: Visibilité <small> Qui devrait être en mesure d’afficher ou de télécharger ce contenu? </small>
       form_permission_under_embargo:
         help_html: "<strong>Ce travail est sous embargo.</strong> Vous pouvez modifier les paramètres de l'embargo ici, ou vous pouvez visiter le %{edit_link} pour le désactiver."
         legend_html: Visibilité <small>Qui devrait pouvoir afficher ou télécharger ce contenu?</small>
@@ -602,6 +602,7 @@ fr:
         legend_html: La vignette
       form_visibility_component:
         visibility: Visibilité
+        subtitle_html: <small>Qui devrait être en mesure d’afficher ou de télécharger ce contenu?</small>
       inspect_work:
         back_to: Retour à
         entity_id: ID d'entité
@@ -1092,14 +1093,14 @@ fr:
       no_transfers: Vous n'avez transféré aucun travail
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </ i> Changer photo
+          change_picture: <i class = "fa fa-camera"> </ i> Changer photo
           delete_picture: Supprimer la photo
           delete_picture_data_content: Si vous souhaitez supprimer entièrement votre image, cochez la case et enregistrez votre profil.
           delete_picture_data_original_title: Supprimer l'image
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </ i> Poignée Facebook
           google_handle: <i class = "fa fa-google-plus"> </ i> Poignée Google+
           help_change_picture_type: JPG, GIF ou PNG (moins de 2 Mo)
-          save_profile: <i class = "glyphicon glyphicon-save"> </ i> Enregistrer le profil
+          save_profile: <i class = "fa fa-floppy-o"> </ i> Enregistrer le profil
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </ i> Poignée Twitter
       proxy_activity: Activité de procuration
       proxy_add_deny: Vous ne pouvez pas vous faire un proxy
@@ -1455,7 +1456,7 @@ fr:
         changes_required:
           message: |-
             %{title} (%{link}) nécessite des modifications supplémentaires avant d'être approuvé.
-             '%{comment}'
+             '%{comment}'
           subject: Votre dépôt nécessite des modifications
         deposited:
           message: "%{title} (%{link}) a été approuvé par %{user}. %{comment}"
@@ -1489,7 +1490,7 @@ fr:
       read: Voir le téléchargement
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Aller
+        html: <span class="fa fa-search"></span> Aller
         text: Chercher
       form:
         option:
@@ -1835,7 +1836,7 @@ fr:
         find_child_work: Rechercher un travail ...
         member_of_collection_ids: Sélectionnez une collection ...
     required:
-      html: <span class="label label-info required-tag">Champs obligatoires</span>
+      html: <span class="badge badge-info required-tag">Champs obligatoires</span>
   total_view:
     one: Ce travail a 1 vue totale
-    other: Ce travail a zxzxxx0 vues au total
+    other: Ce travail a zxzxxx0 vues au total

data/config/locales/hyrax.it.yml

@@ -601,6 +601,7 @@ it:
         legend_html: Thumbnail
       form_visibility_component:
         visibility: Visibilità
+        subtitle_html: <small>Chi dovrebbe essere in grado di visualizzare o scaricare questo contenuto?</small>
       inspect_work:
         back_to: Torna a
         entity_id: ID entità
@@ -1091,14 +1092,14 @@ it:
       no_transfers: Non hai trasferito alcun lavoro
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Cambia immagine
+          change_picture: <i class = "fa fa-camera"> </i> Cambia immagine
           delete_picture: Elimina foto
           delete_picture_data_content: Se desideri rimuovere completamente la tua foto, seleziona la casella e salva il tuo profilo.
           delete_picture_data_original_title: Elimina immagine
           facebook_handle: <i class = "fa fa-facebook" aria-hidden = "true"> </i> Handle di Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Handle di Google+
           help_change_picture_type: JPG, GIF o PNG (meno di 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Salva profilo
+          save_profile: <i class = "fa fa-floppy-o"> </i> Salva profilo
           twitter_handle: <i class = "fa fa-twitter" aria-hidden = "true"> </i> Handle di Twitter
       proxy_activity: Attività proxy
       proxy_add_deny: Non puoi renderti un proxy
@@ -1454,7 +1455,7 @@ it:
         changes_required:
           message: |-
             %{title} (%{link}) richiede ulteriori modifiche prima dell'approvazione.
-             '%{comment}'
+             '%{comment}'
           subject: Il tuo deposito richiede modifiche
         deposited:
           message: "%{title} (%{link}) è stato approvato da %{user}. %{comment}"
@@ -1488,7 +1489,7 @@ it:
       read: Visualizza / Scarica
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Partire
+        html: <span class="fa fa-search"></span> Partire
         text: Ricerca
       form:
         option:
@@ -1834,7 +1835,7 @@ it:
         find_child_work: Cerca un lavoro ...
         member_of_collection_ids: Seleziona una collezione ...
     required:
-      html: <span class="label label-info required-tag">necessario</span>
+      html: <span class="badge badge-info required-tag">necessario</span>
   total_view:
     one: Quest'opera ha 1 vista totale
-    other: Questo lavoro ha %{count} visualizzazioni totali
+    other: Questo lavoro ha %{count} visualizzazioni totali

data/config/locales/hyrax.pt-BR.yml

@@ -596,6 +596,7 @@ pt-BR:
         legend_html: Miniatura
       form_visibility_component:
         visibility: Visibilidade
+        subtitle_html: <small>Quem deve conseguir visualizar ou baixar este conteúdo?</small>
       inspect_work:
         back_to: De volta a
         entity_id: ID da entidade
@@ -1086,14 +1087,14 @@ pt-BR:
       no_transfers: Você não transferiu nenhuma obra
       profiles:
         edit_primary:
-          change_picture: <i class = "glyphicon glyphicon-camera"> </i> Alterar imagem
+          change_picture: <i class = "fa fa-camera"> </i> Alterar imagem
           delete_picture: Excluir foto
           delete_picture_data_content: Se você deseja remover sua foto completamente, marque a caixa e salve seu perfil.
           delete_picture_data_original_title: Excluir imagem
           facebook_handle: <i class = "fa-facebook" aria-hidden = "true"> </i> Manipulação do Facebook
           google_handle: <i class = "fa fa-google-plus"> </i> Manipulação do Google+
           help_change_picture_type: JPG, GIF ou PNG (menos de 2 MB)
-          save_profile: <i class = "glyphicon glyphicon-save"> </i> Salvar perfil
+          save_profile: <i class = "fa fa-floppy-o"> </i> Salvar perfil
           twitter_handle: <i class = "fa-twitter" aria-hidden = "true"> </i> Manipulação do Twitter
       proxy_activity: Atividade de suplente
       proxy_add_deny: Você não pode se tornar um proxy
@@ -1449,7 +1450,7 @@ pt-BR:
         changes_required:
           message: |-
             %{title} (%{link}) requer alterações adicionais antes da aprovação.
-             '%{comment}'
+             '%{comment}'
           subject: Seu depósito requer alterações
         deposited:
           message: "%{title} (%{link}) foi aprovado por %{user}. %{comment}"
@@ -1483,7 +1484,7 @@ pt-BR:
       read: Visualizar download
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> Ir
+        html: <span class="fa fa-search"></span> Ir
         text: Pesquisar
       form:
         option:
@@ -1829,7 +1830,7 @@ pt-BR:
         find_child_work: Procure uma obra ...
         member_of_collection_ids: Selecione uma coleção ...
     required:
-      html: <span class="label label-info required-tag">obrigatórios</span>
+      html: <span class="badge badge-info required-tag">obrigatórios</span>
   total_view:
     one: Este trabalho tem 1 visualização total
-    other: Este trabalho tem %{count} visualizações totais
+    other: Este trabalho tem %{count} visualizações totais

data/config/locales/hyrax.zh.yml

@@ -599,6 +599,7 @@ zh:
         legend_html: 缩略图
       form_visibility_component:
         visibility: 可见性
+        subtitle_html: <small>谁应该能够查看或下载此内容？</ small>
       inspect_work:
         back_to: 回到
         entity_id: 实体ID
@@ -1089,14 +1090,14 @@ zh:
       no_transfers: 您没有转让任何作品
       profiles:
         edit_primary:
-          change_picture: "<i class =“glyphicon glyphicon-camera”> </ i>更改图片"
+          change_picture: "<i class =“fa fa-camera”> </ i>更改图片"
           delete_picture: 删除图片
           delete_picture_data_content: 如果您想完全删除图片，请选中相应复选框并保存您的个人资料。
           delete_picture_data_original_title: 删除图片
           facebook_handle: "<i class =“fa fa-facebook”aria-hidden =“true”> </ i> Facebook句柄"
           google_handle: "<i class =“fa fa-google-plus”> </ i> Google+处理"
           help_change_picture_type: JPG，GIF或PNG（小于2MB）
-          save_profile: "<i class =“glyphicon glyphicon-save”> </ i>保存个人资料"
+          save_profile: "<i class =“fa fa-floppy-o”> </ i>保存个人资料"
           twitter_handle: "<i class =“fa fa-twitter”aria-hidden =“true”> </ i> Twitter句柄"
       proxy_activity: 代理活动
       proxy_add_deny: 你不能让自己成为代理人
@@ -1452,7 +1453,7 @@ zh:
         changes_required:
           message: |-
             %{title}（%{link}）在批准之前需要进行其他更改。
-             '%{comment}'
+             '%{comment}'
           subject: 您的存款需要更改
         deposited:
           message: zxzxzxx（%{link}）被%{user}批准。 %{comment}
@@ -1486,7 +1487,7 @@ zh:
       read: 查看/下载
     search:
       button:
-        html: <span class="glyphicon glyphicon-search"></span> 转到
+        html: <span class="fa fa-search"></span> 转到
         text: 搜索
       form:
         option:
@@ -1832,7 +1833,7 @@ zh:
         find_child_work: 搜索工作...
         member_of_collection_ids: 选择一个集合...
     required:
-      html: <span class="label label-info required-tag">需要的</span>
+      html: <span class="badge badge-info required-tag">需要的</span>
   total_view:
     one: 该作品共有 1 次浏览
-    other: 此作品总浏览量为 %{count}
+    other: 此作品总浏览量为 %{count}

data/config/metadata/basic_metadata.yaml

@@ -113,6 +113,8 @@ attributes:
     multiple: true
     form:
       primary: true
+    index_keys:
+      - "rights_statement_tesim"
   source:
     type: string
     multiple: true

data/docker-compose-koppie.yml

@@ -0,0 +1,163 @@
+# Requires Docker Compose v2
+name: koppie
+services:
+  app: &app
+    build:
+      context: .
+      target: hyrax-engine-dev
+      args:
+        - EXTRA_APK_PACKAGES=git less chromium
+        - APP_PATH=.koppie
+    image: ghcr.io/samvera/koppie
+    command: sh -l -c 'bundle && yarn && bundle exec puma -v -b tcp://0.0.0.0:3000'
+    stdin_open: true
+    tty: true
+    user: root
+    env_file:
+      - .koppie/.env
+    environment:
+      - RAILS_ROOT=/app/samvera/hyrax-webapp
+    depends_on:
+      - chrome
+      - db_migrate
+      - memcached
+      - postgres
+      - redis
+      - solr
+    ports:
+      - 3001:3000
+      - 9877:9876
+      - 1049:1048
+    volumes:
+      - .koppie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - koppie
+
+  sidekiq:
+    build:
+      context: .
+      target: hyrax-engine-dev-worker
+      args:
+        - APP_PATH=.koppie
+    image: ghcr.io/samvera/koppie-worker
+    command: sh -l -c 'bundle && bundle exec sidekiq'
+    user: root
+    env_file:
+      - .koppie/.env
+    depends_on:
+      - db_migrate
+      - memcached
+      - postgres
+      - redis
+      - solr
+    volumes:
+      - .koppie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - hyrax-storage:/app/samvera/hyrax-webapp/storage
+      - hyrax-derivatives:/app/samvera/hyrax-webapp/derivatives
+      - hyrax-uploads:/app/samvera/hyrax-webapp/uploads
+      - sidekiq-public:/app/samvera/hyrax-webapp/public
+      - sidekiq-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - koppie
+
+  db_migrate:
+    build:
+      context: .
+      target: hyrax-engine-dev
+      args:
+        - EXTRA_APK_PACKAGES=git less
+        - APP_PATH=.koppie
+    image: ghcr.io/samvera/koppie
+    user: root
+    env_file:
+      - .koppie/.env
+    command: sh -l -c 'bundle && db-migrate-seed.sh'
+    depends_on:
+      - postgres
+    volumes:
+      - .koppie:/app/samvera/hyrax-webapp
+      - .:/app/samvera/hyrax-engine
+      - rails-public:/app/samvera/hyrax-webapp/public
+      - rails-tmp:/app/samvera/hyrax-webapp/tmp
+    networks:
+      - koppie
+
+  chrome:
+    image: selenium/standalone-chrome:3.141
+    logging:
+      driver: none
+    volumes:
+      - /dev/shm:/dev/shm
+    shm_size: 2G
+    ports:
+      - "4445:4444"
+      - "5960:5900"
+    networks:
+      - koppie
+
+  postgres:
+    image: postgres:latest
+    restart: always
+    env_file:
+      - .koppie/.env
+    ports:
+      - "5433:5432"
+    volumes:
+      - db:/var/lib/postgresql/data
+    networks:
+      - koppie
+
+  memcached:
+    image: bitnami/memcached
+    ports:
+      - '11212:11211'
+    networks:
+      - koppie
+
+  redis:
+    image: bitnami/redis:6.2
+    env_file:
+      - .koppie/.env
+    volumes:
+      - redis:/bitnami/redis/data
+    networks:
+      - koppie
+
+  solr:
+    image: solr:8.11
+    ports:
+      - 8984:8983
+    command:
+      - sh
+      - "-c"
+      - "precreate-core koppie_test /opt/solr/server/configsets/hyraxconf; solr-precreate koppie /opt/solr/server/configsets/hyraxconf"
+    volumes:
+      - solr_home:/var/solr/data:cached
+      - .koppie/solr/conf:/opt/solr/server/configsets/hyraxconf
+    networks:
+      - koppie
+
+volumes:
+  db:
+  hyrax-storage:
+  hyrax-derivatives:
+  hyrax-uploads:
+  rails-public:
+  rails-tmp:
+  redis:
+  sidekiq-public:
+  sidekiq-tmp:
+  solr_home:
+
+networks:
+  koppie:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.name: br-koppie

data/docker-compose.yml

@@ -6,14 +6,13 @@ services:
       context: .
       target: hyrax-engine-dev
       args:
-        - EXTRA_APK_PACKAGES=git less
+        - EXTRA_APK_PACKAGES=git less chromium
     image: ghcr.io/samvera/dassie
     command: sh -l -c 'bundle && bundle exec puma -v -b tcp://0.0.0.0:3000'
     stdin_open: true
     tty: true
     user: root
     env_file:
-      - .env
       - .dassie/.env
     environment:
       - RAILS_ROOT=/app/samvera/hyrax-webapp
@@ -27,6 +26,7 @@ services:
       - solr
     ports:
       - 3000:3000
+      - 9876:9876
     volumes:
       - .dassie:/app/samvera/hyrax-webapp
       - .:/app/samvera/hyrax-engine
@@ -45,7 +45,6 @@ services:
     command: sh -l -c 'bundle && bundle exec sidekiq'
     user: root
     env_file:
-      - .env
       - .dassie/.env
     depends_on:
       - db_migrate
@@ -73,7 +72,6 @@ services:
     image: ghcr.io/samvera/dassie
     user: root
     env_file:
-      - .env
       - .dassie/.env
     command: sh -l -c 'bundle && db-migrate-seed.sh'
     depends_on:

data/documentation/developing-your-hyrax-based-app.md

@@ -125,7 +125,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v3.4.2/template.rb
+rails _5.2.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v4.0.0.beta2/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/documentation/legacyREADME.md

@@ -45,12 +45,12 @@ Hyrax is a front-end based on the robust [Samvera](http://samvera.org) framework
 
 # Help
 
-The Samvera community is here to help. Please see our [support guide](./.github/SUPPORT.md).
+The Samvera community is here to help. Please see our [support guide](../.github/SUPPORT.md).
 
 # Getting started
 
 This document contains instructions specific to setting up an app with __Hyrax
-v3.4.2__. If you are looking for instructions on installing a different
+v4.0.0.beta2__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 

data/hyrax.gemspec

@@ -23,19 +23,20 @@ SUMMARY
   spec.require_paths = ["lib"]
   spec.version       = Hyrax::VERSION
   spec.license       = 'Apache-2.0'
+  spec.metadata      = { "rubygems_mfa_required" => "true" }
 
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.7'
 
   # NOTE: rails does not follow sem-ver conventions, it's
   # minor version releases can include breaking changes; see
   # http://guides.rubyonrails.org/maintenance_policy.html
-  spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'rails', '~> 6.0'
 
   spec.add_dependency 'active-fedora', '~> 13.1', '>= 13.1.2'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
-  spec.add_dependency 'blacklight', '~> 6.14'
-  spec.add_dependency 'blacklight-gallery', '~> 0.7'
+  spec.add_dependency 'blacklight', '~> 7.29'
+  spec.add_dependency 'blacklight-gallery', '~> 4.0'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
   spec.add_dependency 'browse-everything', '>= 0.16', '< 2.0'
   spec.add_dependency 'carrierwave', '~> 1.0'
@@ -51,14 +52,11 @@ SUMMARY
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'hydra-editor', '~> 5.0', ">= 5.0.4"
+  spec.add_dependency 'hydra-editor', '~> 6.0'
   spec.add_dependency 'hydra-file_characterization', '~> 1.1.2'
-  spec.add_dependency 'hydra-head', '~> 11.0', ">= 11.0.1"
+  spec.add_dependency 'hydra-head', '~> 12.0'
   spec.add_dependency 'hydra-works', '>= 0.16'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 2.0'
-  spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
-  spec.add_dependency 'jquery-ui-rails', '~> 6.0'
-  spec.add_dependency 'json-ld', '< 3.2'
   spec.add_dependency 'json-schema' # for Arkivo
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'kaminari_route_prefix', '~> 0.1.1'
@@ -69,41 +67,42 @@ SUMMARY
   spec.add_dependency 'noid-rails', '~> 3.0.0'
   spec.add_dependency 'oauth'
   spec.add_dependency 'oauth2', '~> 1.2'
+  spec.add_dependency 'openseadragon'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
-  spec.add_dependency 'psych', '~> 3.3'
   spec.add_dependency 'qa', '~> 5.5', '>= 5.5.1' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
   spec.add_dependency 'rdf-vocab', '~> 3.0'
+  spec.add_dependency 'redis', '~> 4.0'
   spec.add_dependency 'redis-namespace', '~> 1.5'
   spec.add_dependency 'redlock', '>= 0.1.2'
   spec.add_dependency 'reform', '~> 2.3'
   spec.add_dependency 'reform-rails', '~> 0.2.0'
   spec.add_dependency 'retriable', '>= 2.9', '< 4.0'
   spec.add_dependency 'samvera-nesting_indexer', '~> 2.0'
-  spec.add_dependency 'select2-rails', '~> 3.5'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 5.10'
   spec.add_dependency 'valkyrie', '~> 2', '>= 2.1.1'
+  spec.add_dependency 'sprockets', '~> 3.7'
+  spec.add_dependency 'sass-rails', '~> 6.0'
+  spec.add_dependency 'select2-rails', '~> 3.5'
 
   spec.add_development_dependency "capybara", '~> 3.29'
   spec.add_development_dependency 'capybara-screenshot', '~> 1.0'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
-  spec.add_development_dependency 'engine_cart', '~> 2.2'
+  spec.add_development_dependency 'engine_cart', '~> 2.5'
   spec.add_development_dependency "equivalent-xml", '~> 0.5'
   spec.add_development_dependency "factory_bot", '~> 4.4'
   spec.add_development_dependency 'fcrepo_wrapper', '~> 0.5', '>= 0.5.1'
-  spec.add_development_dependency "jasmine", '~> 2.3', '< 2.99'
-  spec.add_development_dependency "jasmine-core", '~> 2.3', '< 2.99'
   spec.add_development_dependency 'mida', '~> 0.3'
   spec.add_development_dependency 'okcomputer'
   spec.add_development_dependency 'pg', '~> 1.2'
   spec.add_development_dependency 'rspec-activemodel-mocks', '~> 1.0'
   spec.add_development_dependency 'rspec-its', '~> 1.1'
-  spec.add_development_dependency 'rspec-rails', '~> 3.1'
+  spec.add_development_dependency 'rspec-rails', '~> 5.0'
   spec.add_development_dependency 'rspec_junit_formatter'
-  spec.add_development_dependency "selenium-webdriver"
+  spec.add_development_dependency "selenium-webdriver", '~> 4.4'
   spec.add_development_dependency 'i18n-debug'
   spec.add_development_dependency 'i18n_yaml_sorter'
   spec.add_development_dependency 'rails-controller-testing', '~> 1'
@@ -113,11 +112,4 @@ SUMMARY
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
   spec.add_development_dependency 'webdrivers', '~> 4.4'
   spec.add_development_dependency 'webmock'
-
-  ########################################################
-  # Temporarily pinned dependencies. INCLUDE EXPLANATIONS.
-  #
-  # Pin sass-rails to 5.x because rails 5.x apps have this same dependency in their generated Gemfiles
-  # See https://github.com/samvera/hyrax/issues/3919
-  spec.add_dependency 'sass-rails', '~> 5.0'
 end