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

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.

Browse source 
Fixes #2285
This commit is contained in:
Pere Urbon-Bayes 2014-12-23 11:12:39 +01:00 • committed by Jordan Sissel
parent 8f9d6cc126
commit 1470518c40
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
bin/logstash.lib.sh
View file

@ -87,6 +87,7 @@ setup_ruby() {
} }
jruby_opts() { jruby_opts() {
echo "--1.9"
for i in $JAVA_OPTS ; do for i in $JAVA_OPTS ; do
echo "-J$i" echo "-J$i"
done done

4
rakelib/vendor.rake
View file

@ -71,6 +71,8 @@ namespace "vendor" do
download = file_fetch(url, info["sha1"]) download = file_fetch(url, info["sha1"])
parent = vendor(name).gsub(/\/$/, "") parent = vendor(name).gsub(/\/$/, "")
directory parent => "vendor" do directory parent => "vendor" do
next if parent =~ /lib\/ruby\/1.8/
next if parent =~ /lib\/ruby\/2.0/
mkdir parent mkdir parent
end.invoke unless Rake::Task.task_defined?(parent) end.invoke unless Rake::Task.task_defined?(parent)
@ -79,6 +81,8 @@ namespace "vendor" do
out = entry.full_name.gsub(prefix_re, "") out = entry.full_name.gsub(prefix_re, "")
next if out =~ /^samples/ next if out =~ /^samples/
next if out =~ /@LongLink/ next if out =~ /@LongLink/
next if out =~ /lib\/ruby\/1.8/
next if out =~ /lib\/ruby\/2.0/
vendor(name, out) vendor(name, out)
end # untar end # untar
end # jruby end # jruby