Upgrade to dor-services 7

Gemfile

@@ -15,7 +15,7 @@ gem 'whenever', '~> 0.9'
 
 # Stanford stuff
 gem 'assembly-objectfile', '~> 1.5'
-gem 'dor-services', '~> 6.1', require: false
+gem 'dor-services', '~> 7.1'
 gem 'dor-services-client', '~> 1.1'
 gem 'rubydora', '~> 2.1'
 gem 'bagit', '~> 0.4'

Gemfile.lock

@@ -173,24 +173,22 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     dor-rights-auth (1.3.0)
       nokogiri
-    dor-services (6.8.0)
+    dor-services (7.1.0)
       active-fedora (>= 8.7.0, < 9)
-      activesupport (>= 4.2.10, < 6.0.0)
+      activesupport (~> 5.1)
       confstruct (~> 0.2.7)
       deprecation (~> 0)
       dor-rights-auth (~> 1.0, >= 1.2.0)
       dor-services-client (~> 1.5)
-      dor-workflow-service (~> 2.11)
+      dor-workflow-client (~> 3.0)
       druid-tools (>= 0.4.1)
-      equivalent-xml (~> 0.5, >= 0.5.1)
       json (>= 1.8.1)
       moab-versioning (~> 4.0)
-      net-sftp (~> 2.1)
       nokogiri (~> 1.6)
       om (~> 3.0)
       rdf (~> 1.1, >= 1.1.7)
       rest-client (>= 1.7, < 3)
-      retries
+      retries (~> 0.0.5)
       rsolr (>= 1.0.3, < 3)
       ruby-cache (~> 0.3.0)
       rubydora (~> 2.1)
@@ -204,6 +202,13 @@ GEM
       faraday (~> 0.15)
       moab-versioning (~> 4.0)
       nokogiri (~> 1.8)
+    dor-workflow-client (3.0.0)
+      activesupport (>= 3.2.1, < 6)
+      confstruct (>= 0.2.7, < 2)
+      faraday (~> 0.9, >= 0.9.2)
+      faraday_middleware
+      net-http-persistent (>= 2.9.4, < 4.a)
+      nokogiri (~> 1.6)
     dor-workflow-service (2.12.0)
       activesupport (>= 3.2.1, < 6)
       confstruct (>= 0.2.7, < 2)
@@ -255,6 +260,8 @@ GEM
       railties (>= 4.2.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.13.1)
+      faraday (>= 0.7.4, < 1.0)
     ffi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
@@ -334,8 +341,6 @@ GEM
     net-http-persistent (2.9.4)
     net-scp (2.0.0)
       net-ssh (>= 2.6.5, < 6.0.0)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
     net-ssh (5.2.0)
     netrc (0.11.0)
     nio4r (2.3.1)
@@ -571,7 +576,7 @@ DEPENDENCIES
   devise (~> 4.0)
   devise-remote-user (~> 1.0)
   dlss-capistrano
-  dor-services (~> 6.1)
+  dor-services (~> 7.1)
   dor-services-client (~> 1.1)
   dor-workflow-service
   dynamic_form

config/initializers/dor_config.rb

@@ -40,7 +40,6 @@
   end
 
   solr.url Settings.solr.url
-  sdr.url Settings.sdr.url
 
   hydrus do
     initial_apo_title 'Intial Hydrus APO title'

config/initializers/load_models.rb

@@ -1,5 +1,5 @@
 # Dor-services already has defined the model constants, so we need to
 # explicitly require them here
-require_dependency Rails.root + 'app/models/hydrus/collection.rb'
-require_dependency Rails.root + 'app/models/hydrus/item.rb'
-require_dependency Rails.root + 'app/models/hydrus/admin_policy_object.rb'
+# require_dependency Rails.root + 'app/models/hydrus/collection.rb'
+# require_dependency Rails.root + 'app/models/hydrus/item.rb'
+# require_dependency Rails.root + 'app/models/hydrus/admin_policy_object.rb'

config/initializers/rights_overrides.rb

@@ -1,8 +1,6 @@
 module Dor
-  module Publishable
+  class Abstract
     # need to override if we want to use the Hydra access permissions code
-    included do
-      has_metadata name: 'rightsMetadata', type: Hydra::Datastream::RightsMetadata, label: 'Rights Metadata'
-    end
+    has_metadata name: 'rightsMetadata', type: Hydra::Datastream::RightsMetadata, label: 'Rights Metadata'
   end
 end

config/settings.yml

@@ -33,10 +33,7 @@ stacks:
 
 solr:
   url: 'https://solr.example.com/solr/collection'
-
-sdr:
-  url: 'https://sdr.example.com/solr/collection'
-
+
 suri:
   url: 'http://localhost:3002'
   user: ~

lib/tasks/fixtures.rake

@@ -169,13 +169,13 @@ namespace :hydrus do
       # Push content up to the WF service.
       resp = [druid, hwf]
       begin
-        resp << Dor::WorkflowService.delete_workflow(repo, druid, hwf)
+        resp << Dor::Config.workflow.client.delete_workflow(repo, druid, hwf)
       rescue Faraday::ResourceNotFound
         logger.info "Delete workflow for #{druid} returned 404"
       end
-      resp << Dor::WorkflowService.create_workflow(repo, druid, hwf, xml)
+      resp << Dor::Config.workflow.client.create_workflow(repo, druid, hwf, xml)
       resp << vwf
-      resp << Dor::WorkflowService.delete_workflow(repo, druid, vwf)
+      resp << Dor::Config.workflow.client.delete_workflow(repo, druid, vwf)
       puts resp.inspect
     end
   end