Restructure build tools java packages (#72030)

Related to #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.

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

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)

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 {

buildSrc/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
 

buildSrc/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

buildSrc/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")

buildSrc/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
 

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchJavaPluginFuncTest.groovy → buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/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'

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchTestBasePluginFuncTest.groovy → buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchTestBasePluginFuncTest.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

buildSrc/src/integTest/groovy/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

buildSrc/src/integTest/groovy/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'

buildSrc/src/integTest/groovy/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
 

buildSrc/src/integTest/groovy/org/elasticsearch/gradle/JdkDownloadPluginFuncTest.groovy → buildSrc/src/integTest/groovy/org/elasticsearch/gradle/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 {
 

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;

buildSrc/src/integTest/java/org/elasticsearch/gradle/BuildPluginIT.java → buildSrc/src/integTest/java/org/elasticsearch/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.List;
 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 {
 

buildSrc/src/integTest/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTaskIT.java → buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTaskIT.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 @@ package org.elasticsearch.gradle;
  * 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 {

buildSrc/src/integTest/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTarIT.java → buildSrc/src/integTest/java/org/elasticsearch/gradle/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 @@ public class SymbolicLinkPreservingTarIT extends GradleIntegrationTestCase {
     }
 
     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();
     }
 

buildSrc/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;

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 {
 

buildSrc/src/main/groovy/org/elasticsearch/gradle/AntFixtureStop.groovy → buildSrc/src/main/groovy/org/elasticsearch/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
 

buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy → buildSrc/src/main/groovy/org/elasticsearch/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

buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy → buildSrc/src/main/groovy/org/elasticsearch/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
 

buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy → buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/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

buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/SnippetsTask.groovy → buildSrc/src/main/groovy/org/elasticsearch/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

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/AntFixture.groovy → buildSrc/src/main/groovy/org/elasticsearch/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

buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy

@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-package org.elasticsearch.gradle.test
-
-import groovy.transform.CompileStatic
-import org.elasticsearch.gradle.BuildPlugin
-import org.elasticsearch.gradle.testclusters.TestClustersPlugin
-import org.gradle.api.InvalidUserDataException
-import org.gradle.api.Plugin
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaBasePlugin
-import org.gradle.api.tasks.TaskProvider
-
-/**
- * Adds support for starting an Elasticsearch cluster before running integration
- * tests. Used in conjunction with {@link StandaloneRestTestPlugin} for qa
- * projects and in conjunction with {@link BuildPlugin} for testing the rest
- * client.
- */
-@CompileStatic
-class RestTestPlugin implements Plugin<Project> {
-    List<String> REQUIRED_PLUGINS = [
-        'elasticsearch.build',
-        'elasticsearch.standalone-rest-test']
-
-    @Override
-    void apply(Project project) {
-        if (false == REQUIRED_PLUGINS.any { project.pluginManager.hasPlugin(it) }) {
-            throw new InvalidUserDataException('elasticsearch.rest-test '
-                + 'requires either elasticsearch.build or '
-                + 'elasticsearch.standalone-rest-test')
-        }
-        project.getPlugins().apply(RestTestBasePlugin.class);
-        project.pluginManager.apply(TestClustersPlugin)
-        TaskProvider<RestIntegTestTask> integTest = project.tasks.register('integTest', RestIntegTestTask.class) {
-            it.description = 'Runs rest tests against an elasticsearch cluster.'
-            it.group = JavaBasePlugin.VERIFICATION_GROUP
-            it.mustRunAfter(project.tasks.named('precommit'))
-        }
-        project.tasks.named('check').configure { it.dependsOn(integTest) }
-    }
-}

buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java

@@ -10,8 +10,9 @@ package org.elasticsearch.gradle;
 
 import org.elasticsearch.gradle.ElasticsearchDistribution.Platform;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Type;
-import org.elasticsearch.gradle.docker.DockerSupportPlugin;
-import org.elasticsearch.gradle.docker.DockerSupportService;
+import org.elasticsearch.gradle.internal.docker.DockerSupportPlugin;
+import org.elasticsearch.gradle.internal.docker.DockerSupportService;
+import org.elasticsearch.gradle.internal.DistributionDependency;
 import org.elasticsearch.gradle.transform.SymbolicLinkPreservingUntarTransform;
 import org.elasticsearch.gradle.transform.UnzipTransform;
 import org.elasticsearch.gradle.util.GradleUtils;

buildSrc/src/main/java/org/elasticsearch/gradle/DistributionResolution.java

@@ -8,6 +8,7 @@
 
 package org.elasticsearch.gradle;
 
+import org.elasticsearch.gradle.internal.DistributionDependency;
 import org.gradle.api.Project;
 
 public class DistributionResolution {

buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java

@@ -8,7 +8,8 @@
 
 package org.elasticsearch.gradle;
 
-import org.elasticsearch.gradle.docker.DockerSupportService;
+import org.elasticsearch.gradle.internal.VersionProperties;
+import org.elasticsearch.gradle.internal.docker.DockerSupportService;
 import org.gradle.api.Action;
 import org.gradle.api.Buildable;
 import org.gradle.api.artifacts.Configuration;

buildSrc/src/main/java/org/elasticsearch/gradle/ReaperPlugin.java

@@ -8,8 +8,8 @@
 
 package org.elasticsearch.gradle;
 
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.file.ProjectLayout;

buildSrc/src/main/java/org/elasticsearch/gradle/BuildPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/BuildPlugin.java

@@ -6,12 +6,11 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.codehaus.groovy.runtime.DefaultGroovyMethods;
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
-import org.elasticsearch.gradle.internal.InternalPlugin;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.elasticsearch.gradle.internal.precommit.InternalPrecommitTasks;
 import org.elasticsearch.gradle.precommit.PrecommitTasks;
 import org.gradle.api.GradleException;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcSetupExtension.java

@@ -10,8 +10,6 @@ package org.elasticsearch.gradle.internal;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.tools.ant.taskdefs.condition.Os;
-import org.elasticsearch.gradle.BwcVersions;
-import org.elasticsearch.gradle.LoggedExec;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -27,7 +25,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-import static org.elasticsearch.gradle.util.JavaUtil.getJavaHome;
+import static org.elasticsearch.gradle.internal.util.JavaUtil.getJavaHome;
 
 /**
  * By registering bwc tasks via this extension we can support declaring custom bwc tasks from the build script

buildSrc/src/main/java/org/elasticsearch/gradle/BwcVersions.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java

@@ -5,7 +5,10 @@
  * 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.elasticsearch.gradle.Architecture;
+import org.elasticsearch.gradle.Version;
 
 import java.util.ArrayList;
 import java.util.Collection;

buildSrc/src/main/java/org/elasticsearch/gradle/ConcatFilesTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/ConcatFilesTask.java

@@ -5,7 +5,7 @@
  * 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 java.io.File;
 import java.io.IOException;

buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesGraphPlugin.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;

buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesGraphTask.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;

buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
 import org.elasticsearch.gradle.internal.precommit.DependencyLicensesTask;

buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoTask.java

@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.elasticsearch.gradle.internal.precommit.DependencyLicensesTask;
-import org.elasticsearch.gradle.precommit.LicenseAnalyzer;
+import org.elasticsearch.gradle.internal.precommit.LicenseAnalyzer;
 import org.gradle.api.artifacts.Configuration;
 import org.gradle.api.artifacts.Dependency;
 import org.gradle.api.artifacts.DependencySet;

buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDependency.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/DistributionDependency.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 public interface DistributionDependency {
     static DistributionDependency of(String dependencyNotation) {

buildSrc/src/main/java/org/elasticsearch/gradle/DockerBase.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 /**
  * This class models the different Docker base images that are used to build Docker distributions of Elasticsearch.

buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchJavaPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaPlugin.java

@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar;
 import nebula.plugin.info.InfoBrokerPlugin;
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.elasticsearch.gradle.precommit.PrecommitTaskPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.Action;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;
@@ -48,7 +48,7 @@ import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
-import static org.elasticsearch.gradle.util.Util.toStringable;
+import static org.elasticsearch.gradle.internal.util.Util.toStringable;
 
 /**
  * A wrapper around Gradle's Java plugin that applies our common configuration.

buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchTestBasePlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java

@@ -6,13 +6,16 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin;
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
-import org.elasticsearch.gradle.test.ErrorReportingTestListener;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.OS;
+import org.elasticsearch.gradle.internal.test.SimpleCommandLineArgumentProvider;
+import org.elasticsearch.gradle.internal.test.SystemPropertyCommandLineArgumentProvider;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
+import org.elasticsearch.gradle.internal.test.ErrorReportingTestListener;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.Action;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/EmptyDirTask.java

@@ -5,7 +5,7 @@
  * 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 java.io.File;
 

buildSrc/src/main/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java

@@ -5,7 +5,7 @@
  * 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.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalAvailableTcpPortProviderPlugin.java

@@ -8,8 +8,8 @@
 
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.util.ports.AvailablePortAllocator;
-import org.elasticsearch.gradle.util.ports.ReservedPortRange;
+import org.elasticsearch.gradle.internal.util.ports.AvailablePortAllocator;
+import org.elasticsearch.gradle.internal.util.ports.ReservedPortRange;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalBwcGitPlugin.java

@@ -8,8 +8,7 @@
 
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.LoggedExec;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.VersionProperties;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -29,7 +28,7 @@ import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
-import static org.elasticsearch.gradle.util.Util.capitalize;
+import static org.elasticsearch.gradle.internal.util.Util.capitalize;
 
 public class InternalDistributionArchiveCheckPlugin implements InternalPlugin {
 

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java

@@ -8,8 +8,6 @@
 
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.EmptyDirTask;
-import org.elasticsearch.gradle.tar.SymbolicLinkPreservingTar;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.type.ArtifactTypeDefinition;
@@ -23,7 +21,7 @@ import org.gradle.api.tasks.bundling.Zip;
 
 import java.io.File;
 
-import static org.elasticsearch.gradle.util.Util.capitalize;
+import static org.elasticsearch.gradle.internal.util.Util.capitalize;
 import static org.gradle.api.internal.artifacts.ArtifactAttributes.ARTIFACT_FORMAT;
 
 /**

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java

@@ -8,10 +8,9 @@
 
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.BwcVersions;
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.gradle.api.InvalidUserDataException;
 import org.gradle.api.Project;
 import org.gradle.api.Task;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java

@@ -9,15 +9,12 @@
 package org.elasticsearch.gradle.internal;
 
 import org.elasticsearch.gradle.Architecture;
-import org.elasticsearch.gradle.BwcVersions;
-import org.elasticsearch.gradle.DistributionDependency;
 import org.elasticsearch.gradle.DistributionDownloadPlugin;
 import org.elasticsearch.gradle.DistributionResolution;
 import org.elasticsearch.gradle.ElasticsearchDistribution;
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.VersionProperties;
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
 import org.gradle.api.GradleException;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;

buildSrc/src/main/java/org/elasticsearch/gradle/JavaClassPublicifier.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/JavaClassPublicifier.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;

buildSrc/src/main/java/org/elasticsearch/gradle/Jdk.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/Jdk.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.Buildable;
 import org.gradle.api.artifacts.Configuration;

buildSrc/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.elasticsearch.gradle.transform.SymbolicLinkPreservingUntarTransform;
 import org.elasticsearch.gradle.transform.UnzipTransform;

buildSrc/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/LazyFileOutputStream.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import java.io.File;
 import java.io.FileOutputStream;

buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/LoggedExec.java

@@ -5,8 +5,9 @@
  * 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.elasticsearch.gradle.FileSystemOperationsAware;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Task;

buildSrc/src/main/java/org/elasticsearch/gradle/LoggingOutputStream.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/LoggingOutputStream.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import java.io.IOException;
 import java.io.OutputStream;

buildSrc/src/main/java/org/elasticsearch/gradle/MavenFilteringHack.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/MavenFilteringHack.java

@@ -5,8 +5,7 @@
  * 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 java.util.LinkedHashMap;
 import java.util.Map;

buildSrc/src/main/java/org/elasticsearch/gradle/PublishPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/PublishPlugin.java

@@ -6,15 +6,15 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowBasePlugin;
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin;
 import groovy.util.Node;
 import groovy.util.NodeList;
-import org.elasticsearch.gradle.info.BuildParams;
-import org.elasticsearch.gradle.precommit.PomValidationPrecommitPlugin;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.internal.info.BuildParams;
+import org.elasticsearch.gradle.internal.precommit.PomValidationPrecommitPlugin;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.NamedDomainObjectSet;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

buildSrc/src/main/java/org/elasticsearch/gradle/RepositoriesSetupPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;

buildSrc/src/main/java/org/elasticsearch/gradle/ResolveAllDependencies.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/ResolveAllDependencies.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle;
+package org.elasticsearch.gradle.internal;
 
 import org.gradle.api.DefaultTask;
 import org.gradle.api.artifacts.Configuration;

buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTar.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTar.java

@@ -6,7 +6,7 @@
  * 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.TarArchiveOutputStream;

buildSrc/src/main/java/org/elasticsearch/gradle/VersionProperties.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/VersionProperties.java

@@ -5,7 +5,9 @@
  * 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.elasticsearch.gradle.Version;
 
 import java.io.IOException;
 import java.io.InputStream;

buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/MissingJavadocTypeCheck.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/checkstyle/MissingJavadocTypeCheck.java

@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-package org.elasticsearch.gradle.checkstyle;
+package org.elasticsearch.gradle.internal.checkstyle;
 
 import com.puppycrawl.tools.checkstyle.StatelessCheck;
 import com.puppycrawl.tools.checkstyle.api.AbstractCheck;

buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/SnippetLengthCheck.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/checkstyle/SnippetLengthCheck.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.checkstyle;
+package org.elasticsearch.gradle.internal.checkstyle;
 
 import com.puppycrawl.tools.checkstyle.api.AbstractFileSetCheck;
 import com.puppycrawl.tools.checkstyle.api.CheckstyleException;

buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerBuildTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java

@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.docker;
+package org.elasticsearch.gradle.internal.docker;
 
-import org.elasticsearch.gradle.LoggedExec;
+import org.elasticsearch.gradle.internal.LoggedExec;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.DirectoryProperty;

buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.docker;
+package org.elasticsearch.gradle.internal.docker;
 
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;

buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java

@@ -5,10 +5,10 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.docker;
+package org.elasticsearch.gradle.internal.docker;
 
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.gradle.api.GradleException;
 import org.gradle.api.logging.Logger;
 import org.gradle.api.logging.Logging;

buildSrc/src/main/java/org/elasticsearch/gradle/docker/ShellRetry.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/ShellRetry.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.docker;
+package org.elasticsearch.gradle.internal.docker;
 
 /**
  * The methods in this class take a shell command and wrap it in retry logic, so that our

buildSrc/src/main/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilter.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilter.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.docker;
+package org.elasticsearch.gradle.internal.docker;
 
 import org.apache.commons.io.IOUtils;
 

buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/BuildParams.java

@@ -5,9 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.info;
+package org.elasticsearch.gradle.internal.info;
 
-import org.elasticsearch.gradle.BwcVersions;
+import org.elasticsearch.gradle.internal.BwcVersions;
 import org.gradle.api.JavaVersion;
 
 import java.io.File;

buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java

@@ -5,12 +5,12 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.info;
+package org.elasticsearch.gradle.internal.info;
 
 import org.apache.commons.io.IOUtils;
-import org.elasticsearch.gradle.BwcVersions;
+import org.elasticsearch.gradle.internal.BwcVersions;
 import org.elasticsearch.gradle.OS;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.GradleException;
 import org.gradle.api.JavaVersion;
 import org.gradle.api.Plugin;

buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/JavaHome.java

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.info;
+package org.elasticsearch.gradle.internal.info;
 
 import org.gradle.api.provider.Provider;
 

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java

@@ -8,10 +8,10 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.VersionProperties;
+import org.elasticsearch.gradle.internal.VersionProperties;
 import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.precommit.PrecommitPlugin;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.Action;
 import org.gradle.api.Project;
 import org.gradle.api.Task;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTask.java

@@ -8,8 +8,7 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.apache.commons.codec.binary.Hex;
-import org.elasticsearch.gradle.precommit.LicenseAnalyzer;
-import org.elasticsearch.gradle.precommit.LicenseAnalyzer.LicenseInfo;
+import org.elasticsearch.gradle.internal.precommit.LicenseAnalyzer.LicenseInfo;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.InvalidUserDataException;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java

@@ -11,8 +11,8 @@ package org.elasticsearch.gradle.internal.precommit;
 import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis;
 import de.thetaphi.forbiddenapis.gradle.ForbiddenApisPlugin;
 import groovy.lang.Closure;
-import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask;
-import org.elasticsearch.gradle.info.BuildParams;
+import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask;
+import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.elasticsearch.gradle.internal.InternalPlugin;
 import org.elasticsearch.gradle.precommit.PrecommitPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java

@@ -9,7 +9,6 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.elasticsearch.gradle.precommit.PrecommitTasks;
-import org.elasticsearch.gradle.precommit.ThirdPartyAuditPrecommitPlugin;
 import org.gradle.api.Project;
 
 /**

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/LicenseAnalyzer.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.precommit;
+package org.elasticsearch.gradle.internal.precommit;
 
 import java.io.File;
 import java.io.IOException;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsageTask.java

@@ -8,7 +8,7 @@
 
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.LoggedExec;
+import org.elasticsearch.gradle.internal.LoggedExec;
 import org.elasticsearch.gradle.precommit.PrecommitTask;
 import org.gradle.api.file.FileCollection;
 import org.gradle.api.plugins.JavaPluginConvention;

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationPrecommitPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/PomValidationPrecommitPlugin.java

@@ -6,9 +6,10 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.precommit;
+package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.precommit.PrecommitPlugin;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.publish.PublishingExtension;

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/PomValidationTask.java

@@ -6,10 +6,11 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.precommit;
+package org.elasticsearch.gradle.internal.precommit;
 
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.elasticsearch.gradle.precommit.PrecommitTask;
 import org.gradle.api.GradleException;
 import org.gradle.api.file.RegularFileProperty;
 import org.gradle.api.tasks.InputFile;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/TestingConventionsTasks.java

@@ -9,7 +9,7 @@ package org.elasticsearch.gradle.internal.precommit;
 
 import groovy.lang.Closure;
 import org.elasticsearch.gradle.util.GradleUtils;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Task;

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java

@@ -6,12 +6,13 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.precommit;
+package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask;
+import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask;
 import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin;
-import org.elasticsearch.gradle.info.BuildParams;
+import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.elasticsearch.gradle.internal.InternalPlugin;
+import org.elasticsearch.gradle.precommit.PrecommitPlugin;
 import org.gradle.api.Project;
 import org.gradle.api.Task;
 import org.gradle.api.artifacts.Configuration;

buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.precommit;
+package org.elasticsearch.gradle.internal.precommit;
 
 import de.thetaphi.forbiddenapis.cli.CliMain;
 import org.apache.commons.io.output.NullOutputStream;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ValidateRestSpecPlugin.java

@@ -9,7 +9,7 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.elasticsearch.gradle.internal.InternalPlugin;
-import org.elasticsearch.gradle.util.Util;
+import org.elasticsearch.gradle.internal.util.Util;
 import org.gradle.api.Project;
 import org.gradle.api.provider.Provider;
 

buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/RestCompatTestTransformTask.java

@@ -18,18 +18,18 @@ import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLParser;
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.VersionProperties;
-import org.elasticsearch.gradle.test.rest.transform.RestTestTransform;
-import org.elasticsearch.gradle.test.rest.transform.RestTestTransformer;
-import org.elasticsearch.gradle.test.rest.transform.headers.InjectHeaders;
-import org.elasticsearch.gradle.test.rest.transform.match.AddMatch;
-import org.elasticsearch.gradle.test.rest.transform.match.RemoveMatch;
-import org.elasticsearch.gradle.test.rest.transform.match.ReplaceMatch;
-import org.elasticsearch.gradle.test.rest.transform.text.ReplaceIsFalse;
-import org.elasticsearch.gradle.test.rest.transform.text.ReplaceIsTrue;
-import org.elasticsearch.gradle.test.rest.transform.warnings.InjectAllowedWarnings;
-import org.elasticsearch.gradle.test.rest.transform.warnings.InjectWarnings;
-import org.elasticsearch.gradle.test.rest.transform.warnings.RemoveWarnings;
+import org.elasticsearch.gradle.internal.VersionProperties;
+import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform;
+import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformer;
+import org.elasticsearch.gradle.internal.test.rest.transform.headers.InjectHeaders;
+import org.elasticsearch.gradle.internal.test.rest.transform.match.AddMatch;
+import org.elasticsearch.gradle.internal.test.rest.transform.match.RemoveMatch;
+import org.elasticsearch.gradle.internal.test.rest.transform.match.ReplaceMatch;
+import org.elasticsearch.gradle.internal.test.rest.transform.text.ReplaceIsFalse;
+import org.elasticsearch.gradle.internal.test.rest.transform.text.ReplaceIsTrue;
+import org.elasticsearch.gradle.internal.test.rest.transform.warnings.InjectAllowedWarnings;
+import org.elasticsearch.gradle.internal.test.rest.transform.warnings.InjectWarnings;
+import org.elasticsearch.gradle.internal.test.rest.transform.warnings.RemoveWarnings;
 import org.gradle.api.DefaultTask;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.file.FileSystemOperations;

buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java

@@ -8,17 +8,17 @@
 
 package org.elasticsearch.gradle.internal.rest.compat;
 
-import org.elasticsearch.gradle.ElasticsearchJavaPlugin;
+import org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin;
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.VersionProperties;
-import org.elasticsearch.gradle.test.RestIntegTestTask;
-import org.elasticsearch.gradle.test.RestTestBasePlugin;
-import org.elasticsearch.gradle.test.rest.CopyRestApiTask;
-import org.elasticsearch.gradle.test.rest.CopyRestTestsTask;
-import org.elasticsearch.gradle.test.rest.RestResourcesExtension;
-import org.elasticsearch.gradle.test.rest.RestResourcesPlugin;
-import org.elasticsearch.gradle.test.rest.RestTestUtil;
-import org.elasticsearch.gradle.test.rest.YamlRestTestPlugin;
+import org.elasticsearch.gradle.internal.VersionProperties;
+import org.elasticsearch.gradle.internal.test.RestIntegTestTask;
+import org.elasticsearch.gradle.internal.test.RestTestBasePlugin;
+import org.elasticsearch.gradle.internal.test.rest.CopyRestApiTask;
+import org.elasticsearch.gradle.internal.test.rest.CopyRestTestsTask;
+import org.elasticsearch.gradle.internal.test.rest.RestResourcesExtension;
+import org.elasticsearch.gradle.internal.test.rest.RestResourcesPlugin;
+import org.elasticsearch.gradle.internal.test.rest.RestTestUtil;
+import org.elasticsearch.gradle.internal.test.rest.YamlRestTestPlugin;
 import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.Plugin;
@@ -37,7 +37,7 @@ import java.io.File;
 import java.nio.file.Path;
 import java.util.Map;
 
-import static org.elasticsearch.gradle.test.rest.RestTestUtil.setupDependencies;
+import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.setupDependencies;
 
 /**
  * Apply this plugin to run the YAML based REST tests from a prior major version against this version's cluster.

buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java

@@ -6,26 +6,25 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.test;
+package org.elasticsearch.gradle.internal.test;
 
 import org.elasticsearch.gradle.Architecture;
 import org.elasticsearch.gradle.DistributionDownloadPlugin;
 import org.elasticsearch.gradle.ElasticsearchDistribution;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Platform;
 import org.elasticsearch.gradle.ElasticsearchDistribution.Type;
-import org.elasticsearch.gradle.Jdk;
-import org.elasticsearch.gradle.JdkDownloadPlugin;
-import org.elasticsearch.gradle.SystemPropertyCommandLineArgumentProvider;
+import org.elasticsearch.gradle.internal.Jdk;
+import org.elasticsearch.gradle.internal.JdkDownloadPlugin;
 import org.elasticsearch.gradle.Version;
-import org.elasticsearch.gradle.VersionProperties;
-import org.elasticsearch.gradle.docker.DockerSupportPlugin;
-import org.elasticsearch.gradle.docker.DockerSupportService;
-import org.elasticsearch.gradle.info.BuildParams;
+import org.elasticsearch.gradle.internal.VersionProperties;
+import org.elasticsearch.gradle.internal.docker.DockerSupportPlugin;
+import org.elasticsearch.gradle.internal.docker.DockerSupportService;
+import org.elasticsearch.gradle.internal.info.BuildParams;
 import org.elasticsearch.gradle.internal.InternalDistributionDownloadPlugin;
 import org.elasticsearch.gradle.util.GradleUtils;
-import org.elasticsearch.gradle.util.Util;
-import org.elasticsearch.gradle.vagrant.VagrantBasePlugin;
-import org.elasticsearch.gradle.vagrant.VagrantExtension;
+import org.elasticsearch.gradle.internal.util.Util;
+import org.elasticsearch.gradle.internal.vagrant.VagrantBasePlugin;
+import org.elasticsearch.gradle.internal.vagrant.VagrantExtension;
 import org.gradle.api.Action;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Plugin;
@@ -50,8 +49,8 @@ import java.util.Map;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-import static org.elasticsearch.gradle.vagrant.VagrantMachine.convertLinuxPath;
-import static org.elasticsearch.gradle.vagrant.VagrantMachine.convertWindowsPath;
+import static org.elasticsearch.gradle.internal.vagrant.VagrantMachine.convertLinuxPath;
+import static org.elasticsearch.gradle.internal.vagrant.VagrantMachine.convertWindowsPath;
 
 /**
  * This class defines gradle tasks for testing our various distribution artifacts.

buildSrc/src/main/java/org/elasticsearch/gradle/test/ErrorReportingTestListener.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/ErrorReportingTestListener.java

@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-package org.elasticsearch.gradle.test;
+package org.elasticsearch.gradle.internal.test;
 
 import org.gradle.api.internal.tasks.testing.logging.FullExceptionFormatter;
 import org.gradle.api.internal.tasks.testing.logging.TestExceptionFormatter;

buildSrc/src/main/java/org/elasticsearch/gradle/test/Fixture.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/Fixture.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.test;
+package org.elasticsearch.gradle.internal.test;
 
 /**
  * Any object that can produce an accompanying stop task, meant to tear down

buildSrc/src/main/java/org/elasticsearch/gradle/test/GradleDistroTestTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/GradleDistroTestTask.java

@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.test;
+package org.elasticsearch.gradle.internal.test;
 
-import org.elasticsearch.gradle.vagrant.VagrantShellTask;
+import org.elasticsearch.gradle.internal.vagrant.VagrantShellTask;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.options.Option;
 
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.elasticsearch.gradle.vagrant.VagrantMachine.convertLinuxPath;
-import static org.elasticsearch.gradle.vagrant.VagrantMachine.convertWindowsPath;
+import static org.elasticsearch.gradle.internal.vagrant.VagrantMachine.convertLinuxPath;
+import static org.elasticsearch.gradle.internal.vagrant.VagrantMachine.convertWindowsPath;
 
 /**
  * Run a gradle task of the current build, within the configured vagrant VM.

buildSrc/src/main/java/org/elasticsearch/gradle/test/InternalClusterTestPlugin.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/InternalClusterTestPlugin.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.test;
+package org.elasticsearch.gradle.internal.test;
 
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.Plugin;

buildSrc/src/main/java/org/elasticsearch/gradle/test/RestIntegTestTask.java → buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestIntegTestTask.java

@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-package org.elasticsearch.gradle.test;
+package org.elasticsearch.gradle.internal.test;
 
 import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask;
 import org.gradle.api.tasks.CacheableTask;