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

upgrade to JRuby 1.7.25 and required jruby-openssl 0.9.16 to match JRuby

Browse source
This commit is contained in:
Colin Surprenant 2016-04-18 15:44:11 -04:00
parent 62c609f135
commit 70128d4273
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
gem.add_runtime_dependency "concurrent-ruby", "1.0.0"
gem.add_runtime_dependency "sinatra", '~> 1.4', '>= 1.4.6'
gem.add_runtime_dependency 'puma', '~> 2.16', '>= 2.16.0'
gem.add_runtime_dependency "jruby-openssl", "0.9.13" # Required to support TLSv1.2
gem.add_runtime_dependency "jruby-openssl", "0.9.16" # >= 0.9.13 Required to support TLSv1.2
gem.add_runtime_dependency "chronic_duration", "0.10.6"
gem.add_runtime_dependency "jruby-monitoring", '~> 0.3.1'

2
rakelib/vendor.rake
View file

@ -1,6 +1,6 @@
namespace "vendor" do
VERSIONS = {
"jruby" => { "version" => "1.7.23", "sha1" => "2b5e796feeed2bcfab02f8bf2ff3d77ca318e310" },
"jruby" => { "version" => "1.7.25", "sha1" => "cd15aef419f97cff274491e53fcfb8b88ec36785" },
}
def vendor(*args)