Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update java dependencies #10340

Merged
merged 1 commit into from
Jan 18, 2019
Merged

Update java dependencies #10340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
}
dependencies {
classpath 'org.yaml:snakeyaml:1.17'
classpath 'org.yaml:snakeyaml:1.23'
classpath "gradle.plugin.com.github.jk1:gradle-license-report:0.7.1"
}
}
Expand Down
16 changes: 8 additions & 8 deletions logstash-core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ def customJRubyDir = project.hasProperty("custom.jruby.path") ? project.property
def customJRubyVersion = customJRubyDir == "" ? "" : Files.readAllLines(Paths.get(customJRubyDir, "VERSION")).get(0).trim()

dependencies {
compile 'org.apache.logging.log4j:log4j-api:2.9.1'
compile 'org.apache.logging.log4j:log4j-core:2.9.1'
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.9.1'
compile 'org.apache.logging.log4j:log4j-api:2.11.1'
compile 'org.apache.logging.log4j:log4j-core:2.11.1'
runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.1'
compile 'commons-codec:commons-codec:1.11'
// 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-databind:${jacksonVersion}"
compile "com.fasterxml.jackson.core:jackson-annotations:${jacksonVersion}"
compile 'org.codehaus.janino:janino:3.0.8'
compile 'org.codehaus.janino:janino:3.0.11'
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"
if (customJRubyDir == "") {
compile "org.jruby:jruby-complete:${jrubyVersion}"
Expand All @@ -139,11 +139,11 @@ dependencies {
compile('com.google.googlejavaformat:google-java-format:1.1') {
exclude group: 'com.google.guava', module: 'guava'
}
compile 'org.javassist:javassist:3.22.0-GA'
compile 'org.javassist:javassist:3.24.0-GA'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's 3.24.1-GA already btw

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lol should have refreshed the page before responding 🤦‍♂️

compile 'com.google.guava:guava:20.0'
testCompile 'org.apache.logging.log4j:log4j-core:2.9.1:tests'
testCompile 'org.apache.logging.log4j:log4j-core:2.11.1:tests'
testCompile 'junit:junit:4.12'
testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'
testCompile 'net.javacrumbs.json-unit:json-unit:2.3.0'
testCompile 'org.elasticsearch:securemock:1.2'
testCompile 'org.assertj:assertj-core:3.8.0'
testCompile 'org.assertj:assertj-core:3.11.1'
}
2 changes: 1 addition & 1 deletion versions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jruby:
# bundler evaluates the gemspec via bin/logstash
# Ensure Jackson version here is kept in sync with version used by jrjackson gem
jrjackson: 0.4.6
jackson: 2.9.5
jackson: 2.9.8