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

Bump to 5.6.4

Browse source 
Fixes #8470
This commit is contained in:
Rob Bavey 2017-10-10 16:35:37 -04:00
parent 5e9704774c
commit 19b065164e
5 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Gemfile.jruby-1.9.lock.release
View file

@ -1,7 +1,7 @@
PATH
remote: ./logstash-core
specs:
logstash-core (5.6.3-java)
logstash-core (5.6.4-java)
chronic_duration (= 0.10.6)
clamp (~> 0.6.5)
concurrent-ruby (~> 1.0, >= 1.0.5)
@ -10,7 +10,7 @@ PATH
gems (~> 0.8.3)
i18n (= 0.6.9)
jar-dependencies
jrjackson (~> 0.4.0)
jrjackson (~> 0.4.3)
jruby-openssl (= 0.9.19)
manticore (>= 0.5.4, < 1.0.0)
minitar (~> 0.5.4)
@ -28,7 +28,7 @@ PATH
remote: ./logstash-core-plugin-api
specs:
logstash-core-plugin-api (2.1.12-java)
logstash-core (= 5.6.3)
logstash-core (= 5.6.4)
GEM
remote: https://rubygems.org/
@ -49,7 +49,7 @@ GEM
aws-sdk-v1 (1.67.0)
json (~> 1.4)
nokogiri (~> 1)
backports (3.8.0)
backports (3.9.1)
benchmark-ips (2.7.2)
bindata (2.4.1)
buftok (0.2.0)
@ -125,7 +125,7 @@ GEM
jls-lumberjack (0.0.26)
concurrent-ruby
jmespath (1.3.1)
jrjackson (0.4.3-java)
jrjackson (0.4.4-java)
jruby-openssl (0.9.19-java)
jruby-stdin-channel (0.2.0-java)
json (1.8.6-java)
@ -166,7 +166,7 @@ GEM
jls-grok (~> 0.11.1)
logstash-core-plugin-api (>= 1.60, <= 2.99)
logstash-patterns-core
logstash-codec-netflow (3.5.2)
logstash-codec-netflow (3.7.0)
bindata (>= 1.5.0)
logstash-core-plugin-api (>= 1.60, <= 2.99)
logstash-codec-plain (3.0.4)
@ -350,7 +350,7 @@ GEM
logstash-codec-json
logstash-core-plugin-api (>= 1.60, <= 2.99)
redis (~> 3)
logstash-input-s3 (3.1.6)
logstash-input-s3 (3.1.7)
logstash-core-plugin-api (>= 1.60, <= 2.99)
logstash-mixin-aws
stud (~> 0.0.18)
@ -437,7 +437,7 @@ GEM
cinch
logstash-codec-plain
logstash-core-plugin-api (>= 1.60, <= 2.99)
logstash-output-kafka (5.1.10)
logstash-output-kafka (5.1.11)
logstash-codec-json
logstash-codec-plain
logstash-core-plugin-api (>= 1.60, <= 2.99)
@ -542,7 +542,7 @@ GEM
rack-test (0.7.0)
rack (>= 1.0, < 3)
rake (12.1.0)
redis (3.3.3)
redis (3.3.5)
rest-client (1.8.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 3.0)
@ -571,7 +571,7 @@ GEM
sawyer (0.6.0)
addressable (~> 2.3.5)
faraday (~> 0.8, < 0.10)
sequel (5.0.0)
sequel (5.1.0)
simple_oauth (0.3.1)
simplecov (0.15.1)
docile (~> 1.1.0)

4
NOTICE.TXT
View file

@ -397,7 +397,7 @@ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
==========================================================================
RubyGem: sequel Version: 5.0.0
RubyGem: sequel Version: 5.1.0
Copyright (c) 2007-2008 Sharon Rosner
Copyright (c) 2008-2017 Jeremy Evans
@ -463,7 +463,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
==========================================================================
RubyGem: redis Version: 3.3.3
RubyGem: redis Version: 3.3.5
Copyright (c) 2009 Ezra Zygmuntowicz
Permission is hereby granted, free of charge, to any person obtaining

2
logstash-core-plugin-api/logstash-core-plugin-api.gemspec
View file

@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
gem.require_paths = ["lib"]
gem.version = LOGSTASH_CORE_PLUGIN_API
gem.add_runtime_dependency "logstash-core", "5.6.3"
gem.add_runtime_dependency "logstash-core", "5.6.4"
# Make sure we dont build this gem from a non jruby
# environment.

6
logstash-core/lib/logstash-core_jars.rb
View file

@ -5,10 +5,8 @@ rescue LoadError
require 'org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar'
require 'com/fasterxml/jackson/core/jackson-databind/2.9.1/jackson-databind-2.9.1.jar'
require 'org/apache/logging/log4j/log4j-api/2.6.2/log4j-api-2.6.2.jar'
require 'org/slf4j/slf4j-api/1.7.21/slf4j-api-1.7.21.jar'
require 'com/fasterxml/jackson/core/jackson-annotations/2.9.1/jackson-annotations-2.9.1.jar'
require 'org/apache/logging/log4j/log4j-slf4j-impl/2.6.2/log4j-slf4j-impl-2.6.2.jar'
require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.7.3/jackson-module-afterburner-2.9.1.jar'
require 'com/fasterxml/jackson/module/jackson-module-afterburner/2.9.1/jackson-module-afterburner-2.9.1.jar'
require 'com/fasterxml/jackson/dataformat/jackson-dataformat-cbor/2.9.1/jackson-dataformat-cbor-2.9.1.jar'
require 'com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar'
end
@ -17,9 +15,7 @@ if defined? Jars
require_jar( 'org.apache.logging.log4j', 'log4j-core', '2.6.2' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.1' )
require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.6.2' )
require_jar( 'org.slf4j', 'slf4j-api', '1.7.21' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.1' )
require_jar( 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.6.2' )
require_jar( 'com.fasterxml.jackson.module', 'jackson-module-afterburner', '2.9.1' )
require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.1' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.9.1' )

4
versions.yml
View file

@ -1,6 +1,6 @@
---
logstash: 5.6.3
logstash-core: 5.6.3
logstash: 5.6.4
logstash-core: 5.6.4
logstash-core-plugin-api: 2.1.12
# Note: this file is copied to the root of logstash-core because its gemspec needs it when