Permalink
Browse files

General dep upgrade:

* Upgrade to rack ~> 1.5.2
* Upgrade to rjack-jetty ~> 9.0.0 (>= 9.0.0.5/v20130308 release)
* Upgrade/narrow to rjack-slf4j ~> 1.7.2, -logback ~> 1.2 (dev)
* Upgrade to json ~> 1.7.7, rspec ~> 2.13.0 (dev)
  • Loading branch information...
1 parent f252c1a commit b4837af89263bf48dae8155ab9b1e7fe80ac10cc @dekellum committed Mar 9, 2013
Showing with 27 additions and 23 deletions.
  1. +16 −16 Gemfile.lock
  2. +4 −0 History.rdoc
  3. +6 −6 fishwife.gemspec
  4. +1 −1 spec/fishwife_spec.rb
View
@@ -2,19 +2,19 @@ PATH
remote: .
specs:
fishwife (1.5.0-java)
- rack (~> 1.4.1)
- rjack-jetty (>= 7.6.7, < 9.1)
- rjack-slf4j (>= 1.6.5, < 1.8)
+ rack (~> 1.5.2)
+ rjack-jetty (~> 9.0.0, >= 9.0.0.5)
+ rjack-slf4j (~> 1.7.2)
GEM
remote: https://rubygems.org/
specs:
bouncy-castle-java (1.5.0146.1)
- diff-lcs (1.1.3)
+ diff-lcs (1.2.1)
jruby-openssl (0.8.2)
bouncy-castle-java (>= 1.5.0146.1)
json (1.7.7-java)
- rack (1.4.5)
+ rack (1.5.2)
rake (10.0.3)
rdoc (3.12.2)
json (~> 1.4)
@@ -28,21 +28,21 @@ GEM
rake (>= 0.9.2.2, < 10.1)
rdoc (~> 3.12)
rjack-maven (~> 3.0.4)
- rspec (2.8.0)
- rspec-core (~> 2.8.0)
- rspec-expectations (~> 2.8.0)
- rspec-mocks (~> 2.8.0)
- rspec-core (2.8.0)
- rspec-expectations (2.8.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.8.0)
+ rspec (2.13.0)
+ rspec-core (~> 2.13.0)
+ rspec-expectations (~> 2.13.0)
+ rspec-mocks (~> 2.13.0)
+ rspec-core (2.13.0)
+ rspec-expectations (2.13.0)
+ diff-lcs (>= 1.1.3, < 2.0)
+ rspec-mocks (2.13.0)
PLATFORMS
java
DEPENDENCIES
fishwife!
- json (~> 1.7.5)
- rjack-logback (~> 1.2)
+ json (~> 1.7.7)
+ rjack-logback (~> 1.5)
rjack-tarpit (~> 2.0)
- rspec (~> 2.8.0)
+ rspec (~> 2.13.0)
View
@@ -1,4 +1,8 @@
=== 1.5.0 (TBD)
+* Upgrade to rack ~> 1.5.2
+* Upgrade to rjack-jetty ~> 9.0.0 (>= 9.0.0.5/v20130308 release)
+* Upgrade/narrow to rjack-slf4j ~> 1.7.2, -logback ~> 1.2 (dev)
+* Upgrade to json ~> 1.7.7, rspec ~> 2.13.0 (dev)
=== 1.4.0 (2012-12-13)
* Upgrade/broaden to rjack-jetty [7.6.7,9.1). This includes 9.0.0.0
View
@@ -11,13 +11,13 @@ RJack::TarPit.specify do |s|
s.add_developer( 'David Kellum', 'dek-oss@gravitext.com' )
- s.depend 'rack', '~> 1.4.1'
- s.depend 'rjack-jetty', '>= 7.6.7', '< 9.1'
- s.depend 'rjack-slf4j', '>= 1.6.5', '< 1.8'
+ s.depend 'rack', '~> 1.5.2'
+ s.depend 'rjack-jetty', '~> 9.0.0', '>= 9.0.0.5'
+ s.depend 'rjack-slf4j', '~> 1.7.2'
- s.depend 'json', '~> 1.7.5', :dev
- s.depend 'rjack-logback', '~> 1.2', :dev
- s.depend 'rspec', '~> 2.8.0', :dev
+ s.depend 'json', '~> 1.7.7', :dev
+ s.depend 'rjack-logback', '~> 1.5', :dev
+ s.depend 'rspec', '~> 2.13.0', :dev
s.maven_strategy = :no_assembly
end
View
@@ -72,7 +72,7 @@ def post(path, params = nil, headers = {}, body = nil)
response = get("/echo")
response.code.should == "200"
content = JSON.parse(response.body)
- content["rack.version"].should == [ 1, 1 ]
+ content["rack.version"].should == [ 1, 2 ]
content["rack.multithread"].should be_true
content["rack.multiprocess"].should be_false
content["rack.run_once"].should be_false

0 comments on commit b4837af

Please sign in to comment.