github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Upgrade jruby-elasticsearch

Browse source
This commit is contained in:
Jordan Sissel 2012-06-01 09:55:20 -07:00
parent 4aeed4d047
commit 5cb6d8fef2
3 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -7,9 +7,7 @@ gem "uuidtools" # for naming amqp queues, License ???
gem "filewatch", "0.3.3" # for file tailing, BSD License
gem "jls-grok", "0.10.6" # for grok filter, BSD License
gem "aws-sdk" # for AWS access: SNS and S3 log tailing. Apache 2.0 License
#gem "lusis-jruby-elasticsearch", "0.0.13", :platforms => :jruby # BSD License
# Placeholder so master ES works until @jordansissel push a new jruby-elasticsearch
gem "lusis-jruby-elasticsearch", "0.0.13", :platforms => :jruby # BSD License
gem "jruby-elasticsearch", "0.0.13", :platforms => :jruby # BSD License
gem "onstomp" # for stomp protocol, Apache 2.0 License
gem "json" # Ruby license
#gem "awesome_print" # MIT License

47
Gemfile.lock
View file

@ -2,7 +2,7 @@ GEM
remote: http://rubygems.org/
specs:
addressable (2.2.6)
aws-sdk (1.4.1)
aws-sdk (1.5.2)
httparty (~> 0.7)
json (~> 1.4)
nokogiri (>= 1.4.4)
@ -10,16 +10,15 @@ GEM
backports (2.3.0)
beefcake (0.3.7)
bouncy-castle-java (1.5.0146.1)
bson (1.6.2)
bson (1.6.2-java)
bunny (0.7.9)
cabin (0.4.1)
json
ffi (1.0.11)
excon (0.13.4)
ffi (1.0.11-java)
ffi-rzmq (0.9.0)
filewatch (0.3.3)
ftw (0.0.14)
ftw (0.0.18)
addressable (= 2.2.6)
backports (= 2.3.0)
cabin (> 0)
@ -30,27 +29,26 @@ GEM
json
gelfd (0.2.0)
gmetric (0.1.3)
haml (3.1.4)
heroku (2.24.1)
haml (3.1.6)
heroku (2.26.2)
heroku-api (~> 0.2.1)
launchy (>= 0.3.2)
netrc (~> 0.7.1)
netrc (~> 0.7.2)
rest-client (~> 1.6.1)
rubyzip
http_parser.rb (0.5.3)
heroku-api (0.2.1)
excon (~> 0.13.3)
http_parser.rb (0.5.3-java)
httparty (0.8.2)
multi_json
httparty (0.8.3)
multi_json (~> 1.0)
multi_xml
i18n (0.6.0)
jls-grok (0.10.6)
cabin (~> 0.4.0)
jruby-elasticsearch (0.0.11)
jruby-openssl (0.7.6.1)
jruby-elasticsearch (0.0.13)
jruby-openssl (0.7.7)
bouncy-castle-java (>= 1.5.0146.1)
json (1.6.5)
json (1.6.5-java)
launchy (2.1.0)
addressable (~> 2.2.6)
launchy (2.1.0-java)
addressable (~> 2.2.6)
ffi (~> 1.0.9)
@ -61,31 +59,30 @@ GEM
treetop (~> 1.4.8)
metaclass (0.0.1)
mime-types (1.18)
minitest (2.12.1)
mocha (0.11.0)
minitest (3.0.1)
mocha (0.11.4)
metaclass (~> 0.0.1)
mongo (1.6.2)
bson (~> 1.6.2)
mtrc (0.0.4)
multi_json (1.3.2)
multi_xml (0.4.4)
netrc (0.7.1)
nokogiri (1.5.2)
multi_json (1.3.6)
multi_xml (0.5.1)
netrc (0.7.2)
nokogiri (1.5.2-java)
onstomp (1.0.6)
polyglot (0.3.3)
rack (1.4.1)
rack-protection (1.2.0)
rack
redis (2.2.2)
redis (3.0.0)
rest-client (1.6.7)
mime-types (>= 1.16)
riemann-client (0.0.6)
beefcake (>= 0.3.5)
mtrc (>= 0.0.4)
trollop (>= 1.16.2)
rubyzip (0.9.7)
sass (3.1.15)
rubyzip (0.9.8)
sass (3.1.19)
shoulda (3.0.1)
shoulda-context (~> 1.0.0)
shoulda-matchers (~> 1.0.0)
@ -122,7 +119,7 @@ DEPENDENCIES
haml
heroku
jls-grok (= 0.10.6)
jruby-elasticsearch (= 0.0.11)
jruby-elasticsearch (= 0.0.13)
jruby-openssl
json
mail

2
logstash.gemspec
View file

@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "gmetric", "~> 0.1.3" # outputs/ganglia, # License: MIT
spec.add_dependency "haml" # License: MIT
spec.add_dependency "jls-grok", "0.10.6" # for grok filter, BSD License
spec.add_dependency "jruby-elasticsearch", "~> 0.0.11" # BSD License
spec.add_dependency "jruby-elasticsearch", "~> 0.0.13" # BSD License
spec.add_dependency "jruby-openssl" # For enabling SSL support, CPL/GPL 2.0
spec.add_dependency "json" # Ruby license
spec.add_dependency "minitest" # License: Ruby