Unify dependency licenses task configuration (elastic#58116)

- Remove duplicate dependency configuration - Use task avoidance api accross the build - Remove redundant licensesCheck config
jasontedor · Jun 17, 2020 · 5f9d1f1 · 5f9d1f1
1 parent 204bc0e
commit 5f9d1f1
Show file tree

Hide file tree

Showing 51 changed files with 46 additions and 107 deletions.
diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -51,7 +51,7 @@ run.executable = "${BuildParams.runtimeJavaHome}/bin/java"
 disableTasks('forbiddenApisMain')
 
 // No licenses for our benchmark deps (we don't ship benchmarks)
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 thirdPartyAudit.ignoreViolations(

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -168,7 +168,7 @@ if (project != rootProject) {
   groovydoc.enabled = false
 
   // build-tools is not ready for primetime with these...
-  dependencyLicenses.enabled = false
+  tasks.named("dependencyLicenses").configure { it.enabled = false }
   dependenciesInfo.enabled = false
   disableTasks('forbiddenApisMain', 'forbiddenApisMinimumRuntime',
     'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')

diff --git a/client/benchmark/build.gradle b/client/benchmark/build.gradle
@@ -41,5 +41,5 @@ dependencies {
 }
 
 // No licenses for our benchmark deps (we don't ship benchmarks)
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
diff --git a/client/client-benchmark-noop-api-plugin/build.gradle b/client/client-benchmark-noop-api-plugin/build.gradle
@@ -30,7 +30,7 @@ esplugin {
 // Not published so no need to assemble
 assemble.enabled = false
 
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 // no unit tests

diff --git a/client/rest-high-level/build.gradle b/client/rest-high-level/build.gradle
@@ -65,14 +65,6 @@ processTestResources {
   from(project(':client:rest-high-level').file('src/test/resources'))
 }
 
-dependencyLicenses {
-  // Don't check licenses for dependency that are part of the elasticsearch project
-  // But any other dependency should have its license/notice/sha1
-  dependencies = project.configurations.runtime.fileCollection {
-    it.group.startsWith('org.elasticsearch') == false
-  }
-}
-
 tasks.named('forbiddenApisMain').configure {
   // core does not depend on the httpclient for compile so we add the signatures here. We don't add them for test as they are already
   // specified

diff --git a/client/sniffer/build.gradle b/client/sniffer/build.gradle
@@ -53,7 +53,7 @@ tasks.named('forbiddenApisTest').configure {
   replaceSignatureFiles 'jdk-signatures'
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /http.*/, to: 'httpclient'
   mapping from: /commons-.*/, to: 'commons'
 }
@@ -71,12 +71,6 @@ testingConventions {
   }
 }
 
-dependencyLicenses {
-  dependencies = project.configurations.runtime.fileCollection {
-    it.group.startsWith('org.elasticsearch') == false
-  }
-}
-
 thirdPartyAudit.ignoreMissingClasses(
   //commons-logging optional dependencies
   'org.apache.avalon.framework.logger.Logger',

diff --git a/client/test/build.gradle b/client/test/build.gradle
@@ -48,7 +48,7 @@ tasks.named('forbiddenApisTest').configure {
 jarHell.enabled = false
 
 // TODO: should we have licenses for our test deps?
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 //we aren't releasing this jar

diff --git a/distribution/tools/plugin-cli/build.gradle b/distribution/tools/plugin-cli/build.gradle
@@ -31,7 +31,7 @@ dependencies {
   testRuntimeOnly 'com.google.guava:guava:18.0'
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /bc.*/, to: 'bouncycastle'
 }
 

diff --git a/libs/x-content/build.gradle b/libs/x-content/build.gradle
@@ -51,7 +51,7 @@ thirdPartyAudit.ignoreMissingClasses(
   'com.fasterxml.jackson.databind.cfg.MapperBuilder'
 )
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
 }
 

diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle
@@ -35,7 +35,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
   mapping from: /asm-.*/, to: 'asm'
 }

diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle
@@ -42,7 +42,7 @@ dependencies {
   compile project('spi')
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /asm-.*/, to: 'asm'
 }
 
@@ -193,4 +193,3 @@ task regen {
     }
   }
 }
-
diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle
@@ -44,10 +44,3 @@ restResources {
     includeCore '_common', 'indices', 'index', 'search', 'msearch'
   }
 }
-
-dependencyLicenses {
-  // Don't check the client's license. We know it.
-  dependencies = project.configurations.runtime.fileCollection {
-    it.group.startsWith('org.elasticsearch') == false
-  } - project.configurations.compileOnly
-}
diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle
@@ -49,7 +49,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /netty-.*/, to: 'netty'
 }
 

diff --git a/plugins/analysis-icu/build.gradle b/plugins/analysis-icu/build.gradle
@@ -41,7 +41,6 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
-
diff --git a/plugins/analysis-kuromoji/build.gradle b/plugins/analysis-kuromoji/build.gradle
@@ -32,7 +32,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
 
diff --git a/plugins/analysis-nori/build.gradle b/plugins/analysis-nori/build.gradle
@@ -31,7 +31,6 @@ restResources {
     includeCore '_common', 'indices', 'index', 'search'
   }
 }
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
-
diff --git a/plugins/analysis-phonetic/build.gradle b/plugins/analysis-phonetic/build.gradle
@@ -33,6 +33,6 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-smartcn/build.gradle b/plugins/analysis-smartcn/build.gradle
@@ -32,7 +32,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
 
diff --git a/plugins/analysis-stempel/build.gradle b/plugins/analysis-stempel/build.gradle
@@ -32,6 +32,6 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
 }
