From b982a1ecbe7fa8addbc39b48f219eab894f822df Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Thu, 24 Aug 2017 18:42:40 -0500 Subject: [PATCH] Revert "always use JARS_SKIP when installing or updating plugins" This reverts commit 628207e96c091c54eb2485fad54c93b7788c7974. Fixes #8070 --- lib/pluginmanager/install.rb | 5 ++--- lib/pluginmanager/update.rb | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/pluginmanager/install.rb b/lib/pluginmanager/install.rb index 388c99557..476b00ec7 100644 --- a/lib/pluginmanager/install.rb +++ b/lib/pluginmanager/install.rb @@ -20,9 +20,8 @@ class LogStash::PluginManager::Install < LogStash::PluginManager::Command # but the argument parsing does not support it for now so currently if specifying --version only # one plugin name can be also specified. def execute - # we never want to lookup jars or touch the ~/.m2 directory - # all plugins that use gems ship them inside the .gem - ENV["JARS_SKIP"] = "true" + # Turn off any jar dependencies lookup when running with `--local` + ENV["JARS_SKIP"] = "true" if local? # This is a special flow for PACK related plugins, # if we dont detect an pack we will just use the normal `Bundle install` Strategy` diff --git a/lib/pluginmanager/update.rb b/lib/pluginmanager/update.rb index cc0ffadc1..583b6c954 100644 --- a/lib/pluginmanager/update.rb +++ b/lib/pluginmanager/update.rb @@ -14,7 +14,8 @@ class LogStash::PluginManager::Update < LogStash::PluginManager::Command option "--local", :flag, "force local-only plugin update. see bin/logstash-plugin package|unpack", :default => false def execute - ENV["JARS_SKIP"] = "true" + # Turn off any jar dependencies lookup when running with `--local` + ENV["JARS_SKIP"] = "true" if local? # remove "system" local gems used by LS local_gems = gemfile.locally_installed_gems.map(&:name) - NON_PLUGIN_LOCAL_GEMS