Merge pull request #1074 from projectblacklight/bump-dependencies

Bump dependencies

Author: jcoyne

.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
-cache: bundler
 sudo: false
 
 notifications:

lib/generators/blacklight/install_generator.rb

@@ -22,12 +22,12 @@ class Install < Rails::Generators::Base
 
     def install_jettywrapper
       return unless options[:jettywrapper]
-      gem "jettywrapper", "~> 1.7"
+      gem "jettywrapper", ">= 2.0"
 
       copy_file "config/jetty.yml"
 
       append_to_file "Rakefile",
-        "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.9.0.zip\"\n" +
+        "\nZIP_URL = \"https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip\"\n" +
         "require 'jettywrapper'\n"
     end
 

lib/generators/blacklight/templates/config/solr.yml

@@ -11,8 +11,8 @@
 # how to start up solr, generally for automated testing. 
 
 development:
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr" %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>
 test: &test
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8888}/solr" %>
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8888}/solr/blacklight-core" %>
 production:
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr" %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>

lib/generators/blacklight/test_support_generator.rb

@@ -16,9 +16,6 @@ class TestSupport < Rails::Generators::Base
 
 Also adds jetty_path key to solr.yml for selected environment, to refer
 to this install. 
-
-Requires system('unzip... ') to work, probably won't work on Windows.
-
 """
     def alternate_controller
       copy_file "alternate_controller.rb", "app/controllers/alternate_controller.rb"

tasks/blacklight.rake

@@ -1,4 +1,4 @@
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.2.zip"
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.3.zip"
 
 require 'jettywrapper'
 require 'engine_cart/rake_task'

template.demo.rb

@@ -1,4 +1,5 @@
 gem "blacklight", ">= 5.3.0"
+gem "jettywrapper", ">= 2.0"
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
 
 run "bundle install"
@@ -17,4 +18,4 @@
   rake "jetty:start"
   rake "blacklight:solr:seed"
   rake "jetty:stop"
-end
+end