From e59bcd8f8ec5926cc64d8e24de49262bee5932a6 Mon Sep 17 00:00:00 2001 From: Michael Basnight Date: Thu, 25 Jan 2018 11:34:02 -0600 Subject: [PATCH] Enable the licenseHeaders task for plugins (elastic/x-pack-elasticsearch#3673) Original commit: elastic/x-pack-elasticsearch@c9949b8ca59c6571b4b8f9013cc3d9994699b706 --- plugin/core/build.gradle | 1 - plugin/deprecation/build.gradle | 5 ----- plugin/graph/build.gradle | 5 ----- plugin/logstash/build.gradle | 5 ----- plugin/ml/build.gradle | 3 --- plugin/monitoring/build.gradle | 4 ---- plugin/security/build.gradle | 7 ------- plugin/upgrade/build.gradle | 5 ----- plugin/watcher/build.gradle | 3 --- 9 files changed, 38 deletions(-) diff --git a/plugin/core/build.gradle b/plugin/core/build.gradle index e90db47fc69..d0106e3e518 100644 --- a/plugin/core/build.gradle +++ b/plugin/core/build.gradle @@ -82,7 +82,6 @@ compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,- licenseHeaders { approvedLicenses << 'BCrypt (BSD-like)' additionalLicense 'BCRYP', 'BCrypt (BSD-like)', 'Copyright (c) 2006 Damien Miller ' - enabled = false } // make LicenseSigner available for testing signed licenses diff --git a/plugin/deprecation/build.gradle b/plugin/deprecation/build.gradle index a86c8570749..c3db6327348 100644 --- a/plugin/deprecation/build.gradle +++ b/plugin/deprecation/build.gradle @@ -13,8 +13,6 @@ esplugin { } archivesBaseName = 'x-pack-deprecation' -licenseHeaders.enabled = false - dependencies { provided "org.elasticsearch:elasticsearch:${version}" @@ -29,7 +27,4 @@ run { plugin ':x-pack-elasticsearch:plugin:core' } -// xpack modules are installed in real clusters as the meta plugin, so -// installing them as individual plugins for integ tests doesn't make sense, -// so we disable integ tests integTest.enabled = false diff --git a/plugin/graph/build.gradle b/plugin/graph/build.gradle index 31fff5ecd8d..d7900a601c7 100644 --- a/plugin/graph/build.gradle +++ b/plugin/graph/build.gradle @@ -13,8 +13,6 @@ esplugin { } archivesBaseName = 'x-pack-graph' -licenseHeaders.enabled = false - dependencies { provided "org.elasticsearch:elasticsearch:${version}" @@ -30,7 +28,4 @@ run { plugin ':x-pack-elasticsearch:plugin:core' } -// xpack modules are installed in real clusters as the meta plugin, so -// installing them as individual plugins for integ tests doesn't make sense, -// so we disable integ tests integTest.enabled = false diff --git a/plugin/logstash/build.gradle b/plugin/logstash/build.gradle index b84f4130c03..29529c8d447 100644 --- a/plugin/logstash/build.gradle +++ b/plugin/logstash/build.gradle @@ -13,8 +13,6 @@ esplugin { } archivesBaseName = 'x-pack-logstash' -licenseHeaders.enabled = false - dependencies { provided "org.elasticsearch:elasticsearch:${version}" @@ -31,7 +29,4 @@ run { plugin ':x-pack-elasticsearch:plugin:core' } -// xpack modules are installed in real clusters as the meta plugin, so -// installing them as individual plugins for integ tests doesn't make sense, -// so we disable integ tests integTest.enabled = false diff --git a/plugin/ml/build.gradle b/plugin/ml/build.gradle index c2254d3215c..e1a83aef374 100644 --- a/plugin/ml/build.gradle +++ b/plugin/ml/build.gradle @@ -16,8 +16,6 @@ esplugin { } archivesBaseName = 'x-pack-ml' -licenseHeaders.enabled = false - configurations { nativeBundle { resolutionStrategy.dependencySubstitution { @@ -58,7 +56,6 @@ dependencies { testCompile 'org.ini4j:ini4j:0.5.2' } -// TODO: we have a test jar so qa/ml-native-tests can use this stuff..fix that... configurations { testArtifacts.extendsFrom testRuntime } diff --git a/plugin/monitoring/build.gradle b/plugin/monitoring/build.gradle index 946ff4663b2..8de668913b1 100644 --- a/plugin/monitoring/build.gradle +++ b/plugin/monitoring/build.gradle @@ -16,8 +16,6 @@ esplugin { } archivesBaseName = 'x-pack-monitoring' -licenseHeaders.enabled = false - dependencies { provided "org.elasticsearch:elasticsearch:${version}" @@ -35,8 +33,6 @@ dependencies { compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" -// TODO: don't publish test artifacts just to run messy tests, fix the tests! -// https://github.com/elastic/x-plugins/issues/724 configurations { testArtifacts.extendsFrom testRuntime } diff --git a/plugin/security/build.gradle b/plugin/security/build.gradle index 1605690c9be..88f2100d158 100644 --- a/plugin/security/build.gradle +++ b/plugin/security/build.gradle @@ -14,8 +14,6 @@ esplugin { archivesBaseName = 'x-pack-security' -licenseHeaders.enabled = false - dependencies { provided "org.elasticsearch:elasticsearch:${version}" @@ -82,11 +80,6 @@ artifacts { archives jar testArtifacts testJar } -//testClasses { -// dependsOn project(":x-pack-elasticsearch:plugin:core").testJar -//} -// TestUtils creates things in core, and the cli thinks that it needs to read from the core testArtifacts -// jar, so it fails with a zip file resource not found in getResource(Path) sourceSets.test.resources { srcDir '../core/src/test/resources' } diff --git a/plugin/upgrade/build.gradle b/plugin/upgrade/build.gradle index cb88f785e1f..fa2c89de3da 100644 --- a/plugin/upgrade/build.gradle +++ b/plugin/upgrade/build.gradle @@ -16,8 +16,6 @@ esplugin { } archivesBaseName = 'x-pack-upgrade' -test.enabled=false -licenseHeaders.enabled = false dependencies { provided "org.elasticsearch:elasticsearch:${version}" @@ -36,9 +34,6 @@ run { plugin ':x-pack-elasticsearch:plugin:core' } -// xpack modules are installed in real clusters as the meta plugin, so -// installing them as individual plugins for integ tests doesn't make sense, -// so we disable integ tests integTest.enabled = false // Instead we create a separate task to run the diff --git a/plugin/watcher/build.gradle b/plugin/watcher/build.gradle index a28cab944a3..8255f19438d 100644 --- a/plugin/watcher/build.gradle +++ b/plugin/watcher/build.gradle @@ -14,9 +14,6 @@ esplugin { archivesBaseName = 'x-pack-watcher' -licenseHeaders.enabled = false - -// TODO: fix this! https://github.com/elastic/x-plugins/issues/1066 ext.compactProfile = 'full' compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"