Merge 24e0a7d into 2b50d9e

sul-dlss · Jun 7, 2018 · 1b102be · 1b102be
2 parents 2b50d9e + 24e0a7d
commit 1b102be
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 31 deletions.
diff --git a/Gemfile b/Gemfile
@@ -35,7 +35,7 @@ gem 'net-http-persistent', '~> 2.9'
 gem 'marc'
 
 # DLSS/domain-specific dependencies
-gem 'dor-services', '~> 5.12'
+gem 'dor-services', '~> 5.31'
 gem 'lyber-core', '>= 2.0.2'
 gem 'workflow-archiver', '~> 2.0'
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -64,7 +64,7 @@ GEM
       bundler (~> 1.2)
       thor (~> 0.18)
     byebug (10.0.2)
-    capistrano (3.10.2)
+    capistrano (3.11.0)
       airbrussh (>= 1.0.0)
       i18n
       rake (>= 10.0.0)
@@ -80,13 +80,13 @@ GEM
     capistrano-passenger (0.2.0)
       capistrano (~> 3.0)
     capistrano-shared_configs (0.2.2)
-    capybara (3.0.2)
+    capybara (3.2.1)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      xpath (~> 3.0)
+      xpath (~> 3.1)
     concurrent-ruby (1.0.5)
     config (1.7.0)
       activesupport (>= 3.0)
@@ -115,9 +115,9 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dor-rights-auth (1.3.0)
       nokogiri
-    dor-services (5.29.0)
-      active-fedora (>= 6.0, < 9.a)
-      activesupport (>= 3.2.18)
+    dor-services (5.31.0)
+      active-fedora (>= 7.0, < 9.a)
+      activesupport (>= 4.2.10, < 5.2.0)
       confstruct (~> 0.2.7)
       dor-rights-auth (~> 1.0, >= 1.2.0)
       dor-workflow-service (~> 2.0, >= 2.0.1)
@@ -134,7 +134,7 @@ GEM
       rsolr (>= 1.0.3, < 3)
       ruby-cache (~> 0.3.0)
       ruby-graphviz
-      rubydora (~> 1.6, >= 1.6.5)
+      rubydora (~> 2.1)
       solrizer (~> 3.0)
       stanford-mods (>= 2.3.1)
       stanford-mods-normalizer (~> 0.1)
@@ -153,38 +153,38 @@ GEM
     dry-container (0.6.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.5)
+    dry-core (0.4.6)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.2.1)
+    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-types (0.12.2)
+    dry-types (0.13.2)
       concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1)
       dry-container (~> 0.3)
-      dry-core (~> 0.2, >= 0.2.1)
+      dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.2)
+      dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 0.4, >= 0.4.2)
-      inflecto (~> 0.0.0, >= 0.0.2)
-    dry-validation (0.11.1)
+    dry-validation (0.12.0)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
       dry-core (~> 0.2, >= 0.2.1)
       dry-equalizer (~> 0.2)
       dry-logic (~> 0.4, >= 0.4.0)
-      dry-types (~> 0.12.0)
+      dry-types (~> 0.13.1)
     edtf (3.0.4)
       activesupport (>= 3.0, < 6.0)
     equivalent-xml (0.6.0)
       nokogiri (>= 1.4.3)
     erubi (1.7.1)
     erubis (2.7.0)
     fakeweb (1.3.0)
-    faraday (0.15.0)
+    faraday (0.15.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23)
+    ffi (1.9.25)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
     haml (4.0.7)
@@ -197,8 +197,8 @@ GEM
       domain_name (~> 0.5)
     i18n (1.0.1)
       concurrent-ruby (~> 1.0)
-    inflecto (0.0.2)
     iso-639 (0.2.8)
+    jaro_winkler (1.5.1)
     json (2.1.0)
     link_header (0.0.8)
     listen (3.0.8)
@@ -222,7 +222,7 @@ GEM
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    moab-versioning (4.2.1)
+    moab-versioning (4.2.2)
       confstruct
       druid-tools (>= 1.0.0)
       json
@@ -239,9 +239,9 @@ GEM
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (4.2.0)
+    net-ssh (5.0.1)
     netrc (0.11.0)
-    nio4r (2.3.0)
+    nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     nokogiri-happymapper (0.6.0)
@@ -324,7 +324,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retries (0.0.5)
-    rsolr (2.1.0)
+    rsolr (2.2.1)
       builder (>= 2.1.2)
       faraday (>= 0.9.0)
     rspec-core (3.7.1)
@@ -344,21 +344,22 @@ GEM
       rspec-mocks (~> 3.7.0)
       rspec-support (~> 3.7.0)
     rspec-support (3.7.1)
-    rubocop (0.55.0)
+    rubocop (0.57.1)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5)
       powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.25.1)
+    rubocop-rspec (1.26.0)
       rubocop (>= 0.53.0)
     ruby-cache (0.3.0)
     ruby-graphviz (1.2.3)
     ruby-oci8 (2.2.5.1)
     ruby-progressbar (1.9.0)
-    rubydora (1.9.1)
-      activemodel
+    rubydora (2.1.0)
+      activemodel (>= 4.2.10)
       activesupport
       deprecation
       equivalent-xml
@@ -367,7 +368,7 @@ GEM
       nokogiri
       rest-client
     scrub_rb (1.0.1)
-    sequel (5.7.1)
+    sequel (5.9.0)
     simplecov (0.14.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
@@ -391,7 +392,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sshkit (1.16.0)
+    sshkit (1.16.1)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
     stanford-mods (2.5.1)
@@ -413,7 +414,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.4.0)
     uuidtools (2.1.5)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
@@ -424,7 +425,7 @@ GEM
       lyber-core
       sequel
     xml-simple (1.1.5)
-    xpath (3.0.0)
+    xpath (3.1.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -440,7 +441,7 @@ DEPENDENCIES
   config
   coveralls (~> 0.8)
   dlss-capistrano
-  dor-services (~> 5.12)
+  dor-services (~> 5.31)
   equivalent-xml
   erubis
   fakeweb