Restructure build tools java packages (elastic#72030)

Related to elastic#71593 we move all build logic that is for elasticsearch build only into the org.elasticsearch.gradle.internal* packages This makes it clearer if build logic is considered to be used by external projects Ultimately we want to only expose TestCluster and PluginBuildPlugin logic to third party plugin authors. This is a very first step towards that direction.
breskeby · Apr 26, 2021 · 5bcd02c · 5bcd02c
1 parent afb42fb
commit 5bcd02c
Show file tree

Hide file tree

Showing 339 changed files with 677 additions and 692 deletions.
diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle
@@ -1,4 +1,4 @@
-import org.elasticsearch.gradle.info.BuildParams
+import org.elasticsearch.gradle.internal.info.BuildParams
 
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one

diff --git a/build.gradle b/build.gradle
@@ -10,10 +10,10 @@ import com.avast.gradle.dockercompose.tasks.ComposePull
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin
 import de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.elasticsearch.gradle.BuildPlugin
+import org.elasticsearch.gradle.internal.BuildPlugin
 import org.elasticsearch.gradle.Version
-import org.elasticsearch.gradle.VersionProperties
-import org.elasticsearch.gradle.info.BuildParams
+import org.elasticsearch.gradle.internal.VersionProperties
+import org.elasticsearch.gradle.internal.info.BuildParams
 import org.elasticsearch.gradle.plugin.PluginBuildPlugin
 import org.gradle.plugins.ide.eclipse.model.AccessRule
 import org.gradle.plugins.ide.eclipse.model.SourceFolder
@@ -471,7 +471,7 @@ gradle.projectsEvaluated {
 }
 
 allprojects {
-  tasks.register('resolveAllDependencies', org.elasticsearch.gradle.ResolveAllDependencies) {
+  tasks.register('resolveAllDependencies', org.elasticsearch.gradle.internal.ResolveAllDependencies) {
     configs = project.configurations
     if (project.path.contains("fixture")) {
       dependsOn tasks.withType(ComposePull)

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -232,10 +232,10 @@ if (project != rootProject) {
     naming.clear()
     naming {
       Tests {
-        baseClass 'org.elasticsearch.gradle.test.GradleUnitTestCase'
+        baseClass 'org.elasticsearch.gradle.internal.test.GradleUnitTestCase'
       }
       IT {
-        baseClass 'org.elasticsearch.gradle.test.GradleIntegrationTestCase'
+        baseClass 'org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase'
       }
     }
   }
@@ -251,9 +251,9 @@ if (project != rootProject) {
 
   // for now we hardcode the tests for our build to use the gradle jvm.
   tasks.withType(Test).configureEach {
-    onlyIf { org.elasticsearch.gradle.info.BuildParams.inFipsJvm == false }
+    onlyIf { org.elasticsearch.gradle.internal.info.BuildParams.inFipsJvm == false }
     it.executable = Jvm.current().getJavaExecutable()
-    maxParallelForks = providers.systemProperty('tests.jvms').forUseAtConfigurationTime().getOrElse(org.elasticsearch.gradle.info.BuildParams.defaultParallel.toString()) as Integer
+    maxParallelForks = providers.systemProperty('tests.jvms').forUseAtConfigurationTime().getOrElse(org.elasticsearch.gradle.internal.info.BuildParams.defaultParallel.toString()) as Integer
   }
 
   publishing.publications.named("elastic").configure {

diff --git a/...c/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy b/...c/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy
@@ -9,6 +9,7 @@
 package org.elasticsearch.gradle
 
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
+import org.elasticsearch.gradle.internal.VersionProperties
 import org.gradle.testkit.runner.TaskOutcome
 import spock.lang.Unroll
 

diff --git a/...Src/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy b/...Src/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy
@@ -9,17 +9,13 @@
 package org.elasticsearch.gradle
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.databind.ObjectReader
-import com.fasterxml.jackson.databind.ObjectWriter
 import com.fasterxml.jackson.databind.SequenceWriter
 import com.fasterxml.jackson.databind.node.ObjectNode
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory
 import org.elasticsearch.gradle.fixtures.AbstractRestResourcesFuncTest
-import org.elasticsearch.gradle.internal.rest.compat.YamlRestCompatTestPlugin
+import org.elasticsearch.gradle.internal.VersionProperties
 import org.gradle.testkit.runner.TaskOutcome
 
-import java.nio.file.Path
-
 class YamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTest {
 
     def compatibleVersion = Version.fromString(VersionProperties.getVersions().get("elasticsearch")).getMajor() - 1

diff --git a/...dSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/...dSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy
@@ -98,11 +98,11 @@ abstract class AbstractGradleFuncTest extends Specification {
           id 'elasticsearch.global-build-info'
         }
         import org.elasticsearch.gradle.Architecture
-        import org.elasticsearch.gradle.info.BuildParams
+        import org.elasticsearch.gradle.internal.info.BuildParams
 
         BuildParams.init { it.setIsInternal(true) }
 
-        import org.elasticsearch.gradle.BwcVersions
+        import org.elasticsearch.gradle.internal.BwcVersions
         import org.elasticsearch.gradle.Version
 
         Version currentVersion = Version.fromString("8.0.0")

diff --git a/...src/integTest/groovy/org/elasticsearch/gradle/fixtures/DistributionDownloadFixture.groovy b/...src/integTest/groovy/org/elasticsearch/gradle/fixtures/DistributionDownloadFixture.groovy
@@ -10,7 +10,7 @@ package org.elasticsearch.gradle.fixtures
 
 import org.elasticsearch.gradle.Architecture
 import org.elasticsearch.gradle.ElasticsearchDistribution
-import org.elasticsearch.gradle.VersionProperties
+import org.elasticsearch.gradle.internal.VersionProperties
 import org.gradle.testkit.runner.BuildResult
 import org.gradle.testkit.runner.GradleRunner
 

diff --git a/...le/ElasticsearchJavaPluginFuncTest.groovy → ...al/ElasticsearchJavaPluginFuncTest.groovy b/...le/ElasticsearchJavaPluginFuncTest.groovy → ...al/ElasticsearchJavaPluginFuncTest.groovy
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle
+package org.elasticsearch.gradle.internal
 
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 
@@ -19,7 +19,7 @@ class ElasticsearchJavaPluginFuncTest extends AbstractGradleFuncTest {
           id 'elasticsearch.global-build-info'
         }
         import org.elasticsearch.gradle.Architecture
-        import org.elasticsearch.gradle.info.BuildParams
+        import org.elasticsearch.gradle.internal.info.BuildParams
         BuildParams.init { it.setMinimumRuntimeVersion(JavaVersion.VERSION_1_10) }
 
         apply plugin:'elasticsearch.java'

diff --git a/...lasticsearchTestBasePluginFuncTest.groovy → ...lasticsearchTestBasePluginFuncTest.groovy b/...lasticsearchTestBasePluginFuncTest.groovy → ...lasticsearchTestBasePluginFuncTest.groovy
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle
+package org.elasticsearch.gradle.internal
 
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 import org.gradle.testkit.runner.TaskOutcome

diff --git a/...y/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy b/...y/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy
@@ -8,7 +8,7 @@
 
 package org.elasticsearch.gradle.internal
 
-import org.elasticsearch.gradle.VersionProperties
+
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 import org.gradle.testkit.runner.TaskOutcome
 import spock.lang.Unroll

diff --git a/...y/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy b/...y/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy
@@ -22,7 +22,7 @@ class InternalDistributionArchiveSetupPluginFuncTest extends AbstractGradleFuncT
 
     def setup() {
         buildFile << """
-        import org.elasticsearch.gradle.tar.SymbolicLinkPreservingTar
+        import org.elasticsearch.gradle.internal.SymbolicLinkPreservingTar
 
         plugins {
             id 'elasticsearch.internal-distribution-archive-setup'

diff --git a/...roovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy b/...roovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy
@@ -9,7 +9,6 @@
 package org.elasticsearch.gradle.internal
 
 import org.elasticsearch.gradle.Architecture
-import org.elasticsearch.gradle.VersionProperties
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
 import org.gradle.testkit.runner.TaskOutcome
 

diff --git a/...h/gradle/JdkDownloadPluginFuncTest.groovy → ...internal/JdkDownloadPluginFuncTest.groovy b/...h/gradle/JdkDownloadPluginFuncTest.groovy → ...internal/JdkDownloadPluginFuncTest.groovy
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle
+package org.elasticsearch.gradle.internal
 
 import com.github.tomakehurst.wiremock.WireMockServer
 import org.elasticsearch.gradle.fixtures.AbstractGradleFuncTest
@@ -21,9 +21,9 @@ import java.nio.file.Paths
 import java.util.regex.Matcher
 import java.util.regex.Pattern
 
-import static org.elasticsearch.gradle.JdkDownloadPlugin.VENDOR_ADOPTOPENJDK
-import static org.elasticsearch.gradle.JdkDownloadPlugin.VENDOR_OPENJDK
-import static org.elasticsearch.gradle.JdkDownloadPlugin.VENDOR_AZUL
+import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_ADOPTOPENJDK
+import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_OPENJDK
+import static org.elasticsearch.gradle.internal.JdkDownloadPlugin.VENDOR_AZUL
 
 class JdkDownloadPluginFuncTest extends AbstractGradleFuncTest {
 

diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/ReaperPluginIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/ReaperPluginIT.java
@@ -7,7 +7,7 @@
  */
 package org.elasticsearch.gradle;
 
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.Before;

diff --git a/...g/elasticsearch/gradle/BuildPluginIT.java → ...search/gradle/internal/BuildPluginIT.java b/...g/elasticsearch/gradle/BuildPluginIT.java → ...search/gradle/internal/BuildPluginIT.java
@@ -5,11 +5,11 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.Rule;
@@ -25,7 +25,7 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import static org.elasticsearch.gradle.test.TestClasspathUtils.setupJarJdkClasspath;
+import static org.elasticsearch.gradle.internal.test.TestClasspathUtils.setupJarJdkClasspath;
 
 public class BuildPluginIT extends GradleIntegrationTestCase {
 

diff --git a/...ortElasticsearchBuildResourcesTaskIT.java → ...ortElasticsearchBuildResourcesTaskIT.java b/...ortElasticsearchBuildResourcesTaskIT.java → ...ortElasticsearchBuildResourcesTaskIT.java
@@ -1,5 +1,3 @@
-package org.elasticsearch.gradle;
-
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -8,7 +6,9 @@
  * Side Public License, v 1.
  */
 
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+package org.elasticsearch.gradle.internal;
+
+import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase;
 import org.gradle.testkit.runner.BuildResult;
 
 public class ExportElasticsearchBuildResourcesTaskIT extends GradleIntegrationTestCase {

diff --git a/...adle/tar/SymbolicLinkPreservingTarIT.java → ...internal/SymbolicLinkPreservingTarIT.java b/...adle/tar/SymbolicLinkPreservingTarIT.java → ...internal/SymbolicLinkPreservingTarIT.java
@@ -5,13 +5,13 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.tar;
+package org.elasticsearch.gradle.internal;
 
 import org.apache.commons.compress.archivers.tar.TarArchiveEntry;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase;
 import org.gradle.api.GradleException;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.Before;
@@ -133,16 +133,12 @@ private void assertTar(final String extension, final FileInputStreamWrapper wrap
     }
 
     private void runBuild(final String task, final boolean preserveFileTimestamps) {
-        final GradleRunner runner = GradleRunner.create()
-            .withProjectDir(getProjectDir())
-            .withArguments(
-                task,
-                "-Dtests.symbolic_link_preserving_tar_source=" + temporaryFolder.getRoot().toString(),
-                "-Dtests.symbolic_link_preserving_tar_preserve_file_timestamps=" + preserveFileTimestamps,
-                "-i"
-            )
-            .withPluginClasspath();
-
+        final GradleRunner runner = getGradleRunner("symbolic-link-preserving-tar").withArguments(
+            task,
+            "-Dtests.symbolic_link_preserving_tar_source=" + temporaryFolder.getRoot().toString(),
+            "-Dtests.symbolic_link_preserving_tar_preserve_file_timestamps=" + preserveFileTimestamps,
+            "-i"
+        );
         runner.build();
     }
 

diff --git a/...dSrc/src/integTest/java/org/elasticsearch/gradle/precommit/TestingConventionsTasksIT.java b/...dSrc/src/integTest/java/org/elasticsearch/gradle/precommit/TestingConventionsTasksIT.java
@@ -7,7 +7,7 @@
  */
 package org.elasticsearch.gradle.precommit;
 
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase;
 import org.gradle.testkit.runner.BuildResult;
 import org.gradle.testkit.runner.GradleRunner;
 import org.junit.Before;

diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTaskIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTaskIT.java
@@ -8,11 +8,11 @@
 
 package org.elasticsearch.gradle.precommit;
 
-import org.elasticsearch.gradle.test.GradleIntegrationTestCase;
+import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase;
 import org.gradle.testkit.runner.BuildResult;
 import org.junit.Before;
 
-import static org.elasticsearch.gradle.test.TestClasspathUtils.setupJarJdkClasspath;
+import static org.elasticsearch.gradle.internal.test.TestClasspathUtils.setupJarJdkClasspath;
 
 public class ThirdPartyAuditTaskIT extends GradleIntegrationTestCase {
 

diff --git a/...rch/gradle/fake_adoptopenjdk_linux.tar.gz → ...e/internal/fake_adoptopenjdk_linux.tar.gz b/...rch/gradle/fake_adoptopenjdk_linux.tar.gz → ...e/internal/fake_adoptopenjdk_linux.tar.gz
diff --git a/...earch/gradle/fake_adoptopenjdk_osx.tar.gz → ...dle/internal/fake_adoptopenjdk_osx.tar.gz b/...earch/gradle/fake_adoptopenjdk_osx.tar.gz → ...dle/internal/fake_adoptopenjdk_osx.tar.gz
diff --git a/...arch/gradle/fake_adoptopenjdk_windows.zip → ...le/internal/fake_adoptopenjdk_windows.zip b/...arch/gradle/fake_adoptopenjdk_windows.zip → ...le/internal/fake_adoptopenjdk_windows.zip
diff --git a/.../gradle/fake_azuljdk_linux_aarch64.tar.gz → ...nternal/fake_azuljdk_linux_aarch64.tar.gz b/.../gradle/fake_azuljdk_linux_aarch64.tar.gz → ...nternal/fake_azuljdk_linux_aarch64.tar.gz
diff --git a/...ch/gradle/fake_azuljdk_osx_aarch64.tar.gz → .../internal/fake_azuljdk_osx_aarch64.tar.gz b/...ch/gradle/fake_azuljdk_osx_aarch64.tar.gz → .../internal/fake_azuljdk_osx_aarch64.tar.gz
diff --git a/...icsearch/gradle/fake_openjdk_linux.tar.gz → ...gradle/internal/fake_openjdk_linux.tar.gz b/...icsearch/gradle/fake_openjdk_linux.tar.gz → ...gradle/internal/fake_openjdk_linux.tar.gz
diff --git a/...sticsearch/gradle/fake_openjdk_osx.tar.gz → ...h/gradle/internal/fake_openjdk_osx.tar.gz b/...sticsearch/gradle/fake_openjdk_osx.tar.gz → ...h/gradle/internal/fake_openjdk_osx.tar.gz
diff --git a/...ticsearch/gradle/fake_openjdk_windows.zip → .../gradle/internal/fake_openjdk_windows.zip b/...ticsearch/gradle/fake_openjdk_windows.zip → .../gradle/internal/fake_openjdk_windows.zip
diff --git a/...lasticsearch/gradle/AntFixtureStop.groovy → ...rch/gradle/internal/AntFixtureStop.groovy b/...lasticsearch/gradle/AntFixtureStop.groovy → ...rch/gradle/internal/AntFixtureStop.groovy
@@ -6,10 +6,11 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle
+package org.elasticsearch.gradle.internal
 
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.elasticsearch.gradle.test.AntFixture
+import org.elasticsearch.gradle.FixtureStop
+import org.elasticsearch.gradle.internal.test.AntFixture
 import org.gradle.api.file.FileSystemOperations
 import org.gradle.api.tasks.Internal
 

diff --git a/...y/org/elasticsearch/gradle/AntTask.groovy → ...sticsearch/gradle/internal/AntTask.groovy b/...y/org/elasticsearch/gradle/AntTask.groovy → ...sticsearch/gradle/internal/AntTask.groovy
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle
+package org.elasticsearch.gradle.internal
 
 import org.apache.tools.ant.BuildListener
 import org.apache.tools.ant.BuildLogger

diff --git a/...icsearch/gradle/doc/DocsTestPlugin.groovy → ...gradle/internal/doc/DocsTestPlugin.groovy b/...icsearch/gradle/doc/DocsTestPlugin.groovy → ...gradle/internal/doc/DocsTestPlugin.groovy
@@ -5,15 +5,14 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.doc
+package org.elasticsearch.gradle.internal.doc
 
 import org.elasticsearch.gradle.OS
 import org.elasticsearch.gradle.Version
-import org.elasticsearch.gradle.VersionProperties
+import org.elasticsearch.gradle.internal.VersionProperties
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.file.Directory
-import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.provider.Provider
 import org.gradle.api.tasks.TaskProvider
 

diff --git a/...adle/doc/RestTestsFromSnippetsTask.groovy → ...rnal/doc/RestTestsFromSnippetsTask.groovy b/...adle/doc/RestTestsFromSnippetsTask.groovy → ...rnal/doc/RestTestsFromSnippetsTask.groovy
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.doc
+package org.elasticsearch.gradle.internal.doc
 
 import groovy.transform.PackageScope
-import org.elasticsearch.gradle.doc.SnippetsTask.Snippet
+import org.elasticsearch.gradle.internal.doc.SnippetsTask.Snippet
 import org.gradle.api.InvalidUserDataException
 import org.gradle.api.file.DirectoryProperty
 import org.gradle.api.tasks.Input

diff --git a/...sticsearch/gradle/doc/SnippetsTask.groovy → ...h/gradle/internal/doc/SnippetsTask.groovy b/...sticsearch/gradle/doc/SnippetsTask.groovy → ...h/gradle/internal/doc/SnippetsTask.groovy
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.doc
+package org.elasticsearch.gradle.internal.doc
 
 import groovy.json.JsonException
 import groovy.json.JsonParserType

diff --git a/...asticsearch/gradle/test/AntFixture.groovy → ...ch/gradle/internal/test/AntFixture.groovy b/...asticsearch/gradle/test/AntFixture.groovy → ...ch/gradle/internal/test/AntFixture.groovy
@@ -6,11 +6,12 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.test
+package org.elasticsearch.gradle.internal.test
 
 import org.apache.tools.ant.taskdefs.condition.Os
-import org.elasticsearch.gradle.AntFixtureStop
-import org.elasticsearch.gradle.AntTask
+import org.elasticsearch.gradle.internal.AntFixtureStop
+import org.elasticsearch.gradle.internal.AntTask
+import org.elasticsearch.gradle.internal.test.Fixture
 import org.gradle.api.GradleException
 import org.gradle.api.tasks.Internal
 import org.gradle.api.tasks.TaskProvider