mirror of
https://github.com/elastic/logstash.git
synced 2025-04-24 06:37:19 -04:00
- Upgrade elasticsearch to 0.18.1 (LOGSTASH-262)
This commit is contained in:
parent
5834398a44
commit
0f24211e31
2 changed files with 11 additions and 18 deletions
27
Gemfile
27
Gemfile
|
@ -7,9 +7,9 @@ end
|
|||
gem "cabin", "0.1.3" # for logging. apache 2 license
|
||||
gem "bunny" # for amqp support, MIT-style license
|
||||
gem "uuidtools" # for naming amqp queues, License ???
|
||||
gem "filewatch", "~> 0.3.0" # for file tailing, BSD License
|
||||
gem "jls-grok", "0.9.0" # for grok filter, BSD License
|
||||
jruby? and gem "jruby-elasticsearch", "~> 0.0.11" # BSD License
|
||||
gem "filewatch", "0.3.0" # for file tailing, BSD License
|
||||
gem "jls-grok", "0.9.1" # for grok filter, BSD License
|
||||
jruby? and gem "jruby-elasticsearch", "0.0.11" # BSD License
|
||||
gem "stomp" # for stomp protocol, Apache 2.0 License
|
||||
gem "json" # Ruby license
|
||||
gem "awesome_print" # MIT License
|
||||
|
@ -26,18 +26,11 @@ gem "sass" # License: MIT
|
|||
gem "mongo" # outputs/mongodb, License: Apache 2.0
|
||||
gem "redis" # outputs/redis, License: MIT-style
|
||||
gem "gelf" # outputs/gelf, # License: MIT-style
|
||||
gem "statsd-ruby", "~> 0.3.0" # outputs/statsd, # License: As-Is
|
||||
gem "gmetric", "~> 0.1.3" # outputs/ganglia, # License: MIT
|
||||
gem "xmpp4r", "~> 0.5" # outputs/xmpp, # License: As-Is
|
||||
gem "gelfd", "~> 0.1.0" #inputs/gelf, # License: Apache 2.0
|
||||
gem "statsd-ruby", "0.3.0" # outputs/statsd, # License: As-Is
|
||||
gem "gmetric", "0.1.3" # outputs/ganglia, # License: MIT
|
||||
gem "xmpp4r", "0.5" # outputs/xmpp, # License: As-Is
|
||||
gem "gelfd", "0.1.0" #inputs/gelf, # License: Apache 2.0
|
||||
|
||||
gem "ffi-rzmq"
|
||||
gem "ruby-debug"
|
||||
gem "mocha"
|
||||
|
||||
# For testing/dev
|
||||
group :development do
|
||||
gem "rake"
|
||||
#gem "stompserver"
|
||||
#gem "spoon"
|
||||
end
|
||||
gem "ffi-rzmq", "0.9.0"
|
||||
gem "ruby-debug", "0.10.4"
|
||||
gem "mocha", "0.10.0"
|
||||
|
|
2
Makefile
2
Makefile
|
@ -10,7 +10,7 @@ VERSION=$(shell ruby -r./lib/logstash/version -e 'puts LOGSTASH_VERSION')
|
|||
JRUBY_URL=http://repository.codehaus.org/org/jruby/jruby-complete/$(JRUBY_VERSION)
|
||||
JRUBY=vendor/jar/jruby-complete-$(JRUBY_VERSION).jar
|
||||
JRUBYC=java -Djruby.compat.version=RUBY1_9 -jar $(PWD)/$(JRUBY) -S jrubyc
|
||||
ELASTICSEARCH_VERSION=0.17.7
|
||||
ELASTICSEARCH_VERSION=0.18.1
|
||||
ELASTICSEARCH_URL=http://github.com/downloads/elasticsearch/elasticsearch
|
||||
ELASTICSEARCH=vendor/jar/elasticsearch-$(ELASTICSEARCH_VERSION)
|
||||
PLUGIN_FILES=$(shell git ls-files | egrep '^lib/logstash/(inputs|outputs|filters)/' | egrep -v '/base.rb$$')
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue