diff --git a/Gemfile b/Gemfile index 95f855ba89..1d1b9451f2 100644 --- a/Gemfile +++ b/Gemfile @@ -29,9 +29,9 @@ gem 'terser' gem 'shakapacker' # Core Samvera -gem 'active-fedora', git: 'https://github.com/samvera/active_fedora.git', branch: 'further_along_the_rails' +gem 'active-fedora', '~> 15.0' gem 'active_fedora-datastreams', '~> 0.5' -gem 'hydra-head', git: 'https://github.com/samvera/hydra-head.git', branch: 'af_version' +gem 'hydra-head', '~> 13.0' gem 'ldp', '~> 1.1.0' gem 'noid-rails', '~> 3.2' gem 'om', git: 'https://github.com/avalonmediasystem/om.git', tag: 'v3.2.0-ruby3' diff --git a/Gemfile.lock b/Gemfile.lock index 1634a25351..c209366efe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -86,42 +86,6 @@ GIT speedy-af (0.3.0) activesupport (> 5.2) -GIT - remote: https://github.com/samvera/active_fedora.git - revision: a0b1725328a624b3106a04dacbf524275b06dd7a - branch: further_along_the_rails - specs: - active-fedora (14.0.1) - active-triples (>= 0.11.0, < 2.0.0) - activemodel (>= 6.1) - activesupport (>= 6.1) - deprecation - faraday (>= 1.0) - faraday-encoding (>= 0.0.5) - ldp (>= 0.7.0, < 2) - mutex_m - rsolr (>= 1.1.2, < 3) - ruby-progressbar (~> 1.0) - -GIT - remote: https://github.com/samvera/hydra-head.git - revision: 7bd83b51728d5706c7da3f32e86b9f6adc7047e8 - branch: af_version - specs: - hydra-access-controls (12.1.0) - active-fedora (>= 10.0.0) - activesupport (>= 6.1, < 8.0) - blacklight-access_controls (~> 6.0) - cancancan (>= 1.8, < 4) - deprecation (~> 1.0) - hydra-core (12.1.0) - hydra-access-controls (= 12.1.0) - railties (>= 6.1, < 8.0) - hydra-head (12.1.0) - hydra-access-controls (= 12.1.0) - hydra-core (= 12.1.0) - rails (>= 6.1, < 8.0) - GEM remote: https://rubygems.org/ specs: @@ -169,6 +133,17 @@ GEM erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) + active-fedora (15.0.0) + active-triples (>= 0.11.0, < 2.0.0) + activemodel (>= 6.1) + activesupport (>= 6.1) + deprecation + faraday (>= 1.0) + faraday-encoding (>= 0.0.5) + ldp (>= 0.7.0, < 2) + mutex_m + rsolr (>= 1.1.2, < 3) + ruby-progressbar (~> 1.0) active-triples (1.2.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -509,6 +484,19 @@ GEM httpclient (2.8.3) httpx (1.3.1) http-2 (>= 1.0.0) + hydra-access-controls (13.0.0) + active-fedora (>= 10.0.0) + activesupport (>= 6.1, < 8.0) + blacklight-access_controls (~> 6.0) + cancancan (>= 1.8, < 4) + deprecation (~> 1.0) + hydra-core (13.0.0) + hydra-access-controls (= 13.0.0) + railties (>= 6.1, < 8.0) + hydra-head (13.0.0) + hydra-access-controls (= 13.0.0) + hydra-core (= 13.0.0) + rails (>= 6.1, < 8.0) i18n (1.14.5) concurrent-ruby (~> 1.0) iconv (1.0.8) @@ -815,7 +803,6 @@ GEM netrc (~> 0.8) retriable (3.1.2) rexml (3.3.6) - strscan roo (2.10.1) nokogiri (~> 1) rubyzip (>= 1.3.0, < 3.0.0) @@ -953,7 +940,6 @@ GEM net-sftp (>= 2.1.2) net-ssh (>= 2.8.0) stomp (1.4.10) - strscan (3.1.0) suo (0.4.0) dalli msgpack @@ -1022,7 +1008,7 @@ PLATFORMS DEPENDENCIES about_page! - active-fedora! + active-fedora (~> 15.0) active_annotations! active_elastic_job active_encode (>= 1.2.2) @@ -1080,7 +1066,7 @@ DEPENDENCIES hashdiff (>= 1.0) hooks httpx - hydra-head! + hydra-head (~> 13.0) iconv (~> 1.0.6) iiif_manifest (~> 1.6) ims-lti (~> 1.1.13)