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

MINOR: Bring log4j version in line with ES

Browse source 
Fixes #8793
This commit is contained in:
Armin 2017-12-04 11:13:14 +01:00 • committed by Armin Braun
parent d2c7fc7eb5
commit d3c33e7926
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core/build.gradle
View file

@ -119,9 +119,9 @@ idea {
} }
dependencies { dependencies {
compile 'org.apache.logging.log4j:log4j-api:2.6.2' compile 'org.apache.logging.log4j:log4j-api:2.9.1'
compile 'org.apache.logging.log4j:log4j-core:2.6.2' compile 'org.apache.logging.log4j:log4j-core:2.9.1'
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.6.2' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1'
// Jackson version moved to versions.yml in the project root (the JrJackson version is there too) // Jackson version moved to versions.yml in the project root (the JrJackson version is there too)
compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"

6
logstash-core/gemspec_jars.rb
View file

@ -2,9 +2,9 @@
# runtime dependencies to generate this gemspec dependencies file to be eval'ed by the gemspec # runtime dependencies to generate this gemspec dependencies file to be eval'ed by the gemspec
# for the jar-dependencies requirements. # for the jar-dependencies requirements.
gem.requirements << "jar org.apache.logging.log4j:log4j-slf4j-impl, 2.6.2" gem.requirements << "jar org.apache.logging.log4j:log4j-slf4j-impl, 2.9.1"
gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.6.2" gem.requirements << "jar org.apache.logging.log4j:log4j-api, 2.9.1"
gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.6.2" gem.requirements << "jar org.apache.logging.log4j:log4j-core, 2.9.1"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.1" gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.9.1"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.1" gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.9.1"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.1" gem.requirements << "jar com.fasterxml.jackson.core:jackson-annotations, 2.9.1"

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

@ -2,27 +2,27 @@
begin begin
require 'jar_dependencies' require 'jar_dependencies'
rescue LoadError rescue LoadError
require 'org/apache/logging/log4j/log4j-core/2.6.2/log4j-core-2.6.2.jar' require 'org/slf4j/slf4j-api/1.7.25/slf4j-api-1.7.25.jar'
require 'com/fasterxml/jackson/core/jackson-databind/2.9.1/jackson-databind-2.9.1.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 '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 'org/apache/logging/log4j/log4j-api/2.9.1/log4j-api-2.9.1.jar'
require 'org/apache/logging/log4j/log4j-core/2.9.1/log4j-core-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/dataformat/jackson-dataformat-cbor/2.9.1/jackson-dataformat-cbor-2.9.1.jar'
require 'org/codehaus/janino/commons-compiler/3.0.7/commons-compiler-3.0.7.jar' require 'org/codehaus/janino/commons-compiler/3.0.7/commons-compiler-3.0.7.jar'
require 'org/apache/logging/log4j/log4j-slf4j-impl/2.9.1/log4j-slf4j-impl-2.9.1.jar'
require 'com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar' require 'com/fasterxml/jackson/core/jackson-core/2.9.1/jackson-core-2.9.1.jar'
require 'org/codehaus/janino/janino/3.0.7/janino-3.0.7.jar' require 'org/codehaus/janino/janino/3.0.7/janino-3.0.7.jar'
end end
if defined? Jars if defined? Jars
require_jar( 'org.apache.logging.log4j', 'log4j-core', '2.6.2' ) require_jar( 'org.slf4j', 'slf4j-api', '1.7.25' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.9.1' ) 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( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.9.1' )
require_jar( 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.6.2' ) require_jar( 'org.apache.logging.log4j', 'log4j-api', '2.9.1' )
require_jar( 'org.apache.logging.log4j', 'log4j-core', '2.9.1' )
require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.1' ) require_jar( 'com.fasterxml.jackson.dataformat', 'jackson-dataformat-cbor', '2.9.1' )
require_jar( 'org.codehaus.janino', 'commons-compiler', '3.0.7' ) require_jar( 'org.codehaus.janino', 'commons-compiler', '3.0.7' )
require_jar( 'org.apache.logging.log4j', 'log4j-slf4j-impl', '2.9.1' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.9.1' ) require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.9.1' )
require_jar( 'org.codehaus.janino', 'janino', '3.0.7' ) require_jar( 'org.codehaus.janino', 'janino', '3.0.7' )
end end