diff --git a/Gemfile b/Gemfile index 9a79b0530..268a4f573 100644 --- a/Gemfile +++ b/Gemfile @@ -20,7 +20,7 @@ gem 'whenever', '~> 0.9' gem 'assembly-objectfile', '~> 1.5' # We don't require this by default, because we need it to load after hydrus models # or we'll get a superclass mismatch for Hydrus::Item -gem 'dor-services', '~> 8.0', require: false +gem 'dor-services', '~> 9.0', require: false gem 'dor-services-client', '~> 6.0' gem 'dor-workflow-client', '~> 3.22' gem 'rubydora', '~> 2.1' diff --git a/Gemfile.lock b/Gemfile.lock index d4e998de7..72cae47d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -179,19 +179,16 @@ GEM unf (>= 0.0.5, < 1.0.0) dor-rights-auth (1.4.0) nokogiri - dor-services (8.6.0) + dor-services (9.5.0) active-fedora (>= 8.7.0, < 9) activesupport (~> 5.1) deprecation (~> 0) dor-rights-auth (~> 1.0, >= 1.2.0) - dor-workflow-client (~> 3.1) - druid-tools (>= 0.4.1) json (>= 1.8.1) nokogiri (~> 1.6) om (~> 3.0) rdf (~> 1.1, >= 1.1.7) rest-client (>= 1.7, < 3) - retries (~> 0.0.5) rsolr (>= 1.0.3, < 3) rubydora (~> 2.1) solrizer (~> 3.0) @@ -443,7 +440,6 @@ GEM http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 4.0) netrc (~> 0.8) - retries (0.0.5) rsolr (2.3.0) builder (>= 2.1.2) faraday (>= 0.9.0) @@ -586,7 +582,7 @@ DEPENDENCIES devise (~> 4.0) devise-remote-user (~> 1.0) dlss-capistrano - dor-services (~> 8.0) + dor-services (~> 9.0) dor-services-client (~> 6.0) dor-workflow-client (~> 3.22) dynamic_form diff --git a/config/initializers/dor_config.rb b/config/initializers/dor_config.rb index e283f8a92..a322aa79f 100644 --- a/config/initializers/dor_config.rb +++ b/config/initializers/dor_config.rb @@ -18,16 +18,11 @@ end end - workflow do - url Settings.workflow.url - timeout Settings.workflow.timeout + solr do + url Settings.solr.url end - solr.url Settings.solr.url - stacks do - document_cache_host Settings.stacks.document_cache_host local_workspace_root Settings.stacks.local_workspace_root - local_stacks_root Settings.stacks.local_stacks_root end end