github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-25 07:07:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

update core jars. remove dependency on org.eclipse

Browse source 
Fixes #11103
This commit is contained in:
Joao Duarte 2019-08-30 18:24:19 +01:00 • committed by João Duarte
parent 1c874854d9
commit afe4f8189d
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
logstash-core/build.gradle
View file

@ -127,18 +127,18 @@ def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property
def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim() def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
dependencies { dependencies {
compile 'org.apache.logging.log4j:log4j-api:2.11.1' compile 'org.apache.logging.log4j:log4j-api:2.12.1'
compile 'org.apache.logging.log4j:log4j-core:2.11.1' compile 'org.apache.logging.log4j:log4j-core:2.12.1'
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1' runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.12.1'
compile('org.reflections:reflections:0.9.11') { compile('org.reflections:reflections:0.9.11') {
exclude group: 'com.google.guava', module: 'guava' exclude group: 'com.google.guava', module: 'guava'
} }
compile 'commons-codec:commons-codec:1.11' compile 'commons-codec:commons-codec:1.13'
// 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:${jacksonDatabindVersion}" compile "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}" compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
compile 'org.codehaus.janino:janino:3.0.11' compile 'org.codehaus.janino:janino:3.0.15'
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
if (customJRubyDir == "") { if (customJRubyDir == "") {
compile "org.jruby:jruby-complete:${jrubyVersion}" compile "org.jruby:jruby-complete:${jrubyVersion}"
@ -148,12 +148,12 @@ dependencies {
compile group: 'com.google.guava', name: 'guava', version: '22.0' compile group: 'com.google.guava', name: 'guava', version: '22.0'
// Do not upgrade this, later versions require GPL licensed code in javac-shaded that is // Do not upgrade this, later versions require GPL licensed code in javac-shaded that is
// Apache2 incompatible // Apache2 incompatible
compile('com.google.googlejavaformat:google-java-format:1.1') { compile('com.google.googlejavaformat:google-java-format:1.7') {
exclude group: 'com.google.guava', module: 'guava' exclude group: 'com.google.guava', module: 'guava'
} }
compile 'org.javassist:javassist:3.24.0-GA' compile 'org.javassist:javassist:3.26.0-GA'
compile 'com.google.guava:guava:20.0' compile 'com.google.guava:guava:22.0'
testCompile 'org.apache.logging.log4j:log4j-core:2.11.1:tests' testCompile 'org.apache.logging.log4j:log4j-core:2.12.1:tests'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0' testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0'
testCompile 'org.elasticsearch:securemock:1.2' testCompile 'org.elasticsearch:securemock:1.2'