Skip to content

Commit

Permalink
Merge pull request #55 from sul-dlss/dor-services-5.7.0
Browse files Browse the repository at this point in the history
upgrade dor-services to 5.7.0 to deal with empty contentMd problems
  • Loading branch information
tingulfsen committed Mar 31, 2016
2 parents 388d7eb + f91cf26 commit 6376186
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'

gem 'activesupport'
gem 'dor-services', '~> 5.5', '>= 5.5.3'
gem 'dor-services', '~> 5.7.0'
gem 'lyber-core', '~> 4.0', '>= 4.0.3'
gem 'jhove-service', '>=1.0.2'
gem 'whenever'
Expand Down
23 changes: 10 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ GEM
rdf-rdfxml (= 1.0.1)
rsolr
rubydora (~> 1.6, >= 1.6.5)
activemodel (4.2.5.2)
activesupport (= 4.2.5.2)
activemodel (4.2.6)
activesupport (= 4.2.6)
builder (~> 3.1)
activeresource (4.0.0)
activemodel (~> 4.0)
activesupport (~> 4.0)
rails-observers (~> 0.1.1)
activesupport (4.2.5.2)
activesupport (4.2.6)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
Expand Down Expand Up @@ -66,7 +66,7 @@ GEM
csv-mapper (0.5.1)
fastercsv
daemons (1.2.3)
deprecation (0.2.2)
deprecation (1.0.0)
activesupport
diff-lcs (1.2.5)
dlss-capistrano (3.2.0)
Expand All @@ -76,16 +76,16 @@ GEM
capistrano-releaseboard
docile (1.1.5)
docopt (0.5.0)
domain_name (0.5.20160216)
domain_name (0.5.20160310)
unf (>= 0.0.5, < 1.0.0)
dor-rights-auth (1.0.2)
nokogiri
dor-services (5.5.3)
dor-services (5.7.0)
active-fedora (~> 6.0)
activesupport (>= 3.2.18)
confstruct (~> 0.2.7)
dor-rights-auth (~> 1.0, >= 1.0.2)
dor-workflow-service (~> 2.0)
dor-workflow-service (~> 2.0, >= 2.0.1)
druid-tools (~> 0.4, >= 0.4.1)
equivalent-xml (~> 0.5, >= 0.5.1)
json (~> 1.8.1)
Expand All @@ -94,7 +94,6 @@ GEM
modsulator (~> 0.0.7)
net-sftp (~> 2.1)
nokogiri (~> 1.6)
nokogiri-pretty (~> 0.1)
om (~> 3.0)
rdf (~> 1.1.7)
rest-client (~> 1.7)
Expand All @@ -107,7 +106,7 @@ GEM
stanford-mods (= 1.5.3)
systemu (~> 2.6)
uuidtools (~> 2.1.4)
dor-workflow-service (2.0.0)
dor-workflow-service (2.0.1)
activesupport (>= 3.2.1, < 5)
confstruct (>= 0.2.7, < 2)
faraday (~> 0.9.2)
Expand Down Expand Up @@ -166,14 +165,12 @@ GEM
net-ssh (>= 2.6.5)
net-sftp (2.1.2)
net-ssh (>= 2.6.5)
net-ssh (3.0.2)
net-ssh (3.1.1)
netrc (0.11.0)
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
nokogiri-happymapper (0.5.9)
nokogiri (~> 1.5)
nokogiri-pretty (0.1.0)
nokogiri
nom-xml (0.5.4)
activesupport (>= 3.2.18)
i18n
Expand Down Expand Up @@ -310,7 +307,7 @@ DEPENDENCIES
capistrano (~> 3.0)
capistrano-bundler (~> 1.1)
dlss-capistrano (~> 3.1)
dor-services (~> 5.5, >= 5.5.3)
dor-services (~> 5.7.0)
jhove-service (>= 1.0.2)
lyber-core (~> 4.0, >= 4.0.3)
nokogiri
Expand Down

0 comments on commit 6376186

Please sign in to comment.