github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3517 from andrewvc/jrjackson-upgrade

Browse source 
Bump JrJackson gem to 0.2.9 to fix RubyBasicObject bug
This commit is contained in:
Andrew Cholakian 2015-07-09 13:45:41 -05:00
commit 4984cf6557
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Gemfile.jruby-1.9.lock
View file

@ -5,8 +5,9 @@ PATH
cabin (~> 0.7.0) cabin (~> 0.7.0)
clamp (~> 0.6.5) clamp (~> 0.6.5)
filesize (= 0.0.4) filesize (= 0.0.4)
gems (~> 0.8.3)
i18n (= 0.6.9) i18n (= 0.6.9)
jrjackson (~> 0.2.8) jrjackson (~> 0.2.9)
minitar (~> 0.5.4) minitar (~> 0.5.4)
pry (~> 0.10.1) pry (~> 0.10.1)
stud (~> 0.0.19) stud (~> 0.0.19)
@ -48,6 +49,7 @@ GEM
file-dependencies (0.1.6) file-dependencies (0.1.6)
minitar minitar
filesize (0.0.4) filesize (0.0.4)
flores (0.0.4)
fpm (1.3.3) fpm (1.3.3)
arr-pm (~> 0.0.9) arr-pm (~> 0.0.9)
backports (>= 2.6.2) backports (>= 2.6.2)
@ -62,7 +64,7 @@ GEM
domain_name (~> 0.5) domain_name (~> 0.5)
i18n (0.6.9) i18n (0.6.9)
insist (1.0.0) insist (1.0.0)
jrjackson (0.2.8) jrjackson (0.2.9)
json (1.8.2-java) json (1.8.2-java)
logstash-devutils (0.0.14-java) logstash-devutils (0.0.14-java)
gem_publisher gem_publisher
@ -131,6 +133,7 @@ DEPENDENCIES
ci_reporter_rspec (= 1.0.0) ci_reporter_rspec (= 1.0.0)
coveralls coveralls
file-dependencies (= 0.1.6) file-dependencies (= 0.1.6)
flores (~> 0.0.4)
fpm (~> 1.3.3) fpm (~> 1.3.3)
gems (~> 0.8.3) gems (~> 0.8.3)
logstash-core (= 2.0.0.dev)! logstash-core (= 2.0.0.dev)!

2
logstash-core.gemspec
View file

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