Skip to content

Commit

Permalink
update the cavin version to 0.7.x branch
Browse files Browse the repository at this point in the history
ammend lock files

Fixes elastic#2409
  • Loading branch information
Pere Urbon-Bayes authored and jordansissel committed Jan 26, 2015
1 parent cd414f1 commit ba8e4d0
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 14 deletions.
2 changes: 1 addition & 1 deletion logstash.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
gem.version = LOGSTASH_VERSION

# Core dependencies
gem.add_runtime_dependency "cabin", [">=0.6.0"] #(Apache 2.0 license)
gem.add_runtime_dependency "cabin", [">=0.7.0"] #(Apache 2.0 license)
gem.add_runtime_dependency "pry" #(Ruby license)
gem.add_runtime_dependency "stud" #(Apache 2.0 license)
gem.add_runtime_dependency "clamp" #(MIT license) for command line args/flags
Expand Down
8 changes: 4 additions & 4 deletions tools/Gemfile.jruby-1.9.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
PATH
remote: /Users/ph/es/logstash
remote: /Users/purbon/work/logstash
specs:
logstash (2.0.0.dev-java)
cabin (>= 0.6.0)
cabin (>= 0.7.0)
ci_reporter (= 1.9.3)
clamp
file-dependencies
Expand Down Expand Up @@ -34,7 +34,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
backports (3.6.4)
builder (3.2.2)
cabin (0.6.1)
cabin (0.7.1)
ci_reporter (1.9.3)
builder (>= 2.1.2)
clamp (0.6.3)
Expand Down Expand Up @@ -108,7 +108,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
virtus (1.0.3)
virtus (1.0.4)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
Expand Down
23 changes: 14 additions & 9 deletions tools/Gemfile.plugins.test.jruby-1.9.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ PATH
remote: /Users/ph/es/logstash
specs:
logstash (2.0.0.dev-java)
cabin (>= 0.6.0)
cabin (>= 0.7.0)
ci_reporter (= 1.9.3)
clamp
file-dependencies
filesize
ftw (~> 0.0.40)
i18n (= 0.6.9)
insist (= 1.0.0)
jar-dependencies (= 0.1.2)
jrjackson
jruby-httpclient
Expand All @@ -33,7 +34,7 @@ GEM
thread_safe (~> 0.3, >= 0.3.1)
backports (3.6.4)
builder (3.2.2)
cabin (0.6.1)
cabin (0.7.1)
ci_reporter (1.9.3)
builder (>= 2.1.2)
clamp (0.6.3)
Expand All @@ -45,6 +46,9 @@ GEM
diff-lcs (1.2.5)
equalizer (0.0.9)
ffi (1.9.6-java)
file-dependencies (0.1.4)
minitar
filesize (0.0.4)
ftw (0.0.42)
addressable
backports (>= 2.6.2)
Expand All @@ -58,19 +62,20 @@ GEM
jar-dependencies (0.1.2)
jls-grok (0.11.0)
cabin (>= 0.6.0)
jrjackson (0.2.7)
jrjackson (0.2.8)
jruby-httpclient (1.1.1-java)
logstash-codec-json (0.1.3)
logstash-codec-json (0.1.5)
logstash (>= 1.4.0, < 2.0.0)
logstash-codec-json_lines (0.1.3)
logstash-codec-json_lines (0.1.5)
logstash (>= 1.4.0, < 2.0.0)
logstash-codec-line
logstash-codec-line (0.1.3)
logstash (>= 1.4.0, < 2.0.0)
logstash-codec-plain (0.1.3)
logstash (>= 1.4.0, < 2.0.0)
logstash-devutils (0.0.6-java)
logstash-devutils (0.0.7-java)
gem_publisher
insist (= 1.0.0)
jar-dependencies
minitar
rake
Expand Down Expand Up @@ -102,7 +107,7 @@ GEM
logstash-output-stdout (0.1.2)
logstash (>= 1.4.0, < 2.0.0)
logstash-codec-line
logstash-patterns-core (0.1.2)
logstash-patterns-core (0.1.4)
logstash (>= 1.4.0, < 2.0.0)
maven-tools (1.0.7)
virtus (~> 1.0)
Expand Down Expand Up @@ -144,7 +149,7 @@ GEM
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
virtus (1.0.3)
virtus (1.0.4)
axiom-types (~> 0.1)
coercible (~> 1.0)
descendants_tracker (~> 0.0, >= 0.0.3)
Expand Down

0 comments on commit ba8e4d0

Please sign in to comment.