Fix deprecation warning in ThirdpartyAuditTask (#57123)

Author: breskeby

buildSrc/build.gradle

@@ -23,10 +23,16 @@ import org.gradle.util.GradleVersion
 plugins {
   id 'java-gradle-plugin'
   id 'groovy'
+  id 'java-test-fixtures'
 }
 
 group = 'org.elasticsearch.gradle'
 
+String minimumGradleVersion = file('src/main/resources/minimumGradleVersion').text.trim()
+if (GradleVersion.current() < GradleVersion.version(minimumGradleVersion)) {
+  throw new GradleException("Gradle ${minimumGradleVersion}+ is required to build elasticsearch")
+}
+
 if (project == rootProject) {
   // change the build dir used during build init, so that doing a clean
   // won't wipe out the buildscript jar
@@ -64,6 +70,11 @@ if (JavaVersion.current() < JavaVersion.VERSION_11) {
 sourceSets {
   // We have a few classes that need to be compiled for older java versions
   minimumRuntime {}
+
+  integTest {
+    compileClasspath += sourceSets["main"].output + configurations["testRuntimeClasspath"]
+    runtimeClasspath += output + compileClasspath
+  }
 }
 
 configurations {
@@ -117,8 +128,10 @@ dependencies {
   compile 'com.networknt:json-schema-validator:1.0.36'
   compileOnly "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
   testCompile "com.puppycrawl.tools:checkstyle:${props.getProperty('checkstyle')}"
-  testCompile "junit:junit:${props.getProperty('junit')}"
-  testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
+  testFixturesApi "junit:junit:${props.getProperty('junit')}"
+  testFixturesApi "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${props.getProperty('randomizedrunner')}"
+  testFixturesApi gradleApi()
+  testFixturesApi gradleTestKit()
   testCompile 'com.github.tomakehurst:wiremock-jre8-standalone:2.23.2'
   testCompile 'org.mockito:mockito-core:1.9.5'
   minimumRuntimeCompile "junit:junit:${props.getProperty('junit')}"
@@ -165,10 +178,11 @@ if (project != rootProject) {
   // build-tools is not ready for primetime with these...
   dependencyLicenses.enabled = false
   dependenciesInfo.enabled = false
-  disableTasks('forbiddenApisMain', 'forbiddenApisMinimumRuntime', 'forbiddenApisTest')
+  disableTasks('forbiddenApisMain', 'forbiddenApisMinimumRuntime',
+    'forbiddenApisTest', 'forbiddenApisIntegTest', 'forbiddenApisTestFixtures')
   jarHell.enabled = false
   thirdPartyAudit.enabled = false
-  if (Boolean.parseBoolean(System.getProperty("tests.fips.enabled"))){
+  if (Boolean.parseBoolean(System.getProperty("tests.fips.enabled"))) {
     test.enabled = false
   }
 
@@ -237,6 +251,8 @@ if (project != rootProject) {
     systemProperty 'test.version_under_test', version
     onlyIf { org.elasticsearch.gradle.info.BuildParams.inFipsJvm == false }
     maxParallelForks = System.getProperty('tests.jvms', org.elasticsearch.gradle.info.BuildParams.defaultParallel.toString()) as Integer
+    testClassesDirs = sourceSets.integTest.output.classesDirs
+    classpath = sourceSets.integTest.runtimeClasspath
   }
   check.dependsOn("integTest")
 
@@ -252,6 +268,11 @@ if (project != rootProject) {
   afterEvaluate {
     generatePomFileForPluginMavenPublication.enabled = false
   }
+
+  publishing.publications.named("nebula").configure {
+    suppressPomMetadataWarningsFor("testFixturesApiElements")
+    suppressPomMetadataWarningsFor("testFixturesRuntimeElements")
+  }
 }
 
 // Define this here because we need it early.

…gradle/AdoptOpenJdkDownloadPluginIT.java …gradle/AdoptOpenJdkDownloadPluginIT.javabuildSrc/src/test/java/org/elasticsearch/gradle/AdoptOpenJdkDownloadPluginIT.java renamed to buildSrc/src/integTest/java/org/elasticsearch/gradle/AdoptOpenJdkDownloadPluginIT.java buildSrc/src/test/java/org/elasticsearch/gradle/AdoptOpenJdkDownloadPluginIT.java renamed to buildSrc/src/integTest/java/org/elasticsearch/gradle/AdoptOpenJdkDownloadPluginIT.java

@@ -1,9 +1,3 @@
-package org.elasticsearch.gradle.precommit;
-
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
-import org.gradle.testkit.runner.BuildResult;
-import org.junit.Before;
-
 /*
  * Licensed to Elasticsearch under one or more contributor
  * license agreements. See the NOTICE file distributed with
@@ -13,7 +7,7 @@
  * not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
@@ -22,6 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+package org.elasticsearch.gradle.precommit;
+
+import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+import org.gradle.testkit.runner.BuildResult;
+import org.junit.Before;
+
 public class ThirdPartyAuditTaskIT extends GradleIntegrationTestCase {
 
     @Before
@@ -41,6 +42,7 @@ public void testElasticsearchIgnored() {
             "-PcompileVersion=0.0.1"
         ).build();
         assertTaskNoSource(result, ":empty");
+        assertNoDeprecationWarning(result);
     }
 
     public void testWithEmptyRules() {
@@ -69,6 +71,7 @@ public void testViolationFoundAndCompileOnlyIgnored() {
         assertTaskFailed(result, ":absurd");
         assertOutputContains(result.getOutput(), "Classes with violations:", "  * TestingIO", "> Audit of third party dependencies failed");
         assertOutputDoesNotContain(result.getOutput(), "Missing classes:");
+        assertNoDeprecationWarning(result);
     }
 
     public void testClassNotFoundAndCompileOnlyIgnored() {
@@ -90,6 +93,7 @@ public void testClassNotFoundAndCompileOnlyIgnored() {
             "> Audit of third party dependencies failed"
         );
         assertOutputDoesNotContain(result.getOutput(), "Classes with violations:");
+        assertNoDeprecationWarning(result);
     }
 
     public void testJarHellWithJDK() {
@@ -111,6 +115,7 @@ public void testJarHellWithJDK() {
             "    * java.lang.String"
         );
         assertOutputDoesNotContain(result.getOutput(), "Classes with violations:");
+        assertNoDeprecationWarning(result);
     }
 
     public void testElasticsearchIgnoredWithViolations() {
@@ -124,6 +129,7 @@ public void testElasticsearchIgnoredWithViolations() {
             "-PcompileVersion=0.0.1"
         ).build();
         assertTaskNoSource(result, ":absurd");
+        assertNoDeprecationWarning(result);
     }
 
 }