Permalink
Browse files

vendor vcap_common in all core components

* stop requring it via :path ../common
* includes a dependency on em.0.12.11.cf.3 with a fixed up
gemspec to avoid the syck::defaultkey issue.
* bump staging and stager gems after taking new dependencies
* lock 3rd party gems to minor versions in the Gemfiles

Change-Id: I92648154036f8771400578a2ac14904c2c179d6c
  • Loading branch information...
1 parent 9fde59f commit 4c8ee135ed1e52519addae25b5cff351d1888267 Patrick Bozeman committed Dec 13, 2011
Showing with 16 additions and 20 deletions.
  1. +1 −1 Gemfile
  2. +15 −19 Gemfile.lock
View
@@ -7,7 +7,7 @@ gem 'eventmachine', '~> 0.12.11.cloudfoundry.2'
gem "http_parser.rb", :require => "http/parser"
gem "yajl-ruby", :require => ["yajl", "yajl/json_gem"]
-gem 'vcap_common', :path => '../common'
+gem 'vcap_common'
gem 'vcap_logging', :require => ['vcap/logging']
group :test do
View
@@ -1,34 +1,23 @@
-PATH
- remote: ../common
- specs:
- vcap_common (0.99)
- eventmachine (~> 0.12.11.cloudfoundry.2)
- logging (>= 1.5.0)
- nats
- posix-spawn
- thin
- yajl-ruby
-
GEM
remote: http://rubygems.org/
specs:
builder (3.0.0)
ci_reporter (1.6.4)
builder (>= 2.1.2)
- daemons (1.1.2)
+ daemons (1.1.4)
diff-lcs (1.1.2)
- eventmachine (0.12.11.cloudfoundry.2)
+ eventmachine (0.12.11.cloudfoundry.3)
http_parser.rb (0.5.1)
- json_pure (1.5.1)
- little-plugger (1.1.2)
- logging (1.5.2)
+ json_pure (1.6.3)
+ little-plugger (1.1.3)
+ logging (1.6.1)
little-plugger (>= 1.1.2)
nats (0.4.10)
daemons (>= 1.1.0)
eventmachine (>= 0.12.10)
json_pure (>= 1.5.1)
posix-spawn (0.3.6)
- rack (1.3.2)
+ rack (1.3.5)
rake (0.8.7)
rcov (0.9.9)
rspec (2.5.0)
@@ -43,8 +32,15 @@ GEM
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
+ vcap_common (1.0.1)
+ eventmachine (~> 0.12.11.cloudfoundry.3)
+ logging (>= 1.5.0)
+ nats (~> 0.4.10)
+ posix-spawn (~> 0.3.6)
+ thin (~> 1.2.11)
+ yajl-ruby (~> 0.8.3)
vcap_logging (0.1.3)
- yajl-ruby (0.8.2)
+ yajl-ruby (0.8.3)
PLATFORMS
ruby
@@ -58,6 +54,6 @@ DEPENDENCIES
rake
rcov
rspec
- vcap_common!
+ vcap_common
vcap_logging
yajl-ruby

0 comments on commit 4c8ee13

Please sign in to comment.