Skip to content

Commit e6d59de

Browse files
authored
Update java dependencies (#10340)
1 parent 528112c commit e6d59de

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
}
77
}
88
dependencies {
9-
classpath 'org.yaml:snakeyaml:1.17'
9+
classpath 'org.yaml:snakeyaml:1.23'
1010
classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1"
1111
}
1212
}

logstash-core/build.gradle

+8-8
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,15 @@ def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property
118118
def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()
119119

120120
dependencies {
121-
compile 'org.apache.logging.log4j:log4j-api:2.9.1'
122-
compile 'org.apache.logging.log4j:log4j-core:2.9.1'
123-
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1'
121+
compile 'org.apache.logging.log4j:log4j-api:2.11.1'
122+
compile 'org.apache.logging.log4j:log4j-core:2.11.1'
123+
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
124124
compile 'commons-codec:commons-codec:1.11'
125125
// Jackson version moved to versions.yml in the project root (the JrJackson version is there too)
126126
compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
127127
compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
128128
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
129-
compile 'org.codehaus.janino:janino:3.0.8'
129+
compile 'org.codehaus.janino:janino:3.0.11'
130130
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
131131
if (customJRubyDir == "") {
132132
compile "org.jruby:jruby-complete:${jrubyVersion}"
@@ -139,11 +139,11 @@ dependencies {
139139
compile('com.google.googlejavaformat:google-java-format:1.1') {
140140
exclude group: 'com.google.guava', module: 'guava'
141141
}
142-
compile 'org.javassist:javassist:3.22.0-GA'
142+
compile 'org.javassist:javassist:3.24.0-GA'
143143
compile 'com.google.guava:guava:20.0'
144-
testCompile 'org.apache.logging.log4j:log4j-core:2.9.1:tests'
144+
testCompile 'org.apache.logging.log4j:log4j-core:2.11.1:tests'
145145
testCompile 'junit:junit:4.12'
146-
testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'
146+
testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0'
147147
testCompile 'org.elasticsearch:securemock:1.2'
148-
testCompile 'org.assertj:assertj-core:3.8.0'
148+
testCompile 'org.assertj:assertj-core:3.11.1'
149149
}

versions.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ jruby:
2222
# bundler evaluates the gemspec via bin/logstash
2323
# Ensure Jackson version here is kept in sync with version used by jrjackson gem
2424
jrjackson: 0.4.6
25-
jackson: 2.9.5
25+
jackson: 2.9.8

0 commit comments

Comments
 (0)