Skip to content
This repository has been archived by the owner on Nov 4, 2020. It is now read-only.

Commit

Permalink
Fix the require_jar warning about jackson jars
Browse files Browse the repository at this point in the history
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 elastic#5159

Fixes elastic#5750
  • Loading branch information
suyograo committed Aug 10, 2016
1 parent afcb49d commit 8bb01d6
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions logstash-core-event-java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
12 changes: 6 additions & 6 deletions logstash-core-event-java/lib/logstash-core-event-java_jars.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 2 additions & 2 deletions logstash-core-event-java/logstash-core-event-java.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion logstash-core/logstash-core.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8bb01d6

Please sign in to comment.