Merge pull request elastic/elasticsearch#2924 from rjernst/license_header_check
Build: Turn on license header checks Original commit: elastic/x-pack-elasticsearch@dfad18d696
This commit is contained in:
commit
cb50d53424
|
@ -1,3 +1,5 @@
|
|||
import org.elasticsearch.gradle.precommit.LicenseHeadersTask
|
||||
|
||||
File checkstyleSuppressions = file('checkstyle_suppressions.xml')
|
||||
subprojects {
|
||||
tasks.withType(Checkstyle) {
|
||||
|
@ -7,4 +9,9 @@ subprojects {
|
|||
suppressions: checkstyleSuppressions
|
||||
]
|
||||
}
|
||||
|
||||
tasks.withType(LicenseHeadersTask.class) {
|
||||
approvedLicenses = ['Elasticsearch Confidential']
|
||||
additionalLicense 'ESCON', 'Elasticsearch Confidential', 'ELASTICSEARCH CONFIDENTIAL'
|
||||
}
|
||||
}
|
||||
|
|
|
@ -3,7 +3,5 @@ subprojects {
|
|||
project.forbiddenPatterns {
|
||||
exclude '**/*.key'
|
||||
}
|
||||
// someone figure out what the x-plugins logic should be
|
||||
project.licenseHeaders.enabled = false
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
subprojects {
|
||||
tasks.withType(org.elasticsearch.gradle.precommit.LicenseHeadersTask) {
|
||||
// someone figure out what the x-plugins logic should be
|
||||
project.licenseHeaders.enabled = false
|
||||
}
|
||||
}
|
|
@ -19,7 +19,10 @@ ext.versions = [
|
|||
// TODO: fix this! https://github.com/elastic/x-plugins/issues/1066
|
||||
ext.compactProfile = 'full'
|
||||
|
||||
dependencyLicenses.enabled = false
|
||||
licenseHeaders {
|
||||
approvedLicenses << 'BCrypt (BSD-like)'
|
||||
additionalLicense 'BCRYP', 'BCrypt (BSD-like)', 'Copyright (c) 2006 Damien Miller <djm@mindrot.org>'
|
||||
}
|
||||
|
||||
dependencies {
|
||||
// license deps
|
||||
|
@ -232,9 +235,6 @@ thirdPartyAudit.excludes = [
|
|||
'javax.activation.UnsupportedDataTypeException'
|
||||
]
|
||||
|
||||
// someone figure out what the x-plugins logic should be
|
||||
licenseHeaders.enabled = false
|
||||
|
||||
modifyPom { MavenPom pom ->
|
||||
pom.withXml { XmlProvider xml ->
|
||||
// first find if we have dependencies at all, and grab the node
|
||||
|
|
Loading…
Reference in New Issue