Enforce fail on deprecated gradle usage (7.9 backport) (#59851)

* Enforce fail on deprecated gradle usage (#59598) * Fix remaining gradle api deprecations
elastic · Jul 20, 2020 · 78d19e2 · 78d19e2
1 parent bf3f7bb
commit 78d19e2
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 13 deletions.
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/plugin/PluginBuildPlugin.groovy
@@ -147,7 +147,7 @@ class PluginBuildPlugin implements Plugin<Project> {
             project.pluginManager.apply('nebula.maven-base-publish')
             // Only change Jar tasks, we don't want a -client zip so we can't change archivesBaseName
             project.tasks.withType(Jar) {
-                baseName = baseName + "-client"
+                archiveBaseName = archiveBaseName.get() + "-client"
             }
             // always configure publishing for client jars
             project.publishing.publications.nebula(MavenPublication).artifactId(extension.name + "-client")

diff --git a/client/transport/build.gradle b/client/transport/build.gradle
@@ -34,12 +34,6 @@ dependencies {
   testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
 }
 
-dependencyLicenses {
-  dependencies = project.configurations.runtime.fileCollection {
-    it.group.startsWith('org.elasticsearch') == false
-  }
-}
-
 forbiddenApisTest {
   // we don't use the core test-framework, no lucene classes present so we don't want the es-test-signatures to
   // be pulled in

diff --git a/gradle.properties b/gradle.properties
@@ -6,3 +6,6 @@ options.forkOptions.memoryMaximumSize=2g
 # Disable duplicate project id detection
 # See https://docs.gradle.org/current/userguide/upgrading_version_6.html#duplicate_project_names_may_cause_publication_to_fail
 systemProp.org.gradle.dependency.duplicate.project.detection=false
+
+# Enforce the build to fail on deprecated gradle api usage
+systemProp.org.gradle.warning.mode=fail
diff --git a/libs/core/build.gradle b/libs/core/build.gradle
@@ -39,7 +39,7 @@ if (!isEclipse) {
   }
 
   dependencies {
-    java11Compile sourceSets.main.output
+    java11Implementation sourceSets.main.output
   }
 
   compileJava11Java {
@@ -71,10 +71,6 @@ dependencies {
   testImplementation "junit:junit:${versions.junit}"
   testImplementation "org.hamcrest:hamcrest:${versions.hamcrest}"
 
-  if (!isEclipse) {
-    java11Compile sourceSets.main.output
-  }
-
   testImplementation(project(":test:framework")) {
     exclude group: 'org.elasticsearch', module: 'elasticsearch-core'
   }

diff --git a/x-pack/qa/smoke-test-plugins-ssl/build.gradle b/x-pack/qa/smoke-test-plugins-ssl/build.gradle
@@ -79,6 +79,7 @@ ext.expansions = [
 
 processTestResources {
   from(sourceSets.test.resources.srcDirs) {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
     include '**/*.yml'
     inputs.properties(expansions)
     MavenFilteringHack.filter(it, expansions)

diff --git a/x-pack/qa/third-party/active-directory/build.gradle b/x-pack/qa/third-party/active-directory/build.gradle
@@ -10,6 +10,7 @@ testFixtures.useFixture ":x-pack:test:smb-fixture"
 
 // add test resources from security, so tests can use example certs
 processTestResources {
+  duplicatesStrategy = DuplicatesStrategy.INCLUDE
   from(project(xpackModule('core')).sourceSets.test.resources.srcDirs)
   from(project(xpackModule('security')).sourceSets.test.resources.srcDirs)
 }

diff --git a/x-pack/snapshot-tool/build.gradle b/x-pack/snapshot-tool/build.gradle
@@ -114,7 +114,7 @@ task buildTarArchive(dependsOn: copyRuntimeLibs, type: Tar) {
   compression Compression.GZIP
   archiveBaseName.set('snapshot-tool')
   destinationDirectory.set(project.buildDir)
-  into "snapshot-tool-${version}", {
+  into "snapshot-tool-${archiveVersion.get()}", {
     into "bin", {
       from file("${project.projectDir}/src/bin")
     }