Enable the licenseHeaders task for plugins (elastic/x-pack-elasticsearch#3673)

Original commit: elastic/x-pack-elasticsearch@c9949b8ca5
This commit is contained in:
Michael Basnight 2018-01-25 11:34:02 -06:00 committed by GitHub
parent 705804ee0c
commit e59bcd8f8e
9 changed files with 0 additions and 38 deletions

View File

@ -82,7 +82,6 @@ compileTestJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-
licenseHeaders { licenseHeaders {
approvedLicenses << 'BCrypt (BSD-like)' approvedLicenses << 'BCrypt (BSD-like)'
additionalLicense 'BCRYP', 'BCrypt (BSD-like)', 'Copyright (c) 2006 Damien Miller <djm@mindrot.org>' additionalLicense 'BCRYP', 'BCrypt (BSD-like)', 'Copyright (c) 2006 Damien Miller <djm@mindrot.org>'
enabled = false
} }
// make LicenseSigner available for testing signed licenses // make LicenseSigner available for testing signed licenses

View File

@ -13,8 +13,6 @@ esplugin {
} }
archivesBaseName = 'x-pack-deprecation' archivesBaseName = 'x-pack-deprecation'
licenseHeaders.enabled = false
dependencies { dependencies {
provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch:elasticsearch:${version}"
@ -29,7 +27,4 @@ run {
plugin ':x-pack-elasticsearch:plugin:core' 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 integTest.enabled = false

View File

@ -13,8 +13,6 @@ esplugin {
} }
archivesBaseName = 'x-pack-graph' archivesBaseName = 'x-pack-graph'
licenseHeaders.enabled = false
dependencies { dependencies {
provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch:elasticsearch:${version}"
@ -30,7 +28,4 @@ run {
plugin ':x-pack-elasticsearch:plugin:core' 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 integTest.enabled = false

View File

@ -13,8 +13,6 @@ esplugin {
} }
archivesBaseName = 'x-pack-logstash' archivesBaseName = 'x-pack-logstash'
licenseHeaders.enabled = false
dependencies { dependencies {
provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch:elasticsearch:${version}"
@ -31,7 +29,4 @@ run {
plugin ':x-pack-elasticsearch:plugin:core' 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 integTest.enabled = false

View File

@ -16,8 +16,6 @@ esplugin {
} }
archivesBaseName = 'x-pack-ml' archivesBaseName = 'x-pack-ml'
licenseHeaders.enabled = false
configurations { configurations {
nativeBundle { nativeBundle {
resolutionStrategy.dependencySubstitution { resolutionStrategy.dependencySubstitution {
@ -58,7 +56,6 @@ dependencies {
testCompile 'org.ini4j:ini4j:0.5.2' 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 { configurations {
testArtifacts.extendsFrom testRuntime testArtifacts.extendsFrom testRuntime
} }

View File

@ -16,8 +16,6 @@ esplugin {
} }
archivesBaseName = 'x-pack-monitoring' archivesBaseName = 'x-pack-monitoring'
licenseHeaders.enabled = false
dependencies { dependencies {
provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch:elasticsearch:${version}"
@ -35,8 +33,6 @@ dependencies {
compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"
compileTestJava.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 { configurations {
testArtifacts.extendsFrom testRuntime testArtifacts.extendsFrom testRuntime
} }

View File

@ -14,8 +14,6 @@ esplugin {
archivesBaseName = 'x-pack-security' archivesBaseName = 'x-pack-security'
licenseHeaders.enabled = false
dependencies { dependencies {
provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch:elasticsearch:${version}"
@ -82,11 +80,6 @@ artifacts {
archives jar archives jar
testArtifacts testJar 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 { sourceSets.test.resources {
srcDir '../core/src/test/resources' srcDir '../core/src/test/resources'
} }

View File

@ -16,8 +16,6 @@ esplugin {
} }
archivesBaseName = 'x-pack-upgrade' archivesBaseName = 'x-pack-upgrade'
test.enabled=false
licenseHeaders.enabled = false
dependencies { dependencies {
provided "org.elasticsearch:elasticsearch:${version}" provided "org.elasticsearch:elasticsearch:${version}"
@ -36,9 +34,6 @@ run {
plugin ':x-pack-elasticsearch:plugin:core' 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 integTest.enabled = false
// Instead we create a separate task to run the // Instead we create a separate task to run the

View File

@ -14,9 +14,6 @@ esplugin {
archivesBaseName = 'x-pack-watcher' archivesBaseName = 'x-pack-watcher'
licenseHeaders.enabled = false
// TODO: fix this! https://github.com/elastic/x-plugins/issues/1066
ext.compactProfile = 'full' ext.compactProfile = 'full'
compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked" compileJava.options.compilerArgs << "-Xlint:-deprecation,-rawtypes,-serial,-try,-unchecked"