From 1470518c40823f2d619a458aae1b89b670f0550e Mon Sep 17 00:00:00 2001 From: Pere Urbon-Bayes Date: Tue, 23 Dec 2014 11:12:39 +0100 Subject: [PATCH] Make sure the vendorized jruby only have 1.9 libs, so no extra space is used. Also make sure the jruby is run in 1.9 mode. Fixes #2285 --- bin/logstash.lib.sh | 1 + rakelib/vendor.rake | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/bin/logstash.lib.sh b/bin/logstash.lib.sh index 9fba6dddf..1b1fc46ea 100755 --- a/bin/logstash.lib.sh +++ b/bin/logstash.lib.sh @@ -87,6 +87,7 @@ setup_ruby() { } jruby_opts() { + echo "--1.9" for i in $JAVA_OPTS ; do echo "-J$i" done diff --git a/rakelib/vendor.rake b/rakelib/vendor.rake index dcad27e1b..79ae2943b 100644 --- a/rakelib/vendor.rake +++ b/rakelib/vendor.rake @@ -71,6 +71,8 @@ namespace "vendor" do download = file_fetch(url, info["sha1"]) parent = vendor(name).gsub(/\/$/, "") directory parent => "vendor" do + next if parent =~ /lib\/ruby\/1.8/ + next if parent =~ /lib\/ruby\/2.0/ mkdir parent end.invoke unless Rake::Task.task_defined?(parent) @@ -79,6 +81,8 @@ namespace "vendor" do out = entry.full_name.gsub(prefix_re, "") next if out =~ /^samples/ next if out =~ /@LongLink/ + next if out =~ /lib\/ruby\/1.8/ + next if out =~ /lib\/ruby\/2.0/ vendor(name, out) end # untar end # jruby