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

Fix the require_jar warning about jackson jars

Browse source 
jrjackson was using 2.7.3 whereas core was using 2.7.0. Upgraded jrjackson
to 0.4.0 and core libs to match jars in jrjackson

Fixes #5159

Fixes #5750
This commit is contained in:
Suyog Rao 2016-08-09 17:47:02 -07:00
parent 24c595a57b
commit 01d3ced998
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
logstash-core-event-java/build.gradle
View file

@ -92,8 +92,8 @@ idea {
}
dependencies {
compile 'com.fasterxml.jackson.core:jackson-core:2.7.1'
compile 'com.fasterxml.jackson.core:jackson-databind:2.7.1-1'
compile 'com.fasterxml.jackson.core:jackson-core:2.7.3'
compile 'com.fasterxml.jackson.core:jackson-databind:2.7.3'
provided 'org.jruby:jruby-core:1.7.25'
testCompile 'junit:junit:4.12'
testCompile 'net.javacrumbs.json-unit:json-unit:1.9.0'

12
logstash-core-event-java/lib/logstash-core-event-java_jars.rb
View file

@ -2,13 +2,13 @@
begin
require 'jar_dependencies'
rescue LoadError
require 'com/fasterxml/jackson/core/jackson-core/2.7.1/jackson-core-2.7.1.jar'
require 'com/fasterxml/jackson/core/jackson-annotations/2.7.0/jackson-annotations-2.7.0.jar'
require 'com/fasterxml/jackson/core/jackson-databind/2.7.1-1/jackson-databind-2.7.1-1.jar'
require 'com/fasterxml/jackson/core/jackson-databind/2.7.3/jackson-databind-2.7.3.jar'
require 'com/fasterxml/jackson/core/jackson-annotations/2.7.3/jackson-annotations-2.7.3.jar'
require 'com/fasterxml/jackson/core/jackson-core/2.7.3/jackson-core-2.7.3.jar'
end
if defined? Jars
require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.1' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.0' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.7.1-1' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-databind', '2.7.3' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-annotations', '2.7.3' )
require_jar( 'com.fasterxml.jackson.core', 'jackson-core', '2.7.3' )
end

4
logstash-core-event-java/logstash-core-event-java.gemspec
View file

@ -26,6 +26,6 @@ Gem::Specification.new do |gem|
# which does not have this problem.
gem.add_runtime_dependency "ruby-maven", "~> 3.3.9"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.7.1"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.7.1-1"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-core, 2.7.3"
gem.requirements << "jar com.fasterxml.jackson.core:jackson-databind, 2.7.3"
end

2
logstash-core/logstash-core.gemspec
View file

@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
if RUBY_PLATFORM == 'java'
gem.platform = RUBY_PLATFORM
gem.add_runtime_dependency "jrjackson", "~> 0.3.7" #(Apache 2.0 license)
gem.add_runtime_dependency "jrjackson", "~> 0.4.0" #(Apache 2.0 license)
else
gem.add_runtime_dependency "oj" #(MIT-style license)
end