From 6a9e77ce9b9d7a6cb6165ad90c8e48fd18c97273 Mon Sep 17 00:00:00 2001 From: data-repo application owner <hydra@hydravm> Date: Fri, 15 Dec 2017 17:04:57 +0000 Subject: [PATCH] update gems switch to https for kaminari jettywrapper needs rubyzip ~> 1.0 --- Gemfile | 2 +- Gemfile.lock | 330 ++++++++++++++++++++++++++------------------------- 2 files changed, 171 insertions(+), 161 deletions(-) diff --git a/Gemfile b/Gemfile index 83133d9..a653126 100644 --- a/Gemfile +++ b/Gemfile @@ -60,7 +60,7 @@ end #Sufia's gems gem 'sufia', '6.6.1' -gem 'kaminari', github: 'jcoyne/kaminari', branch: 'sufia' +gem 'kaminari', git: 'https://github.com/jcoyne/kaminari.git', branch: 'sufia' gem 'rsolr', '~> 1.0.6' gem 'devise' diff --git a/Gemfile.lock b/Gemfile.lock index e28a0da..ddb030d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,5 +1,5 @@ GIT - remote: git://github.com/jcoyne/kaminari.git + remote: https://github.com/jcoyne/kaminari.git revision: 7f7108e12bdd64eb5a76177633768feb14df5453 branch: sufia specs: @@ -29,7 +29,7 @@ GEM erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - active-fedora (9.7.2) + active-fedora (9.7.3) active-triples (~> 0.7.1) activesupport (>= 4.1.0) deprecation @@ -45,7 +45,7 @@ GEM deprecation (~> 0.1) linkeddata (~> 1.1) rdf (~> 1.1) - active_fedora-noid (1.1.1) + active_fedora-noid (1.1.3) active-fedora (>= 9.7, < 11) noid (~> 0.7) activejob (4.2.6) @@ -58,7 +58,7 @@ GEM activemodel (= 4.2.6) activesupport (= 4.2.6) arel (~> 6.0) - activerecord-import (0.15.0) + activerecord-import (0.21.0) activerecord (>= 3.2) activeresource (4.1.0) activemodel (~> 4.0) @@ -71,15 +71,16 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) acts_as_follower (0.2.1) - addressable (2.3.8) + addressable (2.5.2) + public_suffix (>= 2.0.2, < 4.0) archive (0.0.6) ffi (~> 1.9.3) - arel (6.0.3) + arel (6.0.4) autoparse (0.3.3) addressable (>= 2.3.1) extlib (>= 0.9.15) multi_json (>= 1.0.0) - autoprefixer-rails (6.3.7) + autoprefixer-rails (7.2.3) execjs axiom-types (0.1.1) descendants_tracker (~> 0.0.4) @@ -88,30 +89,29 @@ GEM bcp47 (0.3.3) i18n bcrypt (3.1.11) - binding_of_caller (0.7.2) + binding_of_caller (0.7.3) debug_inspector (>= 0.0.1) - blacklight (5.18.0) + blacklight (5.19.2) bootstrap-sass (~> 3.2) deprecation kaminari (>= 0.15) nokogiri (~> 1.6) rails (>= 3.2.6, < 5) - rsolr (~> 1.0.11) + rsolr (~> 1.0, >= 1.0.11) blacklight-gallery (0.4.1) blacklight (>= 5.12, < 7) bootstrap-sass (~> 3.0) openseadragon (>= 0.2.0) rails - blacklight_advanced_search (5.2.1) + blacklight_advanced_search (5.3.1) blacklight (~> 5.15) parslet - blankslate (3.1.3) - bootstrap-sass (3.3.6) + bootstrap-sass (3.3.7) autoprefixer-rails (>= 5.2.1) sass (>= 3.3.4) - bootstrap_form (2.4.0) + bootstrap_form (2.7.0) breadcrumbs_on_rails (2.3.1) - browse-everything (0.10.3) + browse-everything (0.10.5) bootstrap-sass dropbox-sdk (>= 1.6.2) font-awesome-rails @@ -122,12 +122,12 @@ GEM ruby-box sass-rails skydrive - builder (3.2.2) - byebug (9.0.5) - cancancan (1.15.0) - capybara (2.7.1) + builder (3.2.3) + byebug (9.1.0) + cancancan (1.17.0) + capybara (2.16.1) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) @@ -138,7 +138,7 @@ GEM json (>= 1.7) mime-types (>= 1.16) mimemagic (>= 0.3.0) - childprocess (0.5.9) + childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) clamav (0.4.1) cliver (0.3.2) @@ -150,17 +150,19 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) - coveralls (0.8.14) + coffee-script-source (1.12.2) + concurrent-ruby (1.0.5) + coveralls (0.8.21) json (>= 1.8, < 3) - simplecov (~> 0.12.0) + simplecov (~> 0.14.1) term-ansicolor (~> 1.3) - thor (~> 0.19.1) - tins (~> 1.6.0) - daemons (1.2.3) - database_cleaner (1.5.3) - debug_inspector (0.0.2) - deprecation (0.2.2) + thor (~> 0.19.4) + tins (~> 1.6) + crass (1.0.3) + daemons (1.2.5) + database_cleaner (1.6.2) + debug_inspector (0.0.3) + deprecation (0.99.0) activesupport descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) @@ -171,13 +173,13 @@ GEM responders thread_safe (~> 0.1) warden (~> 1.2.3) - devise-guests (0.5.0) + devise-guests (0.6.0) devise devise-multi_auth (0.2.0) devise (~> 3.2) omniauth (~> 1.2) rails (~> 4.0) - diff-lcs (1.2.5) + diff-lcs (1.3) docile (1.1.5) dropbox-sdk (1.6.5) json @@ -192,28 +194,26 @@ GEM erubis (2.7.0) execjs (2.7.0) extlib (0.9.16) - ezid-client (1.5.0) + ezid-client (1.7.1) hashie (~> 3.4, >= 3.4.3) - factory_girl (4.7.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - ffi (1.9.14) + ffi (1.9.18) figaro (1.1.1) thor (~> 0.14) - font-awesome-rails (4.6.3.1) - railties (>= 3.2, < 5.1) - foreigner (1.7.4) - activerecord (>= 3.0.0) + font-awesome-rails (4.7.0.2) + railties (>= 3.2, < 5.2) gelf (3.0.0) json - globalid (0.3.6) - activesupport (>= 4.1.0) - google-api-client (0.8.6) - activesupport (>= 3.2) + globalid (0.4.1) + activesupport (>= 4.2.0) + google-api-client (0.8.7) + activesupport (>= 3.2, < 5.0) addressable (~> 2.3) autoparse (~> 0.3) extlib (~> 0.9) @@ -238,15 +238,14 @@ GEM signet (~> 0.7) haml (4.0.7) tilt - hashie (3.4.4) + hashie (3.5.6) htmlentities (4.3.4) httmultiparty (0.3.16) httparty (>= 0.7.3) mimemagic multipart-post http_logger (0.5.1) - httparty (0.13.7) - json (~> 1.8) + httparty (0.15.6) multi_xml (>= 0.5.2) hydra-access-controls (9.5.0) active-fedora (~> 9.0) @@ -258,10 +257,11 @@ GEM hydra-batch-edit (1.1.1) blacklight hydra-collections - hydra-collections (5.0.3) + hydra-collections (5.0.4) blacklight (~> 5.10) deprecation (~> 0.1) hydra-head (~> 9.1) + rdf-vocab (~> 0) hydra-core (9.5.0) active-fedora (~> 9.1) hydra-access-controls (= 9.5.0) @@ -285,34 +285,35 @@ GEM hydra-access-controls (= 9.5.0) hydra-core (= 9.5.0) rails (>= 3.2.6) - hydra-role-management (0.2.2) + hydra-role-management (1.0.0) blacklight bootstrap_form cancancan - i18n (0.7.0) + i18n (0.9.1) + concurrent-ruby (~> 1.0) ice_nine (0.11.2) - jbuilder (2.5.0) - activesupport (>= 3.0.0, < 5.1) - multi_json (~> 1.2) - jettywrapper (2.0.3) + jbuilder (2.7.0) + activesupport (>= 4.2.0) + multi_json (>= 1.2) + jettywrapper (2.0.4) activesupport (>= 3.0.0) childprocess i18n logger - rubyzip - jquery-rails (4.1.1) + rubyzip (~> 1.0) + jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.5) + jquery-ui-rails (6.0.1) railties (>= 3.2.16) - json (1.8.3) + json (1.8.6) json-ld (1.99.2) multi_json (~> 1.11) rdf (~> 1.99) - json-schema (2.6.2) - addressable (~> 2.3.8) - jwt (1.5.4) + json-schema (2.8.0) + addressable (>= 2.4) + jwt (1.5.6) launchy (2.4.3) addressable (~> 2.3) ldp (0.4.1) @@ -346,51 +347,52 @@ GEM sparql-client (~> 1.99) little-plugger (1.1.4) logger (1.2.8) - logging (2.1.0) + logging (2.2.2) little-plugger (~> 1.1) multi_json (~> 1.10) - lograge (0.4.1) - actionpack (>= 4, < 5.1) - activesupport (>= 4, < 5.1) - railties (>= 4, < 5.1) - loofah (2.0.3) + lograge (0.7.1) + actionpack (>= 4, < 5.2) + activesupport (>= 4, < 5.2) + railties (>= 4, < 5.2) + request_store (~> 1.0) + loofah (2.1.1) + crass (~> 1.0.2) nokogiri (>= 1.5.9) - mail (2.6.4) - mime-types (>= 1.16, < 4) - mail_form (1.5.1) - actionmailer (>= 3.2, < 5) - activemodel (>= 3.2, < 5) - mailboxer (0.13.0) + mail (2.7.0) + mini_mime (>= 0.1.1) + mail_form (1.7.0) + actionmailer (>= 3.2, < 5.2) + activemodel (>= 3.2, < 5.2) + mailboxer (0.14.0) carrierwave (>= 0.5.8) - foreigner (>= 0.9.1) - rails (>= 3.2.0) + rails (>= 4.2.0) mappy (0.1.0) activesupport - memoist (0.14.0) + memoist (0.16.0) mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mimemagic (0.3.1) - mini_magick (4.5.1) - mini_portile2 (2.1.0) - minitest (5.9.0) + mimemagic (0.3.2) + mini_magick (4.8.0) + mini_mime (1.0.0) + mini_portile2 (2.3.0) + minitest (5.10.3) mono_logger (1.1.0) - multi_json (1.12.1) - multi_xml (0.5.5) + multi_json (1.12.2) + multi_xml (0.6.0) multipart-post (2.0.0) nest (1.1.2) redis net-http-persistent (2.9.4) - net-ldap (0.15.0) + net-ldap (0.16.1) noid (0.9.0) - nokogiri (1.6.8) - mini_portile2 (~> 2.1.0) - pkg-config (~> 1.1.7) - nom-xml (0.5.4) + nokogiri (1.8.1) + mini_portile2 (~> 2.3.0) + nom-xml (0.6.0) activesupport (>= 3.2.18) i18n nokogiri - oauth (0.5.1) + oauth (0.5.4) oauth2 (0.9.4) faraday (>= 0.8, < 0.10) jwt (~> 1.0) @@ -402,13 +404,13 @@ GEM activesupport nokogiri (>= 1.4.2) solrizer (~> 3.3) - omniauth (1.2.2) - hashie (>= 1.2, < 4) - rack (~> 1.0) - omniauth-cas (1.1.0) + omniauth (1.7.1) + hashie (>= 3.4.6, < 3.6.0) + rack (>= 1.6.2, < 3) + omniauth-cas (1.1.1) addressable (~> 2.3) nokogiri (~> 1.5) - omniauth (~> 1.2.0) + omniauth (~> 1.2) omniauth-oauth2 (1.1.2) faraday (>= 0.8, < 0.10) multi_json (~> 1.3) @@ -416,7 +418,7 @@ GEM omniauth (~> 1.2) omniauth-orcid (1.0.15) omniauth-oauth2 (~> 1.1) - openseadragon (0.2.1) + openseadragon (0.4.0) rails (> 3.2.0) orcid (0.9.1) devise-multi_auth (~> 0.1) @@ -429,17 +431,16 @@ GEM virtus orm_adapter (0.5.0) os (0.9.6) - parslet (1.7.1) - blankslate (>= 2.0, <= 4.0) - pg (0.18.4) + parslet (1.8.1) + pg (0.21.0) phantomjs (2.1.1.0) - pkg-config (1.1.7) - poltergeist (1.10.0) + poltergeist (1.17.0) capybara (~> 2.1) cliver (~> 0.3.1) websocket-driver (>= 0.2.0) - posix-spawn (0.3.11) - rack (1.6.4) + posix-spawn (0.3.13) + public_suffix (3.0.1) + rack (1.6.8) rack-protection (1.5.3) rack rack-test (0.6.3) @@ -457,15 +458,15 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) rails-helper (0.1.0) rails-html-sanitizer (1.0.3) loofah (~> 2.0) - rails-observers (0.1.2) - activemodel (~> 4.0) + rails-observers (0.1.5) + activemodel (>= 4.0) rails_autolink (1.1.6) rails (> 3.1) railties (4.2.6) @@ -473,7 +474,10 @@ GEM activesupport (= 4.2.6) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (11.2.2) + rake (12.3.0) + rb-fsevent (0.10.2) + rb-inotify (0.9.10) + ffi (>= 0.5.0, < 2) rdf (1.99.1) link_header (~> 0.0, >= 0.0.8) rdf-aggregate-repo (1.99.0) @@ -525,16 +529,17 @@ GEM rdf (~> 1.1, >= 1.1.10) rdf-xsd (1.99.0) rdf (~> 1.99) - rdoc (4.2.2) - json (~> 1.4) - redis (3.3.0) - redis-namespace (1.5.2) - redis (~> 3.0, >= 3.0.4) + rdoc (4.3.0) + redis (3.3.5) + redis-namespace (1.6.0) + redis (>= 3.0.4) redlock (0.1.8) redis (~> 3, >= 3.0.0) - responders (2.2.0) - railties (>= 4.2.0, < 5.1) - resque (1.26.0) + request_store (1.3.2) + responders (2.4.0) + actionpack (>= 4.2.0, < 5.3) + railties (>= 4.2.0, < 5.3) + resque (1.27.4) mono_logger (~> 1.0) multi_json (~> 1.0) redis-namespace (~> 1.3) @@ -546,55 +551,59 @@ GEM retriable (1.4.1) rsolr (1.0.13) builder (>= 2.1.2) - rspec-core (3.5.1) - rspec-support (~> 3.5.0) - rspec-expectations (3.5.0) + rspec-core (3.7.0) + rspec-support (~> 3.7.0) + rspec-expectations (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-mocks (3.5.0) + rspec-support (~> 3.7.0) + rspec-mocks (3.7.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.5.0) - rspec-rails (3.5.1) + rspec-support (~> 3.7.0) + rspec-rails (3.7.2) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.5.0) - rspec-expectations (~> 3.5.0) - rspec-mocks (~> 3.5.0) - rspec-support (~> 3.5.0) - rspec-support (3.5.0) + rspec-core (~> 3.7.0) + rspec-expectations (~> 3.7.0) + rspec-mocks (~> 3.7.0) + rspec-support (~> 3.7.0) + rspec-support (3.7.0) ruby-box (1.15.0) addressable json multipart-post oauth2 - rubyzip (1.2.0) - sass (3.4.22) - sass-rails (5.0.5) + rubyzip (1.2.1) + sass (3.5.3) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) + sass-rails (5.0.7) railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) + sdoc (0.4.2) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) select2-rails (3.5.10) thor (~> 0.14) - signet (0.7.3) + signet (0.8.1) addressable (~> 2.3) faraday (~> 0.9) - jwt (~> 1.5) + jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simple_form (3.1.1) actionpack (~> 4.0) activemodel (~> 4.0) - simplecov (0.12.0) + simplecov (0.14.1) docile (~> 1.1.0) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) - simplecov-html (0.10.0) - sinatra (1.4.7) + simplecov-html (0.10.2) + sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) tilt (>= 1.3, < 3) @@ -603,8 +612,8 @@ GEM httmultiparty httparty (>= 0.11.0) oauth2 (>= 0.9.2) - slop (4.3.0) - solrizer (3.4.0) + slop (4.6.1) + solrizer (3.4.1) activesupport daemons nokogiri @@ -621,15 +630,16 @@ GEM sparql-client (1.99.0) net-http-persistent (~> 2.9) rdf (~> 1.1) - spring (1.7.2) + spring (2.0.2) + activesupport (>= 4.2) sprockets (3.3.5) rack (> 1, < 3) sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.11) - stomp (1.4.1) + sqlite3 (1.3.13) + stomp (1.4.4) sufia (6.6.1) blacklight (~> 5.16) blacklight-gallery (~> 0.1) @@ -674,23 +684,23 @@ GEM resque (~> 1.23) resque-pool (~> 0.3) sxp (0.1.5) - term-ansicolor (1.3.2) + term-ansicolor (1.6.0) tins (~> 1.0) - thor (0.19.1) - thread_safe (0.3.5) - tilt (2.0.5) - tins (1.6.0) - tinymce-rails (4.4.0) + thor (0.19.4) + thread_safe (0.3.6) + tilt (2.0.8) + tins (1.16.3) + tinymce-rails (4.7.4) railties (>= 3.1.1) - tinymce-rails-imageupload (4.0.17.beta) + tinymce-rails-imageupload (4.0.17.beta.3) railties (>= 3.2, < 6) tinymce-rails (~> 4.0) - turbolinks (5.0.0) + turbolinks (5.0.1) turbolinks-source (~> 5) - turbolinks-source (5.0.0) - tzinfo (1.2.2) + turbolinks-source (5.0.3) + tzinfo (1.2.4) thread_safe (~> 0.1) - uglifier (3.0.0) + uglifier (4.0.2) execjs (>= 0.3.0, < 3) vegas (0.1.11) rack (>= 1.0.0) @@ -699,23 +709,23 @@ GEM coercible (~> 1.0) descendants_tracker (~> 0.0, >= 0.0.3) equalizer (~> 0.0, >= 0.0.9) - warden (1.2.6) + warden (1.2.7) rack (>= 1.0) web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) - websocket-driver (0.6.4) + websocket-driver (0.7.0) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.2) + websocket-extensions (0.1.3) xml-simple (1.1.5) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) - xray-rails (0.2.0) + xray-rails (0.3.1) rails (>= 3.1.0) - yaml_db (0.4.0) - rails (>= 3.0, < 5.1) + yaml_db (0.6.0) + rails (>= 3.0, < 5.2) rake (>= 0.8.7) PLATFORMS @@ -765,4 +775,4 @@ DEPENDENCIES xray-rails BUNDLED WITH - 1.15.4 + 1.16.0 -- GitLab