From abc72c1a27f92458293cd17712205f8a25844a0f Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Thu, 18 Jun 2020 08:15:50 +0200
Subject: [PATCH] Unify dependency licenses task configuration (#58116)
 (#58274)

- Remove duplicate dependency configuration
- Use task avoidance api accross the build
- Remove redundant licensesCheck config
---
 benchmarks/build.gradle                              | 2 +-
 buildSrc/build.gradle                                | 2 +-
 client/benchmark/build.gradle                        | 2 +-
 client/client-benchmark-noop-api-plugin/build.gradle | 2 +-
 client/rest-high-level/build.gradle                  | 8 --------
 client/sniffer/build.gradle                          | 9 +--------
 client/test/build.gradle                             | 2 +-
 distribution/tools/plugin-cli/build.gradle           | 2 +-
 libs/x-content/build.gradle                          | 2 +-
 modules/lang-expression/build.gradle                 | 2 +-
 modules/lang-painless/build.gradle                   | 3 +--
 modules/percolator/build.gradle                      | 7 -------
 modules/transport-netty4/build.gradle                | 2 +-
 plugins/analysis-icu/build.gradle                    | 3 +--
 plugins/analysis-kuromoji/build.gradle               | 2 +-
 plugins/analysis-nori/build.gradle                   | 3 +--
 plugins/analysis-phonetic/build.gradle               | 2 +-
 plugins/analysis-smartcn/build.gradle                | 2 +-
 plugins/analysis-stempel/build.gradle                | 2 +-
 plugins/analysis-ukrainian/build.gradle              | 2 +-
 plugins/discovery-azure-classic/build.gradle         | 2 +-
 plugins/discovery-ec2/build.gradle                   | 2 +-
 plugins/discovery-gce/build.gradle                   | 2 +-
 plugins/ingest-attachment/build.gradle               | 2 +-
 plugins/repository-azure/build.gradle                | 2 +-
 plugins/repository-gcs/build.gradle                  | 2 +-
 plugins/repository-hdfs/build.gradle                 | 2 +-
 plugins/repository-s3/build.gradle                   | 2 +-
 plugins/transport-nio/build.gradle                   | 2 +-
 qa/os/build.gradle                                   | 2 +-
 qa/wildfly/build.gradle                              | 2 +-
 server/build.gradle                                  | 2 +-
 test/build.gradle                                    | 2 +-
 test/framework/build.gradle                          | 2 +-
 x-pack/license-tools/build.gradle                    | 2 +-
 x-pack/plugin/async-search/build.gradle              | 4 ----
 x-pack/plugin/ccr/build.gradle                       | 4 ----
 x-pack/plugin/core/build.gradle                      | 2 +-
 x-pack/plugin/identity-provider/build.gradle         | 2 +-
 x-pack/plugin/monitoring/build.gradle                | 2 +-
 x-pack/plugin/search-business-rules/build.gradle     | 6 ------
 x-pack/plugin/security/build.gradle                  | 2 +-
 x-pack/plugin/security/cli/build.gradle              | 2 +-
 x-pack/plugin/sql/jdbc/build.gradle                  | 8 +-------
 x-pack/plugin/sql/qa/jdbc/build.gradle               | 2 +-
 x-pack/plugin/sql/qa/server/build.gradle             | 2 +-
 x-pack/plugin/sql/sql-action/build.gradle            | 5 +----
 x-pack/plugin/sql/sql-cli/build.gradle               | 9 +--------
 x-pack/plugin/sql/sql-client/build.gradle            | 6 +-----
 x-pack/plugin/sql/sql-proto/build.gradle             | 4 +---
 x-pack/plugin/watcher/build.gradle                   | 3 +--
 51 files changed, 46 insertions(+), 108 deletions(-)

diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
index 6f1cb0a0e277..29d53c73824c 100644
--- 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
index 20f3a16b6328..45a8b3808137 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -176,7 +176,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
index eb2c634f9720..5a89113137ea 100644
--- a/client/benchmark/build.gradle
+++ b/client/benchmark/build.gradle
@@ -47,5 +47,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
index 0fdc6f9a9297..b22a22000524 100644
--- 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
index 12536111e9e7..976194f3f2d7 100644
--- a/client/rest-high-level/build.gradle
+++ b/client/rest-high-level/build.gradle
@@ -62,14 +62,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
index 2da204c20edd..e16fd5667307 100644
--- 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,13 +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
index 039701e35131..c63226f44aa7 100644
--- 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
index ea56b48a3cce..5116e1ec72fd 100644
--- 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
index c0e051d8bd21..45b6862c28b3 100644
--- 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
index d3a165c13b94..25e707195867 100644
--- 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
index c20887cea9ee..8c45935b30d8 100644
--- 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
index 0e030e82136f..b07fcb36deb7 100644
--- a/modules/percolator/build.gradle
+++ b/modules/percolator/build.gradle
@@ -45,10 +45,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
index 7a49fa55256c..96163b759cd6 100644
--- a/modules/transport-netty4/build.gradle
+++ b/modules/transport-netty4/build.gradle
@@ -50,7 +50,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
index 58a2276a85bc..2c79b79a1a43 100644
--- a/plugins/analysis-icu/build.gradle
+++ b/plugins/analysis-icu/build.gradle
@@ -42,7 +42,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
index 85c8b472acee..02ffa6c9eb86 100644
--- 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
index c732ec9037db..024f1059a733 100644
--- 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
index 82091b91d9ea..a281d7b111ae 100644
--- 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
index a6d287ef690d..2905bd430179 100644
--- 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
index 7f90e1081736..46751d03c1bb 100644
--- 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
index cec538d7d79a..b69dbc35a985 100644
--- 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
index e6c46fe1c5ae..16910aa9167b 100644
--- 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
index 3c96ad013424..b01263e3decf 100644
--- 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
index 275eb9312a30..3501890c48eb 100644
--- 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
index c6cbd3fceaeb..da2ee6e46c7a 100644
--- 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
index 6e83dcd1423a..7b70f71cee26 100644
--- 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
index e1892963ed55..f0a18b07b9cf 100644
--- 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
index b8e4f0f01ec9..0f61a3dabbbf 100644
--- 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
index 2105e539d118..e823b9195197 100644
--- 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
index eee161bac7c5..76cdaa39c6c6 100644
--- a/plugins/transport-nio/build.gradle
+++ b/plugins/transport-nio/build.gradle
@@ -39,7 +39,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
index c6606eaaf8da..a4a9f2ff1edb 100644
--- 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
index b2f9ea2f8122..25803550336e 100644
--- 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
index 7654e1760400..aa89a871ea9c 100644
--- a/server/build.gradle
+++ b/server/build.gradle
@@ -322,7 +322,7 @@ if (BuildParams.runtimeJavaVersion > JavaVersion.VERSION_1_8) {
   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
index b136abc1d735..300cb82dec05 100644
--- 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
index c5d4c383fe33..a15844d34848 100644
--- 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
index f0586be4b6de..5811437e664b 100644
--- 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
index 4f5ed0b9c670..ead7410873f3 100644
--- a/x-pack/plugin/async-search/build.gradle
+++ b/x-pack/plugin/async-search/build.gradle
@@ -30,9 +30,5 @@ dependencies {
   testImplementation project(path: xpackModule('ilm'))
 }
 
-dependencyLicenses {
-  ignoreSha 'x-pack-core'
-}
-
 integTest.enabled = false
 
diff --git a/x-pack/plugin/ccr/build.gradle b/x-pack/plugin/ccr/build.gradle
index bd4e968ebde9..1603957f929d 100644
--- 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
index 9518f3708a91..5e7fdda0f697 100644
--- 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
index 9dcf10b09571..87bf1f62ac1b 100644
--- 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
index 3e22893aa3e3..148cdd30f98e 100644
--- 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
 }
diff --git a/x-pack/plugin/search-business-rules/build.gradle b/x-pack/plugin/search-business-rules/build.gradle
index 401c4e639659..0efef49af926 100644
--- a/x-pack/plugin/search-business-rules/build.gradle
+++ b/x-pack/plugin/search-business-rules/build.gradle
@@ -11,7 +11,6 @@ esplugin {
 }
 archivesBaseName = 'x-pack-searchbusinessrules'
 
-
 integTest.enabled = false
 
 dependencies {
@@ -20,8 +19,3 @@ dependencies {
   testImplementation project(":test:framework")
 }
 
-// copied from CCR
-dependencyLicenses {
-  ignoreSha 'x-pack-core'
-}
-
diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle
index e7dc41034916..373a5bfe6fe5 100644
--- a/x-pack/plugin/security/build.gradle
+++ b/x-pack/plugin/security/build.gradle
@@ -155,7 +155,7 @@ artifacts {
   testArtifacts testJar
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /java-support|opensaml-.*/, to: 'shibboleth'
   mapping from: /http.*/, to: 'httpclient'
 }
diff --git a/x-pack/plugin/security/cli/build.gradle b/x-pack/plugin/security/cli/build.gradle
index 08e842a11c27..9c9b46e7a4e3 100644
--- a/x-pack/plugin/security/cli/build.gradle
+++ b/x-pack/plugin/security/cli/build.gradle
@@ -19,7 +19,7 @@ dependencies {
   testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /bc.*/, to: 'bouncycastle'
 }
 
diff --git a/x-pack/plugin/sql/jdbc/build.gradle b/x-pack/plugin/sql/jdbc/build.gradle
index 7e12ae81643e..db97f35c16fa 100644
--- a/x-pack/plugin/sql/jdbc/build.gradle
+++ b/x-pack/plugin/sql/jdbc/build.gradle
@@ -30,14 +30,8 @@ dependencies {
   testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
 }
 
-dependencyLicenses {
-  mapping from: /sql-proto.*/, to: 'elasticsearch'
-  mapping from: /sql-client.*/, to: 'elasticsearch'
+tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
-  mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
-  ignoreSha 'sql-proto'
-  ignoreSha 'sql-client'
-  ignoreSha 'elasticsearch'
 }
 
 shadowJar {
diff --git a/x-pack/plugin/sql/qa/jdbc/build.gradle b/x-pack/plugin/sql/qa/jdbc/build.gradle
index ffbd8b3cf227..875c15e03459 100644
--- a/x-pack/plugin/sql/qa/jdbc/build.gradle
+++ b/x-pack/plugin/sql/qa/jdbc/build.gradle
@@ -15,7 +15,7 @@ dependencies {
  * other qa projects. */
 test.enabled = false
 
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 // the main files are actually test files, so use the appropriate forbidden api sigs
diff --git a/x-pack/plugin/sql/qa/server/build.gradle b/x-pack/plugin/sql/qa/server/build.gradle
index 17c2da162e14..1e2c87544459 100644
--- a/x-pack/plugin/sql/qa/server/build.gradle
+++ b/x-pack/plugin/sql/qa/server/build.gradle
@@ -37,7 +37,7 @@ dependencies {
  * other qa projects. */
 test.enabled = false
 
-dependencyLicenses.enabled = false
+tasks.named("dependencyLicenses").configure { it.enabled = false }
 dependenciesInfo.enabled = false
 
 // just a test fixture: we aren't using this jars in releases and H2GIS requires disabling a lot of checks
diff --git a/x-pack/plugin/sql/sql-action/build.gradle b/x-pack/plugin/sql/sql-action/build.gradle
index 1bee2824e070..2c451cba2f36 100644
--- a/x-pack/plugin/sql/sql-action/build.gradle
+++ b/x-pack/plugin/sql/sql-action/build.gradle
@@ -33,12 +33,9 @@ tasks.named('forbiddenApisMain').configure {
   replaceSignatureFiles 'jdk-signatures'
 }
 
-dependencyLicenses {
-  mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
+tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
   mapping from: /lucene-.*/, to: 'lucene'
-  ignoreSha 'elasticsearch'
-  ignoreSha 'elasticsearch-core'
 }
 
 thirdPartyAudit.ignoreMissingClasses(
diff --git a/x-pack/plugin/sql/sql-cli/build.gradle b/x-pack/plugin/sql/sql-cli/build.gradle
index 06113548af5d..8424aa108638 100644
--- a/x-pack/plugin/sql/sql-cli/build.gradle
+++ b/x-pack/plugin/sql/sql-cli/build.gradle
@@ -34,19 +34,12 @@ dependencies {
   testImplementation project(":test:framework")
 }
 
-dependencyLicenses {
-  mapping from: /elasticsearch-cli.*/, to: 'elasticsearch'
-  mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
+tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
   mapping from: /lucene-.*/, to: 'lucene'
   mapping from: /sql-action.*/, to: 'elasticsearch'
   mapping from: /sql-client.*/, to: 'elasticsearch'
   mapping from: /jline-.*/, to: 'jline'
-  ignoreSha 'elasticsearch-cli'
-  ignoreSha 'elasticsearch-core'
-  ignoreSha 'elasticsearch'
-  ignoreSha 'sql-action'
-  ignoreSha 'sql-client'
 }
 
 shadowJar {
diff --git a/x-pack/plugin/sql/sql-client/build.gradle b/x-pack/plugin/sql/sql-client/build.gradle
index 5fa4a489d33a..793bf14d2c90 100644
--- a/x-pack/plugin/sql/sql-client/build.gradle
+++ b/x-pack/plugin/sql/sql-client/build.gradle
@@ -13,12 +13,8 @@ dependencies {
   testImplementation project(path: xpackModule('core'), configuration: 'testArtifacts')
 }
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
-  mapping from: /sql-proto.*/, to: 'elasticsearch'
-  mapping from: /elasticsearch-cli.*/, to: 'elasticsearch'
-  mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
-  ignoreSha 'elasticsearch-core'
 }
 
 tasks.named('forbiddenApisMain').configure {
diff --git a/x-pack/plugin/sql/sql-proto/build.gradle b/x-pack/plugin/sql/sql-proto/build.gradle
index c64ca59f59bd..87e971aff2c2 100644
--- a/x-pack/plugin/sql/sql-proto/build.gradle
+++ b/x-pack/plugin/sql/sql-proto/build.gradle
@@ -23,8 +23,6 @@ tasks.named('forbiddenApisMain').configure {
   replaceSignatureFiles 'jdk-signatures'
 }
 
-dependencyLicenses {
-  mapping from: /elasticsearch-core.*/, to: 'elasticsearch'
+tasks.named("dependencyLicenses").configure {
   mapping from: /jackson-.*/, to: 'jackson'
-  ignoreSha 'elasticsearch-core'
 }
diff --git a/x-pack/plugin/watcher/build.gradle b/x-pack/plugin/watcher/build.gradle
index 4c76a799ff51..0c17e7349d88 100644
--- a/x-pack/plugin/watcher/build.gradle
+++ b/x-pack/plugin/watcher/build.gradle
@@ -19,9 +19,8 @@ ext.compactProfile = 'full'
 compileJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
 compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
 
-dependencyLicenses {
+tasks.named("dependencyLicenses").configure {
   mapping from: /owasp-java-html-sanitizer.*/, to: 'owasp-java-html-sanitizer'
-  ignoreSha 'x-pack-core'
 }
 
 dependencies {