diff --git a/plugins/analysis-ukrainian/build.gradle b/plugins/analysis-ukrainian/build.gradle
@@ -35,7 +35,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
   mapping from: /morfologik-.*/, to: 'lucene'
 }

diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle
@@ -99,7 +99,7 @@ normalization {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /azure-.*/, to: 'azure'
   mapping from: /jackson-.*/, to: 'jackson'
   mapping from: /jersey-.*/, to: 'jersey'

diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle
@@ -46,7 +46,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'
   mapping from: /jackson-.*/, to: 'jackson'
 }

diff --git a/plugins/discovery-gce/build.gradle b/plugins/discovery-gce/build.gradle
@@ -27,7 +27,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /google-.*/, to: 'google'
 }
 

diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle
@@ -82,7 +82,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /apache-mime4j-.*/, to: 'apache-mime4j'
 }
 

diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle
@@ -42,7 +42,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /azure-.*/, to: 'azure'
   mapping from: /jackson-.*/, to: 'jackson'
   mapping from: /jersey-.*/, to: 'jersey'

diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle
@@ -72,7 +72,7 @@ restResources {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /google-cloud-.*/, to: 'google-cloud'
   mapping from: /google-auth-.*/, to: 'google-auth'
   mapping from: /google-http-.*/, to: 'google-http'

diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle
@@ -89,7 +89,7 @@ normalization {
   }
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /hadoop-.*/, to: 'hadoop'
 }
 

diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle
@@ -53,7 +53,7 @@ dependencies {
   testImplementation project(':test:fixtures:s3-fixture')
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /aws-java-sdk-.*/, to: 'aws-java-sdk'
   mapping from: /jmespath-java.*/, to: 'aws-java-sdk'
   mapping from: /jackson-.*/, to: 'jackson'

diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle
@@ -38,7 +38,7 @@ dependencies {
   compile "io.netty:netty-transport:${versions.netty}"
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /netty-.*/, to: 'netty'
 }
 

diff --git a/qa/os/build.gradle b/qa/os/build.gradle
@@ -52,7 +52,7 @@ tasks.test.enabled = false
 testingConventions.enabled = false
 
 // this project doesn't get published
-tasks.dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 tasks.dependenciesInfo.enabled = false
 
 tasks.thirdPartyAudit.ignoreMissingClasses()

diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle
@@ -85,7 +85,7 @@ check.dependsOn integTest
 
 test.enabled = false
 
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 thirdPartyAudit.enabled = false

diff --git a/server/build.gradle b/server/build.gradle
@@ -326,7 +326,7 @@ thirdPartyAudit.ignoreMissingClasses(
 
 thirdPartyAudit.ignoreMissingClasses 'javax.xml.bind.DatatypeConverter'
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /lucene-.*/, to: 'lucene'
   dependencies = project.configurations.runtime.fileCollection {
     it.group.startsWith('org.elasticsearch') == false ||

diff --git a/test/build.gradle b/test/build.gradle
@@ -26,7 +26,7 @@ subprojects {
   apply plugin: 'elasticsearch.publish'
 
   // TODO: should we have licenses for our test deps?
-  dependencyLicenses.enabled = false
+  tasks.named("dependencyLicenses").configure { it.enabled = false }
   dependenciesInfo.enabled = false
 
   // TODO: why is the test framework pulled in...

diff --git a/test/framework/build.gradle b/test/framework/build.gradle
@@ -44,7 +44,7 @@ tasks.named('forbiddenApisMain').configure {
 }
 
 // TODO: should we have licenses for our test deps?
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 thirdPartyAudit.ignoreMissingClasses(

diff --git a/x-pack/license-tools/build.gradle b/x-pack/license-tools/build.gradle
@@ -10,7 +10,7 @@ project.forbiddenPatterns {
   exclude '**/*.key'
 }
 
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 
 task buildZip(type: Zip, dependsOn: jar) {
   String parentDir = "license-tools-${version}"

diff --git a/x-pack/plugin/async-search/build.gradle b/x-pack/plugin/async-search/build.gradle
@@ -31,9 +31,5 @@ dependencies {
   testImplementation project(path: xpackModule('async'))
 }
 
-dependencyLicenses {
-  ignoreSha 'x-pack-core'
-}
-
 integTest.enabled = false
 
diff --git a/x-pack/plugin/ccr/build.gradle b/x-pack/plugin/ccr/build.gradle
@@ -46,10 +46,6 @@ dependencies {
   testImplementation project(path: xpackModule('monitoring'), configuration: 'testArtifacts')
 }
 
-dependencyLicenses {
-  ignoreSha 'x-pack-core'
-}
-
 testingConventions.naming {
   IT {
     baseClass "org.elasticsearch.xpack.CcrIntegTestCase"

diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle
@@ -18,7 +18,7 @@ esplugin {
   requiresKeystore false
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /http.*/, to: 'httpclient' // pulled in by rest client
   mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
 }

diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle
@@ -57,7 +57,7 @@ dependencies {
 compileJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
 compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /java-support|opensaml-.*/, to: 'shibboleth'
   mapping from: /http.*/, to: 'httpclient'
 }

diff --git a/x-pack/plugin/monitoring/build.gradle b/x-pack/plugin/monitoring/build.gradle
@@ -38,7 +38,7 @@ artifacts {
   testArtifacts testJar
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /http.*/, to: 'httpclient' // pulled in by rest client
   mapping from: /commons-.*/, to: 'commons' // pulled in by rest client
 }