From 39b4587d023782913fedb2157754fa2e854839a5 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Thu, 25 Jan 2018 07:33:30 -0600 Subject: [PATCH] Remove requiresKeystore when not actually required (elastic/x-pack-elasticsearch#3697) Original commit: elastic/x-pack-elasticsearch@6bdd4ae2dc64541d8eaa02c5b2dddc552812fd66 --- plugin/core/build.gradle | 2 +- plugin/deprecation/build.gradle | 2 +- plugin/graph/build.gradle | 2 +- plugin/logstash/build.gradle | 2 +- plugin/ml/build.gradle | 2 +- plugin/monitoring/build.gradle | 2 +- plugin/upgrade/build.gradle | 2 +- plugin/watcher/build.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugin/core/build.gradle b/plugin/core/build.gradle index ac9e1a1a69f..e90db47fc69 100644 --- a/plugin/core/build.gradle +++ b/plugin/core/build.gradle @@ -15,7 +15,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Core' classname 'org.elasticsearch.xpack.core.XPackPlugin' hasNativeController false - requiresKeystore true + requiresKeystore false licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') } diff --git a/plugin/deprecation/build.gradle b/plugin/deprecation/build.gradle index e61d1511cc3..a86c8570749 100644 --- a/plugin/deprecation/build.gradle +++ b/plugin/deprecation/build.gradle @@ -6,7 +6,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Deprecation' classname 'org.elasticsearch.xpack.deprecation.Deprecation' hasNativeController false - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') diff --git a/plugin/graph/build.gradle b/plugin/graph/build.gradle index a9244a3140b..31fff5ecd8d 100644 --- a/plugin/graph/build.gradle +++ b/plugin/graph/build.gradle @@ -6,7 +6,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Graph' classname 'org.elasticsearch.xpack.graph.Graph' hasNativeController false - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') diff --git a/plugin/logstash/build.gradle b/plugin/logstash/build.gradle index 2ed100aa88a..b84f4130c03 100644 --- a/plugin/logstash/build.gradle +++ b/plugin/logstash/build.gradle @@ -6,7 +6,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Logstash' classname 'org.elasticsearch.xpack.logstash.Logstash' hasNativeController false - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') diff --git a/plugin/ml/build.gradle b/plugin/ml/build.gradle index 496a1d01c1d..c2254d3215c 100644 --- a/plugin/ml/build.gradle +++ b/plugin/ml/build.gradle @@ -9,7 +9,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Machine Learning' classname 'org.elasticsearch.xpack.ml.MachineLearning' hasNativeController true - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') diff --git a/plugin/monitoring/build.gradle b/plugin/monitoring/build.gradle index f03f4655632..946ff4663b2 100644 --- a/plugin/monitoring/build.gradle +++ b/plugin/monitoring/build.gradle @@ -9,7 +9,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Monitoring' classname 'org.elasticsearch.xpack.monitoring.Monitoring' hasNativeController false - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') diff --git a/plugin/upgrade/build.gradle b/plugin/upgrade/build.gradle index 2169b46cf1f..cb88f785e1f 100644 --- a/plugin/upgrade/build.gradle +++ b/plugin/upgrade/build.gradle @@ -9,7 +9,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Upgrade' classname 'org.elasticsearch.xpack.upgrade.Upgrade' hasNativeController false - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt') diff --git a/plugin/watcher/build.gradle b/plugin/watcher/build.gradle index fea1a424061..a28cab944a3 100644 --- a/plugin/watcher/build.gradle +++ b/plugin/watcher/build.gradle @@ -6,7 +6,7 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Watcher' classname 'org.elasticsearch.xpack.watcher.Watcher' hasNativeController false - requiresKeystore true + requiresKeystore false extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') noticeFile project(':x-pack-elasticsearch').file('NOTICE.txt')