From 503f46e3ca8b41e9fe68fe61cb09a6c8d80fc127 Mon Sep 17 00:00:00 2001 From: Julie Allinson Date: Thu, 30 May 2019 10:50:57 +0000 Subject: [PATCH] upgrade Hyrax to 2.5.1 --- Gemfile | 2 +- Gemfile.lock | 117 +++++++++++++++++++++++++++------------------------ 2 files changed, 64 insertions(+), 55 deletions(-) diff --git a/Gemfile b/Gemfile index d798535f4..2bc66e1d0 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ end gem 'blacklight', '~> 6.7' gem 'blacklight_oai_provider', '~> 6.0' -gem 'hyrax', '~>2.3.0' +gem 'hyrax', '~> 2.5.1' gem 'rsolr', '~> 2.0' gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index aac70891a..f9c124320 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GEM active_elastic_job (2.0.1) aws-sdk (~> 2) rails (>= 4.2) - active_encode (0.4) + active_encode (0.5.0) rails activejob (5.1.6) activesupport (= 5.1.6) @@ -54,7 +54,7 @@ GEM activemodel (= 5.1.6) activesupport (= 5.1.6) arel (~> 8.0) - activerecord-import (0.25.0) + activerecord-import (1.0.1) activerecord (>= 3.2) activerecord-nulldb-adapter (0.3.9) activerecord (>= 2.0.0) @@ -211,16 +211,30 @@ GEM dry-core (0.4.7) concurrent-ruby (~> 1.0) dry-equalizer (0.2.1) + dry-events (0.1.1) + concurrent-ruby (~> 1.0) + dry-core (~> 0.4) + dry-equalizer (~> 0.2) dry-inflector (0.1.2) dry-logic (0.4.2) dry-container (~> 0.2, >= 0.2.6) dry-core (~> 0.2) dry-equalizer (~> 0.2) - dry-struct (0.5.1) + dry-matcher (0.7.0) + dry-monads (1.2.0) + concurrent-ruby (~> 1.0) + dry-core (~> 0.4, >= 0.4.4) + dry-equalizer + dry-struct (0.6.0) dry-core (~> 0.4, >= 0.4.3) dry-equalizer (~> 0.2) dry-types (~> 0.13) ice_nine (~> 0.11) + dry-transaction (0.13.0) + dry-container (>= 0.2.8) + dry-events (>= 0.1.0) + dry-matcher (>= 0.7.0) + dry-monads (>= 0.4.0) dry-types (0.13.2) concurrent-ruby (~> 1.0) dry-container (~> 0.3) @@ -267,15 +281,15 @@ GEM activesupport (>= 4.0) flot-rails (0.0.7) jquery-rails - font-awesome-rails (4.7.0.4) - railties (>= 3.2, < 6.0) + font-awesome-rails (4.7.0.5) + railties (>= 3.2, < 6.1) globalid (0.4.1) activesupport (>= 4.2.0) - google-api-client (0.24.2) + google-api-client (0.30.0) addressable (~> 2.5, >= 2.5.1) - googleauth (>= 0.5, < 0.7.0) + googleauth (>= 0.5, < 0.10.0) httpclient (>= 2.8.1, < 3.0) - mime-types (~> 3.0) + mini_mime (~> 1.0) representable (~> 3.0) retriable (>= 2.0, < 4.0) signet (~> 0.10) @@ -283,21 +297,21 @@ GEM google-api-client (>= 0.11.0, < 1.0.0) googleauth (>= 0.5.0, < 1.0.0) nokogiri (>= 1.5.3, < 2.0.0) - googleauth (0.6.6) + googleauth (0.8.1) faraday (~> 0.12) jwt (>= 1.4, < 3.0) - memoist (~> 0.12) + memoist (~> 0.16) multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (~> 0.7) - haml (5.0.4) + haml (5.1.1) temple (>= 0.8.0) tilt hamster (3.0.0) concurrent-ruby (~> 1.0) hashdiff (0.3.4) highline (1.7.8) - hiredis (0.6.1) + hiredis (0.6.3) honeybadger (3.1.2) htmlentities (4.3.4) httmultiparty (0.3.16) @@ -305,20 +319,21 @@ GEM mimemagic multipart-post http_logger (0.5.1) - httparty (0.16.2) + httparty (0.17.0) + mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - hydra-access-controls (10.5.1) - active-fedora (>= 10.0.0, < 12) + hydra-access-controls (10.6.2) + active-fedora (>= 10.0.0, < 13) activesupport (>= 4, < 6) blacklight (>= 5.16) - blacklight-access_controls (~> 0.6) + blacklight-access_controls (~> 0.6.0) cancancan (~> 1.8) deprecation (~> 1.0) - hydra-core (10.5.1) - hydra-access-controls (= 10.5.1) + hydra-core (10.6.2) + hydra-access-controls (= 10.6.2) railties (>= 4.0.0, < 6) - hydra-derivatives (3.4.1) + hydra-derivatives (3.4.2) active-fedora (>= 11.3.1, < 13) active_encode (~> 0.1) activesupport (>= 4.0, < 6) @@ -333,23 +348,21 @@ GEM rails (>= 4.2.0, < 6) simple_form (~> 3.2) sprockets-es6 - hydra-file_characterization (0.3.3) + hydra-file_characterization (1.1.0) activesupport (>= 3.0.0) - hydra-head (10.5.1) - hydra-access-controls (= 10.5.1) - hydra-core (= 10.5.1) + hydra-head (10.6.2) + hydra-access-controls (= 10.6.2) + hydra-core (= 10.6.2) rails (>= 3.2.6) - hydra-pcdm (1.0.0) + hydra-pcdm (1.0.1) active-fedora (>= 10, < 13) - activesupport (< 5.2) mime-types (>= 1) - hydra-works (1.0.0) - activesupport (>= 4.2.10, < 5.2) + hydra-works (1.2.0) + activesupport (>= 4.2.10, < 6.0) hydra-derivatives (~> 3.0) - hydra-file_characterization (~> 0.3, >= 0.3.3) + hydra-file_characterization (~> 1.0) hydra-pcdm (>= 0.9) - om (~> 3.1) - hyrax (2.3.3) + hyrax (2.5.1) active-fedora (~> 11.5, >= 11.5.2) almond-rails (~> 0.1) awesome_nested_set (~> 3.1) @@ -361,13 +374,14 @@ GEM clipboard-rails (~> 1.5) dry-equalizer (~> 0.2) dry-struct (~> 0.1) + dry-transaction (~> 0.11) dry-validation (~> 0.9) flipflop (~> 2.3) flot-rails (~> 0.0.6) font-awesome-rails (~> 4.2) hydra-derivatives (~> 3.3) hydra-editor (>= 3.3, < 5.0) - hydra-head (>= 10.5.0) + hydra-head (>= 10.6.1) hydra-works (>= 0.16, < 2.0) iiif_manifest (>= 0.3, < 0.6) jquery-datatables-rails (~> 3.4) @@ -439,9 +453,9 @@ GEM json-ld (>= 2.2, < 4.0) multi_json (~> 1.12) rdf (>= 2.2, < 4.0) - json-schema (2.8.0) + json-schema (2.8.1) addressable (>= 2.4) - jwt (1.5.6) + jwt (2.2.1) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -520,8 +534,8 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.2) - mini_magick (4.9.2) + mimemagic (0.3.3) + mini_magick (4.9.3) mini_mime (1.0.0) mini_portile2 (2.4.0) minitest (5.11.3) @@ -533,13 +547,13 @@ GEM multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) - nest (3.1.1) + nest (3.1.2) redic - net-http-persistent (3.0.0) + net-http-persistent (3.0.1) connection_pool (~> 2.2) nio4r (2.3.1) noid (0.9.0) - noid-rails (3.0.0) + noid-rails (3.0.1) actionpack (>= 5.0.0, < 6) noid (~> 0.9) nokogiri (1.10.1) @@ -553,21 +567,16 @@ GEM faraday faraday_middleware oauth (0.5.4) - oauth2 (1.4.0) - faraday (>= 0.8, < 0.13) - jwt (~> 1.0) + oauth2 (1.4.1) + faraday (>= 0.8, < 0.16.0) + jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - om (3.1.1) - activemodel - activesupport - nokogiri (>= 1.4.2) - solrizer (~> 3.3) openseadragon (0.5.0) rails (> 3.2.0) orm_adapter (0.5.0) - os (1.0.0) + os (1.0.1) parallel (1.12.1) parser (2.4.0.2) ast (~> 2.3) @@ -578,7 +587,7 @@ GEM public_suffix (3.0.2) pul_uv_rails (2.0.1) puma (3.9.1) - qa (2.1.1) + qa (2.2.0) activerecord-import deprecation faraday @@ -678,12 +687,12 @@ GEM rdf (>= 2.2, < 4.0) rdf-xsd (2.2.1) rdf (>= 2.2, < 4.0) - redic (1.5.0) + redic (1.5.1) hiredis redis (3.3.5) redis-namespace (1.6.0) redis (>= 3.0.4) - redlock (0.2.2) + redlock (1.0.1) redis (>= 3.0.0, < 5.0) representable (3.0.4) declarative (< 0.1.0) @@ -774,7 +783,7 @@ GEM connection_pool (~> 2.2, >= 2.2.0) rack-protection (>= 1.5.0) redis (~> 3.3, >= 3.3.3) - signet (0.10.0) + signet (0.11.0) addressable (~> 2.3) faraday (~> 0.9) jwt (>= 1.5, < 3.0) @@ -833,7 +842,7 @@ GEM stomp (1.4.4) sxp (1.0.1) rdf (>= 2.2, < 4.0) - temple (0.8.0) + temple (0.8.1) term-ansicolor (1.6.0) tins (~> 1.0) terminal-table (1.8.0) @@ -843,7 +852,7 @@ GEM thread_safe (0.3.6) tilt (2.0.8) tins (1.14.0) - tinymce-rails (4.8.3) + tinymce-rails (4.9.4) railties (>= 3.1.1) turbolinks (5.0.1) turbolinks-source (~> 5) @@ -906,7 +915,7 @@ DEPENDENCIES fcrepo_wrapper (~> 0.4) flipflop (~> 2.3) honeybadger (~> 3.0) - hyrax (~> 2.3.0) + hyrax (~> 2.5.1) i18n-debug i18n-tasks is_it_working