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

Update jrjackson, jackson versions

Browse source 
Also splits out jackson and jackson databind versions to allow separate revisions
 for databind.

Fixes #11040
This commit is contained in:
Rob Bavey 2019-08-12 12:07:18 -04:00
parent d64e5a7853
commit b2e8b0b6c4
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
logstash-core/build.gradle
View file

@ -9,6 +9,7 @@ description = """Logstash Core Java"""
version = versionMap['logstash-core'] version = versionMap['logstash-core']
String jrubyVersion = versionMap['jruby']['version'] String jrubyVersion = versionMap['jruby']['version']
String jacksonVersion = versionMap['jackson'] String jacksonVersion = versionMap['jackson']
String jacksonDatabindVersion = versionMap['jackson-databind']
repositories { repositories {
mavenCentral() mavenCentral()
@ -132,7 +133,7 @@ dependencies {
compile 'commons-codec:commons-codec:1.11' compile 'commons-codec:commons-codec:1.11'
// 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:${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.11'
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}" compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${jacksonVersion}"

5
versions.yml
View file

@ -21,5 +21,6 @@ jruby:
# Note: this file is copied to the root of logstash-core because its gemspec needs it when # Note: this file is copied to the root of logstash-core because its gemspec needs it when
# bundler evaluates the gemspec via bin/logstash # bundler evaluates the gemspec via bin/logstash
# Ensure Jackson version here is kept in sync with version used by jrjackson gem # Ensure Jackson version here is kept in sync with version used by jrjackson gem
jrjackson: 0.4.8 jrjackson: 0.4.9
jackson: 2.9.8 jackson: 2.9.9
jackson-databind: 2.9.9.3