From f360d2d8d727186728b89321bf9d06e7c0b480ce Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 7 Feb 2018 16:58:09 -0800 Subject: [PATCH] Build: Cleanup gradle files (elastic/x-pack-elasticsearch#3867) There were a number of leftover unnecessary elements in the module build.gradle files that were holdovers from copying the original plugin build.gradle. This commit removes these elements. Original commit: elastic/x-pack-elasticsearch@08babbd5207f08f2a28a111bc24c74e81792a199 --- plugin/deprecation/build.gradle | 8 -------- plugin/graph/build.gradle | 8 -------- plugin/logstash/build.gradle | 8 -------- plugin/ml/build.gradle | 7 ------- plugin/monitoring/build.gradle | 9 --------- plugin/security/build.gradle | 10 +--------- plugin/sql/build.gradle | 10 ---------- plugin/upgrade/build.gradle | 7 ------- 8 files changed, 1 insertion(+), 66 deletions(-) diff --git a/plugin/deprecation/build.gradle b/plugin/deprecation/build.gradle index 8e40d35ca26..fb9fdf47a1e 100644 --- a/plugin/deprecation/build.gradle +++ b/plugin/deprecation/build.gradle @@ -5,22 +5,14 @@ esplugin { name 'x-pack-deprecation' description 'Elasticsearch Expanded Pack Plugin - Deprecation' classname 'org.elasticsearch.xpack.deprecation.Deprecation' - hasNativeController false - requiresKeystore false extendedPlugins = ['x-pack-core'] } archivesBaseName = 'x-pack-deprecation' dependencies { - provided "org.elasticsearch:elasticsearch:${version}" - provided "org.elasticsearch.plugin:x-pack-core:${version}" } -dependencyLicenses { - ignoreSha 'x-pack-core' -} - run { plugin xpackModule('core') } diff --git a/plugin/graph/build.gradle b/plugin/graph/build.gradle index 238558de24d..248e57e680f 100644 --- a/plugin/graph/build.gradle +++ b/plugin/graph/build.gradle @@ -5,23 +5,15 @@ esplugin { name 'x-pack-graph' description 'Elasticsearch Expanded Pack Plugin - Graph' classname 'org.elasticsearch.xpack.graph.Graph' - hasNativeController false - requiresKeystore false extendedPlugins = ['x-pack-core'] } archivesBaseName = 'x-pack-graph' dependencies { - provided "org.elasticsearch:elasticsearch:${version}" - provided "org.elasticsearch.plugin:x-pack-core:${version}" testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') } -dependencyLicenses { - ignoreSha 'x-pack-core' -} - run { plugin xpackModule('core') } diff --git a/plugin/logstash/build.gradle b/plugin/logstash/build.gradle index 7f6ed04fe78..5749719efcc 100644 --- a/plugin/logstash/build.gradle +++ b/plugin/logstash/build.gradle @@ -5,24 +5,16 @@ esplugin { name 'x-pack-logstash' description 'Elasticsearch Expanded Pack Plugin - Logstash' classname 'org.elasticsearch.xpack.logstash.Logstash' - hasNativeController false - requiresKeystore false extendedPlugins = ['x-pack-core'] } archivesBaseName = 'x-pack-logstash' dependencies { - provided "org.elasticsearch:elasticsearch:${version}" - provided "org.elasticsearch.plugin:x-pack-core:${version}" testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') } -dependencyLicenses { - ignoreSha 'x-pack-core' -} - run { plugin xpackModule('core') } diff --git a/plugin/ml/build.gradle b/plugin/ml/build.gradle index adcd98b7a32..4e3e5f4c445 100644 --- a/plugin/ml/build.gradle +++ b/plugin/ml/build.gradle @@ -9,7 +9,6 @@ esplugin { description 'Elasticsearch Expanded Pack Plugin - Machine Learning' classname 'org.elasticsearch.xpack.ml.MachineLearning' hasNativeController true - requiresKeystore false extendedPlugins = ['x-pack-core'] } archivesBaseName = 'x-pack-ml' @@ -41,8 +40,6 @@ compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try, compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" dependencies { - provided "org.elasticsearch:elasticsearch:${version}" - provided "org.elasticsearch.plugin:x-pack-core:${version}" testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') // This should not be here @@ -67,10 +64,6 @@ artifacts { testArtifacts testJar } -dependencyLicenses { - ignoreSha 'x-pack-core' -} - run { plugin xpackModule('core') } diff --git a/plugin/monitoring/build.gradle b/plugin/monitoring/build.gradle index 039b6522040..0c474cab8d7 100644 --- a/plugin/monitoring/build.gradle +++ b/plugin/monitoring/build.gradle @@ -8,15 +8,11 @@ esplugin { name 'x-pack-monitoring' description 'Elasticsearch Expanded Pack Plugin - Monitoring' classname 'org.elasticsearch.xpack.monitoring.Monitoring' - hasNativeController false - requiresKeystore false extendedPlugins = ['x-pack-core'] } archivesBaseName = 'x-pack-monitoring' dependencies { - provided "org.elasticsearch:elasticsearch:${version}" - provided "org.elasticsearch.plugin:x-pack-core:${version}" testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') @@ -45,13 +41,8 @@ artifacts { } dependencyLicenses { - mapping from: /elasticsearch-rest-client.*/, to: 'elasticsearch' mapping from: /http.*/, to: 'httpclient' // pulled in by rest client mapping from: /commons-.*/, to: 'commons' // pulled in by rest client - ignoreSha 'x-pack-core' - ignoreSha 'elasticsearch-rest-client' - ignoreSha 'transport-netty4' - ignoreSha 'elasticsearch-rest-client-sniffer' } run { diff --git a/plugin/security/build.gradle b/plugin/security/build.gradle index 3d41a42ff0c..a244ab657df 100644 --- a/plugin/security/build.gradle +++ b/plugin/security/build.gradle @@ -5,7 +5,6 @@ esplugin { name 'x-pack-security' description 'Elasticsearch Expanded Pack Plugin - Security' classname 'org.elasticsearch.xpack.security.Security' - hasNativeController false requiresKeystore true extendedPlugins = ['x-pack-core'] } @@ -13,8 +12,6 @@ esplugin { archivesBaseName = 'x-pack-security' dependencies { - provided "org.elasticsearch:elasticsearch:${version}" - provided "org.elasticsearch.plugin:x-pack-core:${version}" compileOnly project(path: ':modules:transport-netty4', configuration: 'runtime') provided project(path: ':plugins:transport-nio', configuration: 'runtime') @@ -24,7 +21,6 @@ dependencies { testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') - //compile project(path: ':modules:transport-netty4') compile 'com.unboundid:unboundid-ldapsdk:3.2.0' compile 'org.bouncycastle:bcprov-jdk15on:1.58' compile 'org.bouncycastle:bcpkix-jdk15on:1.58' @@ -83,13 +79,9 @@ sourceSets.test.resources { srcDir '../core/src/test/resources' } dependencyLicenses { - mapping from: /netty-.*/, to: 'netty' mapping from: /bc.*/, to: 'bouncycastle' - mapping from: /transport-netty.*/, to: 'elasticsearch' mapping from: /java-support|opensaml-.*/, to: 'shibboleth' - mapping from: /http.*/, to: 'httpclient' - ignoreSha 'x-pack-core' - ignoreSha 'transport-netty4' + mapping from: /http.*/, to: 'httpclient' } forbiddenPatterns { diff --git a/plugin/sql/build.gradle b/plugin/sql/build.gradle index 5a8e4f72d0b..dcbbbcb50ac 100644 --- a/plugin/sql/build.gradle +++ b/plugin/sql/build.gradle @@ -5,7 +5,6 @@ esplugin { name 'x-pack-sql' description 'The Elasticsearch plugin that powers SQL for Elasticsearch' classname 'org.elasticsearch.xpack.sql.plugin.SqlPlugin' - hasNativeController false requiresKeystore true extendedPlugins = ['x-pack-core'] licenseFile project(':x-pack-elasticsearch').file('LICENSE.txt') @@ -49,15 +48,6 @@ bundlePlugin { } } -dependencyLicenses { - mapping from: /server.*/, to: 'elasticsearch' - mapping from: /sql-proto.*/, to: 'elasticsearch' - mapping from: /x-pack-core.*/, to: 'elasticsearch' - - ignoreSha 'x-pack-core' - ignoreSha 'sql-proto' -} - /********************************************** * SQL Parser regeneration * **********************************************/ diff --git a/plugin/upgrade/build.gradle b/plugin/upgrade/build.gradle index ad12e595314..80509ffcfb4 100644 --- a/plugin/upgrade/build.gradle +++ b/plugin/upgrade/build.gradle @@ -8,15 +8,12 @@ esplugin { name 'x-pack-upgrade' description 'Elasticsearch Expanded Pack Plugin - Upgrade' classname 'org.elasticsearch.xpack.upgrade.Upgrade' - hasNativeController false - requiresKeystore false extendedPlugins = ['x-pack-core'] } archivesBaseName = 'x-pack-upgrade' dependencies { - provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch.plugin:x-pack-core:${version}" testCompile project(path: xpackModule('core'), configuration: 'testArtifacts') } @@ -24,10 +21,6 @@ dependencies { compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" -dependencyLicenses { - ignoreSha 'x-pack-core' -} - run { plugin xpackModule('core') }