Merge b8b7edb into a546c98

projectblacklight · Oct 14, 2016 · 039487f · 039487f
2 parents a546c98 + b8b7edb
commit 039487f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,6 +15,9 @@ matrix:
       env: "RAILS_VERSION=4.2.7.1"
     - rvm: jruby-9.0.5.0
       env: "RAILS_VERSION=4.2.7.1 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+  allow_failures:
+    - rvm: jruby-9.0.5.0
+  fast_finish: true
 
 before_install:
   - gem install bundler

diff --git a/blacklight.gemspec b/blacklight.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails",     ">= 3.2.6", "< 5"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
   s.add_dependency "kaminari", ">= 0.15" # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "rsolr",     "~> 1.0.11"  # Library for interacting with rSolr.
+  s.add_dependency "rsolr", "~> 1.0", ">= 1.0.11"  # Library for interacting with rSolr.
   s.add_dependency "bootstrap-sass", "~> 3.2"
   s.add_dependency "deprecation"
 

diff --git a/lib/generators/blacklight/install_generator.rb b/lib/generators/blacklight/install_generator.rb
@@ -36,7 +36,7 @@ def install_jettywrapper
     end
 
     def add_rsolr_gem
-      gem "rsolr", "~> 1.0.6"
+      gem "rsolr", "~> 1.0"
     end
 
     def bundle_install