diff --git a/benchmarks/build.gradle b/benchmarks/build.gradle index 134bee05a6d1..50dd24452eed 100644 --- 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 index 163d58b5f14e..63ffad28af00 100644 --- 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 index 07ab3a44240f..4ea869aa316a 100644 --- 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/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy index c7d775dec85a..c1b9e084c82f 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/DistributionDownloadPluginFuncTest.groovy +++ b/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 diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy index f97206a51ddd..c33d73c5dbd9 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/YamlRestCompatTestPluginFuncTest.groovy +++ b/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 diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy index 19f5c10e3639..fb73b69ea734 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/AbstractGradleFuncTest.groovy +++ b/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") diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/DistributionDownloadFixture.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/DistributionDownloadFixture.groovy index 172b94bb8b94..ef7553a813e5 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/fixtures/DistributionDownloadFixture.groovy +++ b/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 diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchJavaPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchJavaPluginFuncTest.groovy similarity index 93% rename from buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchJavaPluginFuncTest.groovy rename to buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchJavaPluginFuncTest.groovy index ca694c2cc3aa..5fd7aedecb26 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchJavaPluginFuncTest.groovy +++ b/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' diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchTestBasePluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchTestBasePluginFuncTest.groovy similarity index 97% rename from buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchTestBasePluginFuncTest.groovy rename to buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/ElasticsearchTestBasePluginFuncTest.groovy index a2c23624c626..f67e77973322 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/ElasticsearchTestBasePluginFuncTest.groovy +++ b/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 diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy index 74eacb0b5a5a..65f5cf1361a4 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPluginFuncTest.groovy +++ b/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 diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy index d855e9c38ce3..c1db414c80fd 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPluginFuncTest.groovy +++ b/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' diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy index 8d0c00fddf01..36ae97d50412 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy +++ b/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 diff --git a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/JdkDownloadPluginFuncTest.groovy b/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy similarity index 97% rename from buildSrc/src/integTest/groovy/org/elasticsearch/gradle/JdkDownloadPluginFuncTest.groovy rename to buildSrc/src/integTest/groovy/org/elasticsearch/gradle/internal/JdkDownloadPluginFuncTest.groovy index 89e846a28efb..586676fda2b0 100644 --- a/buildSrc/src/integTest/groovy/org/elasticsearch/gradle/JdkDownloadPluginFuncTest.groovy +++ b/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 { diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/ReaperPluginIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/ReaperPluginIT.java index 4ba03b74a309..e340b5fde71f 100644 --- 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/buildSrc/src/integTest/java/org/elasticsearch/gradle/BuildPluginIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/BuildPluginIT.java similarity index 95% rename from buildSrc/src/integTest/java/org/elasticsearch/gradle/BuildPluginIT.java rename to buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/BuildPluginIT.java index 813a58efe1e5..5bb12f554d0a 100644 --- a/buildSrc/src/integTest/java/org/elasticsearch/gradle/BuildPluginIT.java +++ b/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 { diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTaskIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTaskIT.java similarity index 94% rename from buildSrc/src/integTest/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTaskIT.java rename to buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTaskIT.java index 932e109cccd4..f28e81d51406 100644 --- a/buildSrc/src/integTest/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTaskIT.java +++ b/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 { diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTarIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTarIT.java similarity index 92% rename from buildSrc/src/integTest/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTarIT.java rename to buildSrc/src/integTest/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTarIT.java index 6e7f68fcd2fe..27108daeac98 100644 --- a/buildSrc/src/integTest/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTarIT.java +++ b/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(); } diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/TestingConventionsTasksIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/TestingConventionsTasksIT.java index 588605f272c6..2358c563ebc3 100644 --- a/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/TestingConventionsTasksIT.java +++ b/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; diff --git a/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTaskIT.java b/buildSrc/src/integTest/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTaskIT.java index d5bd23762a06..17882f56747c 100644 --- 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/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_adoptopenjdk_linux.tar.gz b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_adoptopenjdk_linux.tar.gz similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_adoptopenjdk_linux.tar.gz rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_adoptopenjdk_linux.tar.gz diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_adoptopenjdk_osx.tar.gz b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_adoptopenjdk_osx.tar.gz similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_adoptopenjdk_osx.tar.gz rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_adoptopenjdk_osx.tar.gz diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_adoptopenjdk_windows.zip b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_adoptopenjdk_windows.zip similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_adoptopenjdk_windows.zip rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_adoptopenjdk_windows.zip diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_azuljdk_linux_aarch64.tar.gz b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_azuljdk_linux_aarch64.tar.gz similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_azuljdk_linux_aarch64.tar.gz rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_azuljdk_linux_aarch64.tar.gz diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_azuljdk_osx_aarch64.tar.gz b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_azuljdk_osx_aarch64.tar.gz similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_azuljdk_osx_aarch64.tar.gz rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_azuljdk_osx_aarch64.tar.gz diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_openjdk_linux.tar.gz b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_linux.tar.gz similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_openjdk_linux.tar.gz rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_linux.tar.gz diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_openjdk_osx.tar.gz b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_osx.tar.gz similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_openjdk_osx.tar.gz rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_osx.tar.gz diff --git a/buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_openjdk_windows.zip b/buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_windows.zip similarity index 100% rename from buildSrc/src/integTest/resources/org/elasticsearch/gradle/fake_openjdk_windows.zip rename to buildSrc/src/integTest/resources/org/elasticsearch/gradle/internal/fake_openjdk_windows.zip diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntFixtureStop.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/AntFixtureStop.groovy similarity index 91% rename from buildSrc/src/main/groovy/org/elasticsearch/gradle/AntFixtureStop.groovy rename to buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/AntFixtureStop.groovy index 39342c0ab964..9ea17c5ef14b 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntFixtureStop.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/AntTask.groovy similarity index 98% rename from buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy rename to buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/AntTask.groovy index 821506e0c5a3..69331af5ca18 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/AntTask.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/doc/DocsTestPlugin.groovy similarity index 96% rename from buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy rename to buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/doc/DocsTestPlugin.groovy index cc572a9f063a..7a58785b4aa4 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/DocsTestPlugin.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy similarity index 99% rename from buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy rename to buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy index 750472acea8f..cf551f6ee04f 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/RestTestsFromSnippetsTask.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/SnippetsTask.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/doc/SnippetsTask.groovy similarity index 99% rename from buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/SnippetsTask.groovy rename to buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/doc/SnippetsTask.groovy index d75a0467e71f..b07d3381eec3 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/doc/SnippetsTask.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/AntFixture.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/test/AntFixture.groovy similarity index 98% rename from buildSrc/src/main/groovy/org/elasticsearch/gradle/test/AntFixture.groovy rename to buildSrc/src/main/groovy/org/elasticsearch/gradle/internal/test/AntFixture.groovy index 347489a43e44..ad8dcabe2fe3 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/AntFixture.groovy +++ b/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 diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy deleted file mode 100644 index 38ee0f5b879b..000000000000 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/RestTestPlugin.groovy +++ /dev/null @@ -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 { - List 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 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) } - } -} diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java index 393e58adeeff..646dbcf24b47 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionResolution.java b/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionResolution.java index 3b82c9f6975a..917f4679d145 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionResolution.java +++ b/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 { diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java b/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java index f6729e374b08..d0e17a2d950d 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ReaperPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/ReaperPlugin.java index e97ca2f62866..7fb5635ee168 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ReaperPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/BuildPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/BuildPlugin.java similarity index 94% rename from buildSrc/src/main/java/org/elasticsearch/gradle/BuildPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/BuildPlugin.java index 4083e4b23f3d..0153fadb1550 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/BuildPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcSetupExtension.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcSetupExtension.java index 7f115a83736a..dd7a5bb55000 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcSetupExtension.java +++ b/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 diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/BwcVersions.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/BwcVersions.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/BwcVersions.java index 2685e06f51a7..2bb4b1cf7a6e 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/BwcVersions.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ConcatFilesTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/ConcatFilesTask.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/ConcatFilesTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/ConcatFilesTask.java index a64b3b85d599..f1f33feb781b 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ConcatFilesTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesGraphPlugin.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesGraphPlugin.java index 708800d46220..8dee4d27f6a5 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesGraphTask.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesGraphTask.java index 6304aa1df224..98002f0615ce 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesGraphTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoPlugin.java index 753a80d2b43c..59ff0bff85b8 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoTask.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/DependenciesInfoTask.java index 4633bb50fd09..70c4866e0996 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DependenciesInfoTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDependency.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/DistributionDependency.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDependency.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/DistributionDependency.java index 44071305628b..a08310994c87 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DistributionDependency.java +++ b/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) { diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/DockerBase.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/DockerBase.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/DockerBase.java index f8ece343c5eb..cdc65367f2bb 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/DockerBase.java +++ b/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. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchJavaPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaPlugin.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchJavaPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchJavaPlugin.java index 3e42330d9fdd..c68cd39ef1d8 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchJavaPlugin.java +++ b/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. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchTestBasePlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchTestBasePlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/ElasticsearchTestBasePlugin.java index 6772aefbc034..b20a0cd13d99 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ElasticsearchTestBasePlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/EmptyDirTask.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/EmptyDirTask.java index f3872b636d4d..471d9d80ce5c 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/EmptyDirTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/ExportElasticsearchBuildResourcesTask.java index 8254e44e0761..861b3ed7b0de 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ExportElasticsearchBuildResourcesTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalAvailableTcpPortProviderPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalAvailableTcpPortProviderPlugin.java index 6ed347a8bda6..85e56f8e2d94 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalAvailableTcpPortProviderPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalBwcGitPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalBwcGitPlugin.java index c0fb5a492208..300d18d9a666 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalBwcGitPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java index fb1cb1388679..271429a66e6b 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveCheckPlugin.java +++ b/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 { diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java index c4c0dd35d021..b4ce2ff41ae2 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionArchiveSetupPlugin.java +++ b/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; /** diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java index 9f6740529fcd..dec69d9de647 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java index 178932983b01..a2fe285600d9 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/JavaClassPublicifier.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/JavaClassPublicifier.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/JavaClassPublicifier.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/JavaClassPublicifier.java index b80824b8890d..a5c16b5fc08f 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/JavaClassPublicifier.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/Jdk.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/Jdk.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/Jdk.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/Jdk.java index 15379172408e..7b2c9b32b509 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/Jdk.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/JdkDownloadPlugin.java index f331b1b5d109..391139dd1df1 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/JdkDownloadPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/LazyFileOutputStream.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/LazyFileOutputStream.java index dd7dd45649b0..a3c6f82aec17 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/LazyFileOutputStream.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/LoggedExec.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/LoggedExec.java index 5ce64e9eb855..7c9cfd632eac 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/LoggedExec.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/LoggingOutputStream.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/LoggingOutputStream.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/LoggingOutputStream.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/LoggingOutputStream.java index 1e4b4c484366..3572964a82ed 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/LoggingOutputStream.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/MavenFilteringHack.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/MavenFilteringHack.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/MavenFilteringHack.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/MavenFilteringHack.java index 2e83141ec90b..c6f5fed322e5 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/MavenFilteringHack.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/PublishPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/PublishPlugin.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/PublishPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/PublishPlugin.java index b75fc066caab..31f9683e8bc4 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/PublishPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/RepositoriesSetupPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/RepositoriesSetupPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/RepositoriesSetupPlugin.java index 605f921d81ec..856b300754c9 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/RepositoriesSetupPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/ResolveAllDependencies.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/ResolveAllDependencies.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/ResolveAllDependencies.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/ResolveAllDependencies.java index fc432279730e..818519dad3bd 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/ResolveAllDependencies.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTar.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTar.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTar.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/SymbolicLinkPreservingTar.java index 0471ea86429b..55d325fbde2c 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymbolicLinkPreservingTar.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/VersionProperties.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/VersionProperties.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/VersionProperties.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/VersionProperties.java index 48b1c10af79e..6bfbd8bf2759 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/VersionProperties.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/MissingJavadocTypeCheck.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/checkstyle/MissingJavadocTypeCheck.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/MissingJavadocTypeCheck.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/checkstyle/MissingJavadocTypeCheck.java index 0199ab264478..ac6972bce211 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/MissingJavadocTypeCheck.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/SnippetLengthCheck.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/checkstyle/SnippetLengthCheck.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/SnippetLengthCheck.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/checkstyle/SnippetLengthCheck.java index a6ad5c3e895f..14c2b74e6e6b 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/checkstyle/SnippetLengthCheck.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerBuildTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerBuildTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerBuildTask.java index 871eb616f071..2147d35498ce 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerBuildTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportPlugin.java index 298bf88aad6f..bae71484b48f 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/DockerSupportService.java index bc455a6e0608..d5b0d20290dc 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/ShellRetry.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/ShellRetry.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/docker/ShellRetry.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/ShellRetry.java index e85f0854cd50..5286a3af2461 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/ShellRetry.java +++ b/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 diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilter.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilter.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilter.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilter.java index 8384d309d19c..a8aa68641fd3 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilter.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/BuildParams.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/BuildParams.java index 48e76a1b5189..7a36bc7e7368 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/info/BuildParams.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java index 0c5f73b87810..3d4a3a28aae2 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/info/GlobalBuildInfoPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/JavaHome.java similarity index 94% rename from buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/info/JavaHome.java index 056fac19bf39..ad64528f8839 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/info/JavaHome.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java index 8c89ab7f3093..b888863e33fa 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/CheckstylePrecommitPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTask.java index a026ff70adb2..4777b51398b7 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java index 5b40ef38b97b..1add941d6f1a 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ForbiddenApisPrecommitPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java index de413d2c6c67..917723267e5e 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/InternalPrecommitTasks.java +++ b/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; /** diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/LicenseAnalyzer.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/precommit/LicenseAnalyzer.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LicenseAnalyzer.java index 59d4362d3d1e..725fe0608337 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/LicenseAnalyzer.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsageTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsageTask.java index 89020f87e297..1e44df539e2b 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/LoggerUsageTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationPrecommitPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/PomValidationPrecommitPlugin.java similarity index 91% rename from buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationPrecommitPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/PomValidationPrecommitPlugin.java index 0991f17e60ed..752b73f9c5fa 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationPrecommitPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/PomValidationTask.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/PomValidationTask.java index fac420b90dfd..f421c6fc10ab 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/PomValidationTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/TestingConventionsTasks.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/TestingConventionsTasks.java index 75e9957ffb80..7e4e18b49ec2 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/TestingConventionsTasks.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java similarity index 92% rename from buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditPrecommitPlugin.java index 0b511461b420..305571b6d9ff 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditPrecommitPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ThirdPartyAuditTask.java index eeecb2f143ba..99397f72a6bb 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/ThirdPartyAuditTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ValidateRestSpecPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ValidateRestSpecPlugin.java index 4a12949726c2..138b3148dce8 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/precommit/ValidateRestSpecPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/RestCompatTestTransformTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/RestCompatTestTransformTask.java index 1128417b9dc0..98ee339a5c19 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/RestCompatTestTransformTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java index f5bff9876be3..8c18536674c4 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/rest/compat/YamlRestCompatTestPlugin.java +++ b/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. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/DistroTestPlugin.java index 4cd79f089d07..ba7d95b00edb 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/DistroTestPlugin.java +++ b/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. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/ErrorReportingTestListener.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/ErrorReportingTestListener.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/ErrorReportingTestListener.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/ErrorReportingTestListener.java index 328e5e196753..65f29fbbf747 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/ErrorReportingTestListener.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/Fixture.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/Fixture.java similarity index 93% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/Fixture.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/Fixture.java index 5c2ad212850b..843c82f79406 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/Fixture.java +++ b/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 diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/GradleDistroTestTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/GradleDistroTestTask.java similarity index 89% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/GradleDistroTestTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/GradleDistroTestTask.java index 885a5ffd33f0..6d13184ba0b7 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/GradleDistroTestTask.java +++ b/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. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/InternalClusterTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/InternalClusterTestPlugin.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/InternalClusterTestPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/InternalClusterTestPlugin.java index 06de2c23d0fe..6ecad2c174a3 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/InternalClusterTestPlugin.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/RestIntegTestTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestIntegTestTask.java similarity index 94% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/RestIntegTestTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestIntegTestTask.java index 2d1c87163634..f2a2434e60e7 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/RestIntegTestTask.java +++ b/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; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/RestTestBasePlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/RestTestBasePlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java index 1427d1175450..824153764da3 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/RestTestBasePlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestTestBasePlugin.java @@ -6,11 +6,10 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test; +package org.elasticsearch.gradle.internal.test; -import org.elasticsearch.gradle.ElasticsearchTestBasePlugin; +import org.elasticsearch.gradle.internal.ElasticsearchTestBasePlugin; import org.elasticsearch.gradle.FixtureStop; -import org.elasticsearch.gradle.SystemPropertyCommandLineArgumentProvider; import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestTestPlugin.java new file mode 100644 index 000000000000..e29f370aff84 --- /dev/null +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/RestTestPlugin.java @@ -0,0 +1,53 @@ +/* + * 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.internal.test; + +import org.elasticsearch.gradle.internal.BuildPlugin; +import org.elasticsearch.gradle.testclusters.TestClustersPlugin; +import org.gradle.api.Action; +import org.gradle.api.InvalidUserDataException; +import org.gradle.api.Plugin; +import org.gradle.api.Project; +import org.gradle.api.Task; +import org.gradle.api.plugins.JavaBasePlugin; + +import java.util.Arrays; +import java.util.List; + +/** + * 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. + */ +public class RestTestPlugin implements Plugin { + private final List REQUIRED_PLUGINS = Arrays.asList("elasticsearch.build", "elasticsearch.standalone-rest-test"); + + @Override + public void apply(final Project project) { + if (REQUIRED_PLUGINS.stream().noneMatch(requiredPlugin -> project.getPluginManager().hasPlugin(requiredPlugin))) { + throw new InvalidUserDataException( + "elasticsearch.rest-test " + "requires either elasticsearch.build or " + "elasticsearch.standalone-rest-test" + ); + } + project.getPlugins().apply(RestTestBasePlugin.class); + project.getPluginManager().apply(TestClustersPlugin.class); + final var integTest = project.getTasks().register("integTest", RestIntegTestTask.class, task -> { + task.setDescription("Runs rest tests against an elasticsearch cluster."); + task.setGroup(JavaBasePlugin.VERIFICATION_GROUP); + task.mustRunAfter(project.getTasks().named("precommit")); + }); + project.getTasks().named("check").configure(new Action() { + @Override + public void execute(Task task) { + task.dependsOn(integTest); + } + }); + } +} diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/SimpleCommandLineArgumentProvider.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/SimpleCommandLineArgumentProvider.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/SimpleCommandLineArgumentProvider.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/SimpleCommandLineArgumentProvider.java index ca626790d6ce..edd49f086ccd 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/SimpleCommandLineArgumentProvider.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/SimpleCommandLineArgumentProvider.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle; +package org.elasticsearch.gradle.internal.test; import org.gradle.process.CommandLineArgumentProvider; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/StandaloneRestTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneRestTestPlugin.java similarity index 91% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/StandaloneRestTestPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneRestTestPlugin.java index ae03676a8241..f4f5e26ace2f 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/StandaloneRestTestPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneRestTestPlugin.java @@ -6,13 +6,13 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test; +package org.elasticsearch.gradle.internal.test; -import org.elasticsearch.gradle.ElasticsearchJavaPlugin; -import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask; -import org.elasticsearch.gradle.RepositoriesSetupPlugin; -import org.elasticsearch.gradle.info.BuildParams; -import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin; +import org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin; +import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask; +import org.elasticsearch.gradle.internal.RepositoriesSetupPlugin; +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.elasticsearch.gradle.testclusters.TestClustersPlugin; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/StandaloneTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneTestPlugin.java similarity index 92% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/StandaloneTestPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneTestPlugin.java index 530dfd586e43..5614b7d2f215 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/StandaloneTestPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/StandaloneTestPlugin.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.ElasticsearchJavaPlugin; +import org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.plugins.JavaBasePlugin; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/SystemPropertyCommandLineArgumentProvider.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/SystemPropertyCommandLineArgumentProvider.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/SystemPropertyCommandLineArgumentProvider.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/SystemPropertyCommandLineArgumentProvider.java index b2788e98eccc..de00c0cd4f64 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/SystemPropertyCommandLineArgumentProvider.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/SystemPropertyCommandLineArgumentProvider.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.test; import org.gradle.api.tasks.Input; import org.gradle.process.CommandLineArgumentProvider; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/TestWithDependenciesPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/TestWithDependenciesPlugin.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/TestWithDependenciesPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/TestWithDependenciesPlugin.java index fdecba107bec..fada17f0898d 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/TestWithDependenciesPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/TestWithDependenciesPlugin.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test; +package org.elasticsearch.gradle.internal.test; import org.apache.commons.lang.StringUtils; import org.elasticsearch.gradle.plugin.PluginBuildPlugin; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/TestWithSslPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/TestWithSslPlugin.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/TestWithSslPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/TestWithSslPlugin.java index 118040fe2680..c748532f828d 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/TestWithSslPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/TestWithSslPlugin.java @@ -6,17 +6,17 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test; +package org.elasticsearch.gradle.internal.test; -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.precommit.FilePermissionsPrecommitPlugin; import org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsPrecommitPlugin; import org.elasticsearch.gradle.internal.precommit.ForbiddenPatternsTask; import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; import org.elasticsearch.gradle.testclusters.TestClustersAware; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; -import org.elasticsearch.gradle.util.Util; +import org.elasticsearch.gradle.internal.util.Util; import org.gradle.api.NamedDomainObjectContainer; import org.gradle.api.Plugin; import org.gradle.api.Project; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestApiTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestApiTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.java index 72f5ec61d71a..919ee0503043 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestApiTask.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestApiTask.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.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -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.gradle.api.DefaultTask; import org.gradle.api.file.ArchiveOperations; import org.gradle.api.file.DirectoryProperty; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestTestsTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestTestsTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.java index 116e94a55738..7c222baa79fd 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/CopyRestTestsTask.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/CopyRestTestsTask.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.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -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.gradle.api.DefaultTask; import org.gradle.api.file.ArchiveOperations; import org.gradle.api.file.DirectoryProperty; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/JavaRestTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/JavaRestTestPlugin.java similarity index 79% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/JavaRestTestPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/JavaRestTestPlugin.java index 8c6a6d19c792..4f4ae201cb16 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/JavaRestTestPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/JavaRestTestPlugin.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -import org.elasticsearch.gradle.ElasticsearchJavaPlugin; -import org.elasticsearch.gradle.test.RestIntegTestTask; -import org.elasticsearch.gradle.test.RestTestBasePlugin; +import org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin; +import org.elasticsearch.gradle.internal.test.RestIntegTestTask; +import org.elasticsearch.gradle.internal.test.RestTestBasePlugin; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.Plugin; @@ -20,9 +20,9 @@ import org.gradle.api.provider.Provider; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.createTestCluster; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.registerTask; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.setupDependencies; +import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.createTestCluster; +import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.registerTask; +import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.setupDependencies; /** * Apply this plugin to run the Java based REST tests. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesExtension.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestResourcesExtension.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesExtension.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestResourcesExtension.java index 04c6fcb34bcd..0113246c918c 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesExtension.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestResourcesExtension.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.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -import org.elasticsearch.gradle.info.BuildParams; +import org.elasticsearch.gradle.internal.info.BuildParams; import org.gradle.api.Action; import org.gradle.api.model.ObjectFactory; import org.gradle.api.provider.ListProperty; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestResourcesPlugin.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestResourcesPlugin.java index 24c6b2c20a51..5971c937e95d 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestResourcesPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestResourcesPlugin.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.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -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.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.artifacts.Configuration; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestTestUtil.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestUtil.java similarity index 93% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestTestUtil.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestUtil.java index b83f581cb1e4..db2eef9f398b 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/RestTestUtil.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/RestTestUtil.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -import org.elasticsearch.gradle.VersionProperties; -import org.elasticsearch.gradle.info.BuildParams; -import org.elasticsearch.gradle.test.RestIntegTestTask; +import org.elasticsearch.gradle.internal.VersionProperties; +import org.elasticsearch.gradle.internal.info.BuildParams; +import org.elasticsearch.gradle.internal.test.RestIntegTestTask; import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; import org.elasticsearch.gradle.util.GradleUtils; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/YamlRestTestPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/YamlRestTestPlugin.java similarity index 86% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/YamlRestTestPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/YamlRestTestPlugin.java index 0795e9b65b1a..389d38ac91f5 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/YamlRestTestPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/YamlRestTestPlugin.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest; +package org.elasticsearch.gradle.internal.test.rest; -import org.elasticsearch.gradle.ElasticsearchJavaPlugin; -import org.elasticsearch.gradle.test.RestIntegTestTask; -import org.elasticsearch.gradle.test.RestTestBasePlugin; +import org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin; +import org.elasticsearch.gradle.internal.test.RestIntegTestTask; +import org.elasticsearch.gradle.internal.test.RestTestBasePlugin; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.Plugin; @@ -20,9 +20,9 @@ import org.gradle.api.provider.Provider; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.SourceSetContainer; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.createTestCluster; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.registerTask; -import static org.elasticsearch.gradle.test.rest.RestTestUtil.setupDependencies; +import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.createTestCluster; +import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.registerTask; +import static org.elasticsearch.gradle.internal.test.rest.RestTestUtil.setupDependencies; /** * Apply this plugin to run the YAML based REST tests. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestContext.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestContext.java similarity index 91% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestContext.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestContext.java index 5f4428bda106..9b17a3cd81f3 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestContext.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestContext.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; /** * A place to stash information about a test that is being transformed. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransform.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransform.java similarity index 94% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransform.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransform.java index bcffec1491b7..bd650e7afae4 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransform.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransform.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.JsonNode; import org.gradle.api.Named; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformByParentArray.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformByParentArray.java similarity index 93% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformByParentArray.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformByParentArray.java index 057de4560ab7..3495040b08a7 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformByParentArray.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformByParentArray.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformByParentObject.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformByParentObject.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformByParentObject.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformByParentObject.java index e62f34e5cb66..30fbd0de3034 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformByParentObject.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformByParentObject.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformGlobalSetup.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformGlobalSetup.java similarity index 93% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformGlobalSetup.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformGlobalSetup.java index 12d5a5eda999..95c15b2890e5 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformGlobalSetup.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformGlobalSetup.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformGlobalTeardown.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformGlobalTeardown.java similarity index 93% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformGlobalTeardown.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformGlobalTeardown.java index c09925e5e3e1..16eec09d07eb 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformGlobalTeardown.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformGlobalTeardown.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformer.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformer.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformer.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformer.java index 2415b9b06d69..30e2bf688194 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/RestTestTransformer.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/RestTestTransformer.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/feature/FeatureInjector.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/feature/FeatureInjector.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/feature/FeatureInjector.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/feature/FeatureInjector.java index a3b6fc24bdbb..cebe04ab5817 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/feature/FeatureInjector.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/feature/FeatureInjector.java @@ -6,15 +6,15 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.feature; +package org.elasticsearch.gradle.internal.test.rest.transform.feature; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformGlobalSetup; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformGlobalTeardown; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformGlobalSetup; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformGlobalTeardown; import org.gradle.api.tasks.Internal; import javax.annotation.Nullable; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/headers/InjectHeaders.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/headers/InjectHeaders.java similarity index 86% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/headers/InjectHeaders.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/headers/InjectHeaders.java index 508adac44d09..27c54a5426cb 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/headers/InjectHeaders.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/headers/InjectHeaders.java @@ -6,14 +6,14 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.headers; +package org.elasticsearch.gradle.internal.test.rest.transform.headers; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; -import org.elasticsearch.gradle.test.rest.transform.feature.FeatureInjector; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.FeatureInjector; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/AddMatch.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatch.java similarity index 90% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/AddMatch.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatch.java index 65d36e179dfd..cb2c20a96fb2 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/AddMatch.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatch.java @@ -6,14 +6,14 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.match; +package org.elasticsearch.gradle.internal.test.rest.transform.match; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestContext; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentArray; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestContext; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentArray; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/RemoveMatch.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatch.java similarity index 88% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/RemoveMatch.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatch.java index c2ef1f09638b..79292860f415 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/RemoveMatch.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatch.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.match; +package org.elasticsearch.gradle.internal.test.rest.transform.match; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestContext; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestContext; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.Optional; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/ReplaceMatch.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/ReplaceMatch.java similarity index 89% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/ReplaceMatch.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/ReplaceMatch.java index 69d234009f98..9264717a7f69 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/match/ReplaceMatch.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/match/ReplaceMatch.java @@ -6,12 +6,12 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.match; +package org.elasticsearch.gradle.internal.test.rest.transform.match; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestContext; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestContext; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.Optional; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceIsFalse.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsFalse.java similarity index 90% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceIsFalse.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsFalse.java index 0260c87d30e5..f74bec3fdad0 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceIsFalse.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsFalse.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.text; +package org.elasticsearch.gradle.internal.test.rest.transform.text; import com.fasterxml.jackson.databind.node.TextNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceIsTrue.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java similarity index 89% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceIsTrue.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java index 10728ffa1005..0f8c54caa2a2 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceIsTrue.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceIsTrue.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.text; +package org.elasticsearch.gradle.internal.test.rest.transform.text; import com.fasterxml.jackson.databind.node.TextNode; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceTextual.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextual.java similarity index 90% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceTextual.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextual.java index 6d35eeedb28e..ecd6b6fa7010 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceTextual.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextual.java @@ -6,13 +6,13 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.text; +package org.elasticsearch.gradle.internal.test.rest.transform.text; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestContext; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestContext; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; import org.gradle.api.tasks.Optional; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarnings.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarnings.java similarity index 90% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarnings.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarnings.java index 8e2a7f681478..6976ce6cd944 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarnings.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarnings.java @@ -6,13 +6,13 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; -import org.elasticsearch.gradle.test.rest.transform.feature.FeatureInjector; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.FeatureInjector; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarnings.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarnings.java similarity index 89% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarnings.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarnings.java index 2df9ba9a6d71..a3ee65cd8a62 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarnings.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarnings.java @@ -6,14 +6,14 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestContext; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; -import org.elasticsearch.gradle.test.rest.transform.feature.FeatureInjector; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestContext; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.FeatureInjector; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/RemoveWarnings.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/RemoveWarnings.java similarity index 92% rename from buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/RemoveWarnings.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/RemoveWarnings.java index 3b782f3d2e0f..a1d4e6d20692 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/test/rest/transform/warnings/RemoveWarnings.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/RemoveWarnings.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransformByParentObject; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransformByParentObject; import org.gradle.api.tasks.Input; import org.gradle.api.tasks.Internal; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/DockerComposeThrottle.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/DockerComposeThrottle.java similarity index 90% rename from buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/DockerComposeThrottle.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/DockerComposeThrottle.java index 1bb4708bdcef..2f56ebf8bfb7 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/DockerComposeThrottle.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/DockerComposeThrottle.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.testfixtures; +package org.elasticsearch.gradle.internal.testfixtures; import org.gradle.api.services.BuildService; import org.gradle.api.services.BuildServiceParameters; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixtureExtension.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixtureExtension.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixtureExtension.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixtureExtension.java index 7c55fc5b7a2c..2bcfb7c76d5c 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixtureExtension.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixtureExtension.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.testfixtures; +package org.elasticsearch.gradle.internal.testfixtures; import org.gradle.api.GradleException; import org.gradle.api.NamedDomainObjectContainer; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.java index a7d778520963..8a1c75870610 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testfixtures/TestFixturesPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/testfixtures/TestFixturesPlugin.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.testfixtures; +package org.elasticsearch.gradle.internal.testfixtures; import com.avast.gradle.dockercompose.ComposeExtension; import com.avast.gradle.dockercompose.DockerComposePlugin; @@ -13,10 +13,10 @@ import com.avast.gradle.dockercompose.ServiceInfo; import com.avast.gradle.dockercompose.tasks.ComposeDown; import com.avast.gradle.dockercompose.tasks.ComposePull; import com.avast.gradle.dockercompose.tasks.ComposeUp; -import org.elasticsearch.gradle.SystemPropertyCommandLineArgumentProvider; -import org.elasticsearch.gradle.docker.DockerSupportPlugin; -import org.elasticsearch.gradle.docker.DockerSupportService; -import org.elasticsearch.gradle.info.BuildParams; +import org.elasticsearch.gradle.internal.test.SystemPropertyCommandLineArgumentProvider; +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.precommit.TestingConventionsTasks; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.Action; @@ -135,9 +135,9 @@ public class TestFixturesPlugin implements Plugin { // Skip docker compose tasks if it is unavailable maybeSkipTasks(tasks, dockerSupport, Test.class); - maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.test.RestIntegTestTask")); + maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.internal.test.RestIntegTestTask")); maybeSkipTasks(tasks, dockerSupport, TestingConventionsTasks.class); - maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.test.AntFixture")); + maybeSkipTasks(tasks, dockerSupport, getTaskClass("org.elasticsearch.gradle.internal.test.AntFixture")); maybeSkipTasks(tasks, dockerSupport, ComposeUp.class); maybeSkipTasks(tasks, dockerSupport, ComposePull.class); maybeSkipTasks(tasks, dockerSupport, ComposeDown.class); diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/JavaUtil.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/JavaUtil.java similarity index 85% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/JavaUtil.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/JavaUtil.java index 4fae251ff8b8..de9dffa35d3f 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/JavaUtil.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/JavaUtil.java @@ -6,10 +6,10 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util; +package org.elasticsearch.gradle.internal.util; -import org.elasticsearch.gradle.info.BuildParams; -import org.elasticsearch.gradle.info.JavaHome; +import org.elasticsearch.gradle.internal.info.BuildParams; +import org.elasticsearch.gradle.internal.info.JavaHome; import org.gradle.api.GradleException; import java.util.List; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/Util.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/Util.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/Util.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/Util.java index f1f9473ecf92..f00c32bda3ec 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/Util.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/Util.java @@ -6,9 +6,10 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util; +package org.elasticsearch.gradle.internal.util; -import org.elasticsearch.gradle.info.GlobalBuildInfoPlugin; +import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin; +import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.Action; import org.gradle.api.GradleException; import org.gradle.api.Project; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/AvailablePortAllocator.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/AvailablePortAllocator.java similarity index 96% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/AvailablePortAllocator.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/AvailablePortAllocator.java index 17ac5eb8f66d..61b8e559a948 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/AvailablePortAllocator.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/AvailablePortAllocator.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util.ports; +package org.elasticsearch.gradle.internal.util.ports; import org.gradle.internal.Pair; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/DefaultPortDetector.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/DefaultPortDetector.java similarity index 95% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/DefaultPortDetector.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/DefaultPortDetector.java index 30b7ace3baec..dcc1c117031f 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/DefaultPortDetector.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/DefaultPortDetector.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util.ports; +package org.elasticsearch.gradle.internal.util.ports; import java.io.IOException; import java.net.DatagramSocket; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/DefaultReservedPortRangeFactory.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/DefaultReservedPortRangeFactory.java similarity index 91% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/DefaultReservedPortRangeFactory.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/DefaultReservedPortRangeFactory.java index 8218c4f46556..c89f52de61af 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/DefaultReservedPortRangeFactory.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/DefaultReservedPortRangeFactory.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util.ports; +package org.elasticsearch.gradle.internal.util.ports; public class DefaultReservedPortRangeFactory implements ReservedPortRangeFactory { @Override diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/PortDetector.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/PortDetector.java similarity index 88% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/PortDetector.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/PortDetector.java index 4e373f14e577..7119145d4bad 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/PortDetector.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/PortDetector.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util.ports; +package org.elasticsearch.gradle.internal.util.ports; public interface PortDetector { boolean isAvailable(int port); diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/ReservedPortRange.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/ReservedPortRange.java similarity index 98% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/ReservedPortRange.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/ReservedPortRange.java index 06cd4311ccfb..811fc10a00ae 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/ReservedPortRange.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/ReservedPortRange.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util.ports; +package org.elasticsearch.gradle.internal.util.ports; import java.util.ArrayList; import java.util.HashMap; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/ReservedPortRangeFactory.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/ReservedPortRangeFactory.java similarity index 89% rename from buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/ReservedPortRangeFactory.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/ReservedPortRangeFactory.java index 3fb579ce5699..afcb61c32642 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/ports/ReservedPortRangeFactory.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/util/ports/ReservedPortRangeFactory.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.util.ports; +package org.elasticsearch.gradle.internal.util.ports; public interface ReservedPortRangeFactory { ReservedPortRange getReservedPortRange(int startPort, int endPort); diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantBasePlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantBasePlugin.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantBasePlugin.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantBasePlugin.java index 56a581f40de9..580dba3de27d 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantBasePlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantBasePlugin.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.vagrant; +package org.elasticsearch.gradle.internal.vagrant; import org.elasticsearch.gradle.ReaperPlugin; import org.elasticsearch.gradle.util.GradleUtils; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantExtension.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantExtension.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantExtension.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantExtension.java index da6445cc8491..67799e6a6e75 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantExtension.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantExtension.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.vagrant; +package org.elasticsearch.gradle.internal.vagrant; import org.gradle.api.Project; import org.gradle.api.file.RegularFileProperty; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantMachine.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantMachine.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantMachine.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantMachine.java index c735552eea17..a3a11c438d2b 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantMachine.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantMachine.java @@ -6,13 +6,13 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.vagrant; +package org.elasticsearch.gradle.internal.vagrant; import org.apache.commons.io.output.TeeOutputStream; -import org.elasticsearch.gradle.LoggedExec; -import org.elasticsearch.gradle.LoggingOutputStream; +import org.elasticsearch.gradle.internal.LoggedExec; +import org.elasticsearch.gradle.internal.LoggingOutputStream; import org.elasticsearch.gradle.ReaperService; -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.provider.Provider; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantProgressLogger.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantProgressLogger.java similarity index 97% rename from buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantProgressLogger.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantProgressLogger.java index 75581c42a300..a204bbc668db 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantProgressLogger.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantProgressLogger.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.vagrant; +package org.elasticsearch.gradle.internal.vagrant; import java.util.function.UnaryOperator; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantShellTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantShellTask.java similarity index 94% rename from buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantShellTask.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantShellTask.java index c75d51a5f425..6524c44be147 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/vagrant/VagrantShellTask.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/internal/vagrant/VagrantShellTask.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.vagrant; +package org.elasticsearch.gradle.internal.vagrant; import org.gradle.api.DefaultTask; import org.gradle.api.tasks.Input; @@ -18,8 +18,8 @@ import java.util.List; import java.util.function.UnaryOperator; import java.util.stream.Collectors; -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; /** * A shell script to run within a vagrant VM. diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java index 131898bbfcd8..fe9f25d2b785 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/plugin/PluginBuildPlugin.java @@ -12,19 +12,19 @@ import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin; import groovy.lang.Closure; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; -import org.elasticsearch.gradle.BuildPlugin; +import org.elasticsearch.gradle.internal.BuildPlugin; import org.elasticsearch.gradle.NoticeTask; import org.elasticsearch.gradle.Version; -import org.elasticsearch.gradle.VersionProperties; +import org.elasticsearch.gradle.internal.VersionProperties; import org.elasticsearch.gradle.dependencies.CompileOnlyResolvePlugin; -import org.elasticsearch.gradle.info.BuildParams; +import org.elasticsearch.gradle.internal.info.BuildParams; import org.elasticsearch.gradle.internal.precommit.TestingConventionsTasks; -import org.elasticsearch.gradle.test.RestTestBasePlugin; +import org.elasticsearch.gradle.internal.test.RestTestBasePlugin; import org.elasticsearch.gradle.testclusters.ElasticsearchCluster; import org.elasticsearch.gradle.testclusters.RunTask; import org.elasticsearch.gradle.testclusters.TestClustersPlugin; 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.GradleException; import org.gradle.api.InvalidUserDataException; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellPrecommitPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellPrecommitPlugin.java index 2d9b8004ff81..f7993771d811 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellPrecommitPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellPrecommitPlugin.java @@ -8,8 +8,8 @@ package org.elasticsearch.gradle.precommit; -import org.elasticsearch.gradle.info.BuildParams; -import org.elasticsearch.gradle.util.Util; +import org.elasticsearch.gradle.internal.info.BuildParams; +import org.elasticsearch.gradle.internal.util.Util; import org.gradle.api.Project; import org.gradle.api.Task; import org.gradle.api.artifacts.Configuration; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellTask.java b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellTask.java index c68bda1822f4..8c2140c2362a 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellTask.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/precommit/JarHellTask.java @@ -8,7 +8,7 @@ package org.elasticsearch.gradle.precommit; -import org.elasticsearch.gradle.LoggedExec; +import org.elasticsearch.gradle.internal.LoggedExec; import org.gradle.api.file.FileCollection; import org.gradle.api.tasks.CacheableTask; import org.gradle.api.tasks.Classpath; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymoblicLinkPreservingTarPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymoblicLinkPreservingTarPlugin.java deleted file mode 100644 index 167cbc975570..000000000000 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/tar/SymoblicLinkPreservingTarPlugin.java +++ /dev/null @@ -1,21 +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.tar; - -import org.gradle.api.Plugin; -import org.gradle.api.Project; - -public class SymoblicLinkPreservingTarPlugin implements Plugin { - - @Override - public void apply(final Project target) { - - } - -} diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java index 7251324f365f..8289541c50cd 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchCluster.java @@ -10,7 +10,6 @@ package org.elasticsearch.gradle.testclusters; import org.elasticsearch.gradle.FileSupplier; import org.elasticsearch.gradle.PropertyNormalization; import org.elasticsearch.gradle.ReaperService; -import org.elasticsearch.gradle.http.WaitForHttpResource; import org.gradle.api.Named; import org.gradle.api.NamedDomainObjectContainer; import org.gradle.api.Project; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java index 1f7d24a5e1f1..e67e95231833 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java @@ -14,14 +14,13 @@ import org.elasticsearch.gradle.ElasticsearchDistribution; import org.elasticsearch.gradle.FileSupplier; import org.elasticsearch.gradle.LazyPropertyList; import org.elasticsearch.gradle.LazyPropertyMap; -import org.elasticsearch.gradle.LoggedExec; +import org.elasticsearch.gradle.internal.LoggedExec; import org.elasticsearch.gradle.OS; import org.elasticsearch.gradle.PropertyNormalization; import org.elasticsearch.gradle.ReaperService; import org.elasticsearch.gradle.Version; -import org.elasticsearch.gradle.VersionProperties; -import org.elasticsearch.gradle.http.WaitForHttpResource; -import org.elasticsearch.gradle.info.BuildParams; +import org.elasticsearch.gradle.internal.VersionProperties; +import org.elasticsearch.gradle.internal.info.BuildParams; import org.elasticsearch.gradle.transform.UnzipTransform; import org.elasticsearch.gradle.util.Pair; import org.gradle.api.Action; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java index f890c81fc9c1..f89739fee3ce 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/TestClustersPlugin.java @@ -10,8 +10,8 @@ package org.elasticsearch.gradle.testclusters; import org.elasticsearch.gradle.DistributionDownloadPlugin; import org.elasticsearch.gradle.ReaperPlugin; import org.elasticsearch.gradle.ReaperService; -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.internal.InternalDistributionDownloadPlugin; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.NamedDomainObjectContainer; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/http/WaitForHttpResource.java b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/WaitForHttpResource.java similarity index 99% rename from buildSrc/src/main/java/org/elasticsearch/gradle/http/WaitForHttpResource.java rename to buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/WaitForHttpResource.java index cb08067f00ba..bef5578f7bca 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/http/WaitForHttpResource.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/testclusters/WaitForHttpResource.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.http; +package org.elasticsearch.gradle.testclusters; import org.gradle.api.logging.Logger; import org.gradle.api.logging.Logging; diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java b/buildSrc/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java index 120febf783e2..0cb66fa48e74 100644 --- a/buildSrc/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java +++ b/buildSrc/src/main/java/org/elasticsearch/gradle/util/GradleUtils.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.gradle.util; -import org.elasticsearch.gradle.ElasticsearchJavaPlugin; +import org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin; import org.gradle.api.Action; import org.gradle.api.GradleException; import org.gradle.api.Project; diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.build.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.build.properties index c80e45ff2e9b..bb970e470089 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.build.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.build.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.BuildPlugin +implementation-class=org.elasticsearch.gradle.internal.BuildPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.distro-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.distro-test.properties index 7bfdb74782c2..c23f3910b0f0 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.distro-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.distro-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.DistroTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.DistroTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docker-support.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docker-support.properties index fec4e97bf67a..7efffa644f7d 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docker-support.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docker-support.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.docker.DockerSupportPlugin +implementation-class=org.elasticsearch.gradle.internal.docker.DockerSupportPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docs-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docs-test.properties index 9a5a5e4c5537..6fc1a857b38b 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docs-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.docs-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.doc.DocsTestPlugin +implementation-class=org.elasticsearch.gradle.internal.doc.DocsTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.global-build-info.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.global-build-info.properties index 742870787724..66d2aa2ee26c 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.global-build-info.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.global-build-info.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.info.GlobalBuildInfoPlugin \ No newline at end of file +implementation-class=org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.internal-cluster-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.internal-cluster-test.properties index a66bd5ee9790..46f55261e6e4 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.internal-cluster-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.internal-cluster-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.InternalClusterTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.InternalClusterTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java-rest-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java-rest-test.properties index 8622ed196f2c..397c7f743bb1 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java-rest-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java-rest-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.rest.JavaRestTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.rest.JavaRestTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java.properties index 61bd1c03e7a9..af0ae8708fc3 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.java.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.ElasticsearchJavaPlugin +implementation-class=org.elasticsearch.gradle.internal.ElasticsearchJavaPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.jdk-download.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.jdk-download.properties index 7568724a32a0..654d71189fbf 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.jdk-download.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.jdk-download.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.JdkDownloadPlugin \ No newline at end of file +implementation-class=org.elasticsearch.gradle.internal.JdkDownloadPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.publish.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.publish.properties index 52fa3b3da301..c0af28d7c093 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.publish.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.publish.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.PublishPlugin +implementation-class=org.elasticsearch.gradle.internal.PublishPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.repositories.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.repositories.properties index 91fd8c3d7bc5..dd4cec92c163 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.repositories.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.repositories.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.RepositoriesSetupPlugin +implementation-class=org.elasticsearch.gradle.internal.RepositoriesSetupPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-resources.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-resources.properties index 53137a0ebbbf..76660b861459 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-resources.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-resources.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.rest.RestResourcesPlugin +implementation-class=org.elasticsearch.gradle.internal.test.rest.RestResourcesPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-test.properties index 7d5c63c35c30..a7922900cfc0 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.rest-test.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.test.RestTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.RestTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-rest-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-rest-test.properties index 247b8f8fe545..a47d7eba8c35 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-rest-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-rest-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.StandaloneRestTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.StandaloneRestTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-test.properties index a9aadeb855de..6e413ae95152 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.standalone-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.StandaloneTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.StandaloneTestPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.symbolic-link-preserving-tar.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.symbolic-link-preserving-tar.properties deleted file mode 100644 index 0ad0ead7dbd9..000000000000 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.symbolic-link-preserving-tar.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.elasticsearch.gradle.tar.SymoblicLinkPreservingTarPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-base.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-base.properties index 5359cbd31891..44d840f5b3cd 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-base.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-base.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.ElasticsearchTestBasePlugin +implementation-class=org.elasticsearch.gradle.internal.ElasticsearchTestBasePlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-dependencies.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-dependencies.properties index 77a8b6b26463..75256f3fae0f 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-dependencies.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-dependencies.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.TestWithDependenciesPlugin +implementation-class=org.elasticsearch.gradle.internal.test.TestWithDependenciesPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-ssl.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-ssl.properties index 4211fef522da..337e5aeb618c 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-ssl.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test-with-ssl.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.TestWithSslPlugin +implementation-class=org.elasticsearch.gradle.internal.test.TestWithSslPlugin diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test.fixtures.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test.fixtures.properties index aac84c21ee63..e58710308ba5 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test.fixtures.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.test.fixtures.properties @@ -1 +1 @@ -implementation-class=org.elasticsearch.gradle.testfixtures.TestFixturesPlugin \ No newline at end of file +implementation-class=org.elasticsearch.gradle.internal.testfixtures.TestFixturesPlugin \ No newline at end of file diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.yaml-rest-test.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.yaml-rest-test.properties index c0caa6d45bf4..f908c66cfd72 100644 --- a/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.yaml-rest-test.properties +++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/elasticsearch.yaml-rest-test.properties @@ -6,4 +6,4 @@ # Side Public License, v 1. # -implementation-class=org.elasticsearch.gradle.test.rest.YamlRestTestPlugin +implementation-class=org.elasticsearch.gradle.internal.test.rest.YamlRestTestPlugin diff --git a/buildSrc/src/main/resources/checkstyle.xml b/buildSrc/src/main/resources/checkstyle.xml index 3d9bd62cf7f9..46f595349ff5 100644 --- a/buildSrc/src/main/resources/checkstyle.xml +++ b/buildSrc/src/main/resources/checkstyle.xml @@ -28,7 +28,7 @@ characters then it'll need to scroll. This fails the build if it sees such snippets. --> - + diff --git a/buildSrc/src/main/resources/checkstyle_ide_fragment.xml b/buildSrc/src/main/resources/checkstyle_ide_fragment.xml index ef8f77153462..a59af90e0bcf 100644 --- a/buildSrc/src/main/resources/checkstyle_ide_fragment.xml +++ b/buildSrc/src/main/resources/checkstyle_ide_fragment.xml @@ -28,7 +28,7 @@ - + diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/DistributionDownloadPluginTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/DistributionDownloadPluginTests.java index 83b1aa90218c..2a6a1fcb3f01 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/DistributionDownloadPluginTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/DistributionDownloadPluginTests.java @@ -10,8 +10,10 @@ package org.elasticsearch.gradle; import org.elasticsearch.gradle.ElasticsearchDistribution.Platform; import org.elasticsearch.gradle.ElasticsearchDistribution.Type; -import org.elasticsearch.gradle.info.BuildParams; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.VersionProperties; +import org.elasticsearch.gradle.internal.info.BuildParams; +import org.elasticsearch.gradle.internal.BwcVersions; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.NamedDomainObjectContainer; import org.gradle.api.Project; import org.gradle.testfixtures.ProjectBuilder; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/VersionTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/VersionTests.java index 55cc2b498e31..37aa5cf9d21d 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/VersionTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/VersionTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.gradle; * Side Public License, v 1. */ -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.junit.Rule; import org.junit.rules.ExpectedException; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/BwcVersionsTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/BwcVersionsTests.java similarity index 99% rename from buildSrc/src/test/java/org/elasticsearch/gradle/BwcVersionsTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/BwcVersionsTests.java index 7e340a168272..ca6a530eef3b 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/BwcVersionsTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/BwcVersionsTests.java @@ -1,6 +1,16 @@ -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 + * 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. + */ -import org.elasticsearch.gradle.test.GradleUnitTestCase; +package org.elasticsearch.gradle.internal; + +import org.elasticsearch.gradle.Architecture; +import org.elasticsearch.gradle.Version; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Rule; @@ -17,13 +27,6 @@ import java.util.stream.Stream; import static java.util.Arrays.asList; import static java.util.Collections.singletonList; -/* - * 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. - */ public class BwcVersionsTests extends GradleUnitTestCase { private static final Map> sampleVersions = new HashMap<>(); diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/ConcatFilesTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.java similarity index 96% rename from buildSrc/src/test/java/org/elasticsearch/gradle/ConcatFilesTaskTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.java index 080a2a9ffbc2..4fce1cebb45d 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/ConcatFilesTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.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; @@ -13,7 +13,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.util.Arrays; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.Project; import org.gradle.testfixtures.ProjectBuilder; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/EmptyDirTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/EmptyDirTaskTests.java similarity index 95% rename from buildSrc/src/test/java/org/elasticsearch/gradle/EmptyDirTaskTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/EmptyDirTaskTests.java index 965236dfe9f6..4afdf131a174 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/EmptyDirTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/EmptyDirTaskTests.java @@ -5,14 +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; +package org.elasticsearch.gradle.internal; import java.io.File; import java.io.IOException; import com.carrotsearch.randomizedtesting.RandomizedTest; import org.apache.tools.ant.taskdefs.condition.Os; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.Project; import org.gradle.testfixtures.ProjectBuilder; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/JdkDownloadPluginTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java similarity index 97% rename from buildSrc/src/test/java/org/elasticsearch/gradle/JdkDownloadPluginTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java index e835e816f4c3..35e2b42b4bba 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/JdkDownloadPluginTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle; +package org.elasticsearch.gradle.internal; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.NamedDomainObjectContainer; import org.gradle.api.Project; import org.gradle.testfixtures.ProjectBuilder; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/checkstyle/SnipptLengthCheckTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/checkstyle/SnipptLengthCheckTests.java similarity index 96% rename from buildSrc/src/test/java/org/elasticsearch/gradle/checkstyle/SnipptLengthCheckTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/checkstyle/SnipptLengthCheckTests.java index 934ff075232c..3258cd67ba1f 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/checkstyle/SnipptLengthCheckTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/checkstyle/SnipptLengthCheckTests.java @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.checkstyle; +package org.elasticsearch.gradle.internal.checkstyle; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import java.util.ArrayList; import java.util.Arrays; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/doc/RestTestFromSnippetsTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/doc/RestTestFromSnippetsTaskTests.java similarity index 90% rename from buildSrc/src/test/java/org/elasticsearch/gradle/doc/RestTestFromSnippetsTaskTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/doc/RestTestFromSnippetsTaskTests.java index e2780728e0e7..a4b332ff9133 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/doc/RestTestFromSnippetsTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/doc/RestTestFromSnippetsTaskTests.java @@ -5,14 +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.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.InvalidUserDataException; import org.junit.Rule; import org.junit.rules.ExpectedException; -import static org.elasticsearch.gradle.doc.RestTestsFromSnippetsTask.replaceBlockQuote; +import static org.elasticsearch.gradle.internal.doc.RestTestsFromSnippetsTask.replaceBlockQuote; public class RestTestFromSnippetsTaskTests extends GradleUnitTestCase { @Rule diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/doc/SnippetsTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/doc/SnippetsTaskTests.java similarity index 94% rename from buildSrc/src/test/java/org/elasticsearch/gradle/doc/SnippetsTaskTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/doc/SnippetsTaskTests.java index 4e83225296b2..50517653384f 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/doc/SnippetsTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/doc/SnippetsTaskTests.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.doc; +package org.elasticsearch.gradle.internal.doc; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; public class SnippetsTaskTests extends GradleUnitTestCase { diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/docker/DockerSupportServiceTests.java similarity index 91% rename from buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/docker/DockerSupportServiceTests.java index 9017210faeb0..9a252f56b2c5 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/docker/DockerSupportServiceTests.java @@ -5,16 +5,16 @@ * 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.test.GradleIntegrationTestCase; +import org.elasticsearch.gradle.internal.test.GradleIntegrationTestCase; import java.util.HashMap; import java.util.List; import java.util.Map; -import static org.elasticsearch.gradle.docker.DockerSupportService.deriveId; -import static org.elasticsearch.gradle.docker.DockerSupportService.parseOsRelease; +import static org.elasticsearch.gradle.internal.docker.DockerSupportService.deriveId; +import static org.elasticsearch.gradle.internal.docker.DockerSupportService.parseOsRelease; import static org.hamcrest.CoreMatchers.equalTo; public class DockerSupportServiceTests extends GradleIntegrationTestCase { diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilterTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilterTests.java similarity index 97% rename from buildSrc/src/test/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilterTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilterTests.java index ebe944eb9cf6..cc673cd758ec 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/docker/TransformLog4jConfigFilterTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilterTests.java @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.docker; +package org.elasticsearch.gradle.internal.docker; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import java.util.List; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java index f0e290735b6f..38328459866c 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.gradle.internal.precommit; import org.apache.groovy.util.Maps; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.Action; import org.gradle.api.GradleException; import org.gradle.api.Project; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java index e3ae93275dea..c18562eb0ffb 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java @@ -15,7 +15,7 @@ import java.util.stream.Collectors; import com.carrotsearch.randomizedtesting.RandomizedTest; import org.apache.tools.ant.taskdefs.condition.Os; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.GradleException; import org.gradle.api.Project; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTaskTests.java index 64cb71dee552..0fc234536a4d 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTaskTests.java @@ -7,7 +7,7 @@ */ package org.elasticsearch.gradle.internal.precommit; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.GradleException; import org.gradle.api.Project; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/UpdateShasTaskTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/UpdateShasTaskTests.java index 7ab90ab6481a..46c8a76fe7f0 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/UpdateShasTaskTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/precommit/UpdateShasTaskTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.gradle.internal.precommit; import org.apache.commons.io.FileUtils; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.GradleException; import org.gradle.api.Project; import org.gradle.api.artifacts.Dependency; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/TransformTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/TransformTests.java similarity index 98% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/TransformTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/TransformTests.java index 38499464e278..c3f13b1a02c4 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/TransformTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/TransformTests.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform; +package org.elasticsearch.gradle.internal.test.rest.transform; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -17,8 +17,8 @@ import com.fasterxml.jackson.databind.node.ObjectNode; 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.test.GradleUnitTestCase; -import org.elasticsearch.gradle.test.rest.transform.headers.InjectHeaders; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.rest.transform.headers.InjectHeaders; import org.hamcrest.CoreMatchers; import org.hamcrest.core.IsCollectionContaining; import org.junit.Before; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/feature/InjectFeatureTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/feature/InjectFeatureTests.java similarity index 96% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/feature/InjectFeatureTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/feature/InjectFeatureTests.java index 2ce5e5e51086..d643db88774f 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/feature/InjectFeatureTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/feature/InjectFeatureTests.java @@ -6,10 +6,10 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.feature; +package org.elasticsearch.gradle.internal.test.rest.transform.feature; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.TransformTests; +import org.elasticsearch.gradle.internal.test.rest.transform.TransformTests; import org.junit.Test; import java.util.List; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/header/InjectHeaderTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/header/InjectHeaderTests.java similarity index 88% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/header/InjectHeaderTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/header/InjectHeaderTests.java index 7b79a1177733..34d1273a086a 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/header/InjectHeaderTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/header/InjectHeaderTests.java @@ -6,12 +6,12 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.header; +package org.elasticsearch.gradle.internal.test.rest.transform.header; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.feature.InjectFeatureTests; -import org.elasticsearch.gradle.test.rest.transform.headers.InjectHeaders; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.InjectFeatureTests; +import org.elasticsearch.gradle.internal.test.rest.transform.headers.InjectHeaders; import org.junit.Test; import java.util.Collections; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/AddMatchTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatchTests.java similarity index 96% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/AddMatchTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatchTests.java index 73117ce56eb1..f6cd3905fc05 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/AddMatchTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatchTests.java @@ -6,14 +6,14 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.match; +package org.elasticsearch.gradle.internal.test.rest.transform.match; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.elasticsearch.gradle.test.rest.transform.TransformTests; +import org.elasticsearch.gradle.internal.test.rest.transform.TransformTests; import org.hamcrest.CoreMatchers; import org.junit.Test; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/RemoveMatchTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatchTests.java similarity index 97% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/RemoveMatchTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatchTests.java index 63c1a5533867..86d20b5a09fe 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/RemoveMatchTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatchTests.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.match; +package org.elasticsearch.gradle.internal.test.rest.transform.match; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.ObjectReader; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.elasticsearch.gradle.test.rest.transform.TransformTests; +import org.elasticsearch.gradle.internal.test.rest.transform.TransformTests; import org.hamcrest.CoreMatchers; import org.junit.Test; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/ReplaceMatchTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/ReplaceMatchTests.java similarity index 97% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/ReplaceMatchTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/ReplaceMatchTests.java index bd3bedc3abd5..cfa6b55d81eb 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/match/ReplaceMatchTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/ReplaceMatchTests.java @@ -6,14 +6,14 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.match; +package org.elasticsearch.gradle.internal.test.rest.transform.match; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.elasticsearch.gradle.test.rest.transform.TransformTests; +import org.elasticsearch.gradle.internal.test.rest.transform.TransformTests; import org.hamcrest.CoreMatchers; import org.junit.Test; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceTextualTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextualTests.java similarity index 97% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceTextualTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextualTests.java index f6e41fac13d8..9f53f22c0a58 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/text/ReplaceTextualTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/text/ReplaceTextualTests.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.text; +package org.elasticsearch.gradle.internal.test.rest.transform.text; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,7 +14,7 @@ import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.TextNode; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; -import org.elasticsearch.gradle.test.rest.transform.TransformTests; +import org.elasticsearch.gradle.internal.test.rest.transform.TransformTests; import org.hamcrest.CoreMatchers; import org.junit.Test; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarningsRegexTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarningsRegexTests.java similarity index 91% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarningsRegexTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarningsRegexTests.java index 07c85ca1616e..3deddc8309a4 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarningsRegexTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarningsRegexTests.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.feature.InjectFeatureTests; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.InjectFeatureTests; import org.junit.Test; import java.util.ArrayList; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarningsTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarningsTests.java similarity index 91% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarningsTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarningsTests.java index 34046ca795e7..580204d6e681 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectAllowedWarningsTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectAllowedWarningsTests.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.feature.InjectFeatureTests; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.InjectFeatureTests; import org.junit.Test; import java.util.ArrayList; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarningsRegexTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsRegexTests.java similarity index 92% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarningsRegexTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsRegexTests.java index 71c768fd90c6..ad95016add15 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarningsRegexTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsRegexTests.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.feature.InjectFeatureTests; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.InjectFeatureTests; import org.junit.Test; import java.util.ArrayList; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarningsTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsTests.java similarity index 92% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarningsTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsTests.java index 71469f39e89f..cd338502e00d 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/InjectWarningsTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsTests.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.feature.InjectFeatureTests; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.feature.InjectFeatureTests; import org.junit.Test; import java.util.ArrayList; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/RemoveWarningsTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/RemoveWarningsTests.java similarity index 92% rename from buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/RemoveWarningsTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/RemoveWarningsTests.java index ce04f41c0455..8f4b4d806685 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/test/rest/transform/warnings/RemoveWarningsTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/RemoveWarningsTests.java @@ -6,11 +6,11 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test.rest.transform.warnings; +package org.elasticsearch.gradle.internal.test.rest.transform.warnings; import com.fasterxml.jackson.databind.node.ObjectNode; -import org.elasticsearch.gradle.test.rest.transform.RestTestTransform; -import org.elasticsearch.gradle.test.rest.transform.TransformTests; +import org.elasticsearch.gradle.internal.test.rest.transform.RestTestTransform; +import org.elasticsearch.gradle.internal.test.rest.transform.TransformTests; import org.junit.Test; import java.util.Collections; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/plugin/PluginPropertiesExtensionTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/plugin/PluginPropertiesExtensionTests.java index 2a16f674ef99..cbb3d4eb1183 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/plugin/PluginPropertiesExtensionTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/plugin/PluginPropertiesExtensionTests.java @@ -8,7 +8,7 @@ package org.elasticsearch.gradle.plugin; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import org.gradle.api.Project; import org.gradle.api.plugins.JavaPlugin; import org.gradle.testfixtures.ProjectBuilder; diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/http/WaitForHttpResourceTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/WaitForHttpResourceTests.java similarity index 95% rename from buildSrc/src/test/java/org/elasticsearch/gradle/http/WaitForHttpResourceTests.java rename to buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/WaitForHttpResourceTests.java index fd8300765a60..a94eca15d1c8 100644 --- a/buildSrc/src/test/java/org/elasticsearch/gradle/http/WaitForHttpResourceTests.java +++ b/buildSrc/src/test/java/org/elasticsearch/gradle/testclusters/WaitForHttpResourceTests.java @@ -6,9 +6,9 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.http; +package org.elasticsearch.gradle.testclusters; -import org.elasticsearch.gradle.test.GradleUnitTestCase; +import org.elasticsearch.gradle.internal.test.GradleUnitTestCase; import java.net.URL; import java.nio.file.Paths; diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/BaseTestCase.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/BaseTestCase.java similarity index 97% rename from buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/BaseTestCase.java rename to buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/BaseTestCase.java index 8fb6db0049b3..f429c7035c46 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/BaseTestCase.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/BaseTestCase.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 com.carrotsearch.randomizedtesting.JUnit4MethodProvider; import com.carrotsearch.randomizedtesting.RandomizedRunner; diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleIntegrationTestCase.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleIntegrationTestCase.java similarity index 96% rename from buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleIntegrationTestCase.java rename to buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleIntegrationTestCase.java index 9fe178790d8a..df8815f57856 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleIntegrationTestCase.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleIntegrationTestCase.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.testkit.runner.BuildResult; import org.gradle.testkit.runner.BuildTask; @@ -27,6 +27,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public abstract class GradleIntegrationTestCase extends GradleUnitTestCase { diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleThreadsFilter.java similarity index 94% rename from buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java rename to buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleThreadsFilter.java index 2245d1540389..24a12b87377a 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleThreadsFilter.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleThreadsFilter.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test; +package org.elasticsearch.gradle.internal.test; import com.carrotsearch.randomizedtesting.ThreadFilter; diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleUnitTestCase.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleUnitTestCase.java similarity index 95% rename from buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleUnitTestCase.java rename to buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleUnitTestCase.java index 05838a920e47..accf1f18e774 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/GradleUnitTestCase.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleUnitTestCase.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 com.carrotsearch.randomizedtesting.JUnit4MethodProvider; import com.carrotsearch.randomizedtesting.RandomizedRunner; diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/JUnit3MethodProvider.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/JUnit3MethodProvider.java similarity index 97% rename from buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/JUnit3MethodProvider.java rename to buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/JUnit3MethodProvider.java index 080a9c80643c..b4c9123384da 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/JUnit3MethodProvider.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/JUnit3MethodProvider.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 com.carrotsearch.randomizedtesting.ClassModel; import com.carrotsearch.randomizedtesting.ClassModel.MethodModel; diff --git a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/TestClasspathUtils.java b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/TestClasspathUtils.java similarity index 97% rename from buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/TestClasspathUtils.java rename to buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/TestClasspathUtils.java index 86b138bd3ab3..24b2342d734b 100644 --- a/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/test/TestClasspathUtils.java +++ b/buildSrc/src/testFixtures/java/org/elasticsearch/gradle/internal/test/TestClasspathUtils.java @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -package org.elasticsearch.gradle.test; +package org.elasticsearch.gradle.internal.test; import java.io.File; import java.io.IOException; diff --git a/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle b/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle index bb07ac0f50c9..05f8cc7665c8 100644 --- a/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle +++ b/buildSrc/src/testKit/elasticsearch-build-resources/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.ExportElasticsearchBuildResourcesTask +import org.elasticsearch.gradle.internal.ExportElasticsearchBuildResourcesTask plugins { id 'base' diff --git a/buildSrc/src/testKit/elasticsearch.build/build.gradle b/buildSrc/src/testKit/elasticsearch.build/build.gradle index fb1338f31361..93c9bd273a8f 100644 --- a/buildSrc/src/testKit/elasticsearch.build/build.gradle +++ b/buildSrc/src/testKit/elasticsearch.build/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'elasticsearch.global-build-info' } -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams BuildParams.init { it.setIsInternal(true) } apply plugin:'elasticsearch.build' diff --git a/buildSrc/src/testKit/symbolic-link-preserving-tar/build.gradle b/buildSrc/src/testKit/symbolic-link-preserving-tar/build.gradle index d61e9cf879d0..f7a9d5f8a192 100644 --- a/buildSrc/src/testKit/symbolic-link-preserving-tar/build.gradle +++ b/buildSrc/src/testKit/symbolic-link-preserving-tar/build.gradle @@ -1,9 +1,10 @@ -import org.elasticsearch.gradle.tar.SymbolicLinkPreservingTar +import org.elasticsearch.gradle.internal.SymbolicLinkPreservingTar plugins { id 'base' id 'distribution' - id 'elasticsearch.symbolic-link-preserving-tar' + // we need to add one of our plugins to get things on this classpath + id 'elasticsearch.global-build-info' apply false } final String source = Objects.requireNonNull(System.getProperty('tests.symbolic_link_preserving_tar_source')) diff --git a/buildSrc/src/testKit/thirdPartyAudit/build.gradle b/buildSrc/src/testKit/thirdPartyAudit/build.gradle index 42d6a61ec82a..f7f032ca3f8a 100644 --- a/buildSrc/src/testKit/thirdPartyAudit/build.gradle +++ b/buildSrc/src/testKit/thirdPartyAudit/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.precommit.ThirdPartyAuditPrecommitPlugin -import org.elasticsearch.gradle.precommit.ThirdPartyAuditTask +import org.elasticsearch.gradle.internal.precommit.ThirdPartyAuditPrecommitPlugin +import org.elasticsearch.gradle.internal.precommit.ThirdPartyAuditTask plugins { diff --git a/client/rest-high-level/build.gradle b/client/rest-high-level/build.gradle index 7fb525634498..9bc0b7406376 100644 --- a/client/rest-high-level/build.gradle +++ b/client/rest-high-level/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.info.BuildParams /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one diff --git a/distribution/archives/integ-test-zip/build.gradle b/distribution/archives/integ-test-zip/build.gradle index 29ea835bb47f..0eae955e1958 100644 --- a/distribution/archives/integ-test-zip/build.gradle +++ b/distribution/archives/integ-test-zip/build.gradle @@ -5,7 +5,7 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.MavenFilteringHack apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-test' diff --git a/distribution/build.gradle b/distribution/build.gradle index a781cbe48aa1..ef4086966dc3 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -8,12 +8,12 @@ import org.apache.tools.ant.filters.FixCrLfFilter -import org.elasticsearch.gradle.ConcatFilesTask -import org.elasticsearch.gradle.DependenciesInfoTask -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.ConcatFilesTask +import org.elasticsearch.gradle.internal.DependenciesInfoTask +import org.elasticsearch.gradle.internal.MavenFilteringHack import org.elasticsearch.gradle.NoticeTask -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 java.nio.file.Files import java.nio.file.Path diff --git a/distribution/bwc/build.gradle b/distribution/bwc/build.gradle index b434a4fca033..476aa6978b5c 100644 --- a/distribution/bwc/build.gradle +++ b/distribution/bwc/build.gradle @@ -9,7 +9,7 @@ apply plugin:"elasticsearch.internal-distribution-bwc-setup" import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams BuildParams.getBwcVersions().forPreviousUnreleased { unreleasedVersion -> diff --git a/distribution/docker/build.gradle b/distribution/docker/build.gradle index 74837f0b8c7f..8377135539ec 100644 --- a/distribution/docker/build.gradle +++ b/distribution/docker/build.gradle @@ -1,12 +1,12 @@ import org.elasticsearch.gradle.Architecture -import org.elasticsearch.gradle.DockerBase -import org.elasticsearch.gradle.LoggedExec -import org.elasticsearch.gradle.VersionProperties -import org.elasticsearch.gradle.docker.DockerBuildTask -import org.elasticsearch.gradle.docker.ShellRetry -import org.elasticsearch.gradle.docker.TransformLog4jConfigFilter -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.testfixtures.TestFixturesPlugin +import org.elasticsearch.gradle.internal.DockerBase +import org.elasticsearch.gradle.internal.LoggedExec +import org.elasticsearch.gradle.internal.VersionProperties +import org.elasticsearch.gradle.internal.docker.DockerBuildTask +import org.elasticsearch.gradle.internal.docker.ShellRetry +import org.elasticsearch.gradle.internal.docker.TransformLog4jConfigFilter +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.testfixtures.TestFixturesPlugin import java.nio.file.Path diff --git a/distribution/packages/build.gradle b/distribution/packages/build.gradle index 4aa3be370ed5..be7a407ccac5 100644 --- a/distribution/packages/build.gradle +++ b/distribution/packages/build.gradle @@ -6,10 +6,10 @@ * Side Public License, v 1. */ -import org.elasticsearch.gradle.LoggedExec -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.LoggedExec +import org.elasticsearch.gradle.internal.MavenFilteringHack import org.elasticsearch.gradle.OS -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.redline_rpm.header.Flags import java.nio.file.Files diff --git a/docs/build.gradle b/docs/build.gradle index 7d33cf5f1dcf..66469a001b8d 100644 --- a/docs/build.gradle +++ b/docs/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import static org.elasticsearch.gradle.testclusters.TestDistribution.DEFAULT diff --git a/gradle/build-scan.gradle b/gradle/build-scan.gradle index dba31b97db09..fe6fe693573c 100644 --- a/gradle/build-scan.gradle +++ b/gradle/build-scan.gradle @@ -1,6 +1,6 @@ import org.elasticsearch.gradle.Architecture import org.elasticsearch.gradle.OS -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.gradle.initialization.BuildRequestMetaData import java.util.concurrent.TimeUnit diff --git a/gradle/bwc-test.gradle b/gradle/bwc-test.gradle index d9385e56edec..dfb54d190007 100644 --- a/gradle/bwc-test.gradle +++ b/gradle/bwc-test.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams ext.bwcTaskName = { Version version -> return "v${version}#bwcTest" diff --git a/gradle/fips.gradle b/gradle/fips.gradle index 5cd1dfefba91..5add44d9ea47 100644 --- a/gradle/fips.gradle +++ b/gradle/fips.gradle @@ -1,5 +1,5 @@ -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.testclusters.TestDistribution // Common config when running with a FIPS-140 runtime JVM diff --git a/gradle/formatting.gradle b/gradle/formatting.gradle index 7c5ca45c1919..96c0277e0a2a 100644 --- a/gradle/formatting.gradle +++ b/gradle/formatting.gradle @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import org.elasticsearch.gradle.BuildPlugin +import org.elasticsearch.gradle.internal.BuildPlugin /* * This script plugin configures formatting for Java source using Spotless diff --git a/gradle/ide.gradle b/gradle/ide.gradle index d515136fac35..c5f3b67e1999 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.jetbrains.gradle.ext.JUnit import java.nio.file.Files diff --git a/gradle/runtime-jdk-provision.gradle b/gradle/runtime-jdk-provision.gradle index eea8f87822c1..9ffdb5705fa2 100644 --- a/gradle/runtime-jdk-provision.gradle +++ b/gradle/runtime-jdk-provision.gradle @@ -1,7 +1,7 @@ import org.elasticsearch.gradle.Architecture import org.elasticsearch.gradle.OS -import org.elasticsearch.gradle.VersionProperties -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.VersionProperties +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.jdk-download' diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index 37206e259e82..1c8537df6fc2 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams esplugin { description 'Placeholder plugin for geospatial features in ES. only registers geo_shape field mapper for now' diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index ba2d7ee7e4f1..0a7fbdf1a8a9 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -9,8 +9,8 @@ import org.apache.tools.ant.taskdefs.condition.Os import org.elasticsearch.gradle.Architecture import org.elasticsearch.gradle.OS -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.AntFixture +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.AntFixture apply plugin: 'elasticsearch.test-with-dependencies' apply plugin: 'elasticsearch.jdk-download' diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 00897a05c225..44373e48545d 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -7,10 +7,10 @@ */ -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.test.rest.JavaRestTestPlugin -import org.elasticsearch.gradle.test.InternalClusterTestPlugin +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.rest.JavaRestTestPlugin +import org.elasticsearch.gradle.internal.test.InternalClusterTestPlugin apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' diff --git a/plugins/discovery-azure-classic/build.gradle b/plugins/discovery-azure-classic/build.gradle index c218466b08b7..88dc6a3897a7 100644 --- a/plugins/discovery-azure-classic/build.gradle +++ b/plugins/discovery-azure-classic/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.LoggedExec -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.LoggedExec +import org.elasticsearch.gradle.internal.info.BuildParams /* * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one diff --git a/plugins/discovery-ec2/build.gradle b/plugins/discovery-ec2/build.gradle index e575ee8f9ffe..6eac2f760f65 100644 --- a/plugins/discovery-ec2/build.gradle +++ b/plugins/discovery-ec2/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/plugins/discovery-ec2/qa/amazon-ec2/build.gradle b/plugins/discovery-ec2/qa/amazon-ec2/build.gradle index 25fb1d9ed96e..be31c77b9289 100644 --- a/plugins/discovery-ec2/qa/amazon-ec2/build.gradle +++ b/plugins/discovery-ec2/qa/amazon-ec2/build.gradle @@ -7,11 +7,11 @@ */ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.AntFixture -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.test.rest.YamlRestTestPlugin +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.AntFixture +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.rest.YamlRestTestPlugin import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE diff --git a/plugins/discovery-gce/qa/gce/build.gradle b/plugins/discovery-gce/qa/gce/build.gradle index 73d42c4806b0..061c755a885a 100644 --- a/plugins/discovery-gce/qa/gce/build.gradle +++ b/plugins/discovery-gce/qa/gce/build.gradle @@ -7,9 +7,9 @@ */ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.AntFixture +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.AntFixture import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE diff --git a/plugins/examples/build.gradle b/plugins/examples/build.gradle index 0434c6e77903..2bead2971bf3 100644 --- a/plugins/examples/build.gradle +++ b/plugins/examples/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams // Subprojects aren't published so do not assemble gradle.projectsEvaluated { subprojects { diff --git a/plugins/examples/rest-handler/build.gradle b/plugins/examples/rest-handler/build.gradle index 19fcac2e77a1..cf5ff5fc437e 100644 --- a/plugins/examples/rest-handler/build.gradle +++ b/plugins/examples/rest-handler/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 @@ -22,7 +22,7 @@ esplugin { // No unit tests in this example tasks.named("test").configure { enabled = false } -def fixture = tasks.register("exampleFixture", org.elasticsearch.gradle.test.AntFixture) { +def fixture = tasks.register("exampleFixture", org.elasticsearch.gradle.internal.test.AntFixture) { dependsOn sourceSets.javaRestTest.runtimeClasspath env 'CLASSPATH', "${-> project.sourceSets.javaRestTest.runtimeClasspath.asPath}" executable = "${BuildParams.runtimeJavaHome}/bin/java" diff --git a/plugins/ingest-attachment/build.gradle b/plugins/ingest-attachment/build.gradle index e33d4f9f4efd..03a5e5f71721 100644 --- a/plugins/ingest-attachment/build.gradle +++ b/plugins/ingest-attachment/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/plugins/repository-azure/azure-storage-blob/build.gradle b/plugins/repository-azure/azure-storage-blob/build.gradle index 8d9a013223ad..1101ac2cd9be 100644 --- a/plugins/repository-azure/azure-storage-blob/build.gradle +++ b/plugins/repository-azure/azure-storage-blob/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.JavaClassPublicifier; +import org.elasticsearch.gradle.internal.JavaClassPublicifier; apply plugin: 'elasticsearch.java' apply plugin: 'com.github.johnrengelman.shadow' diff --git a/plugins/repository-azure/build.gradle b/plugins/repository-azure/build.gradle index 46d10731cc01..de3e3813b0ec 100644 --- a/plugins/repository-azure/build.gradle +++ b/plugins/repository-azure/build.gradle @@ -1,6 +1,6 @@ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.InternalClusterTestPlugin +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.InternalClusterTestPlugin import static org.elasticsearch.gradle.PropertyNormalization.DEFAULT import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE diff --git a/plugins/repository-gcs/build.gradle b/plugins/repository-gcs/build.gradle index a733a8d1bfd4..b7b9d1b81912 100644 --- a/plugins/repository-gcs/build.gradle +++ b/plugins/repository-gcs/build.gradle @@ -1,11 +1,11 @@ import java.nio.file.Files import java.security.KeyPair import java.security.KeyPairGenerator -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.test.rest.YamlRestTestPlugin -import org.elasticsearch.gradle.test.InternalClusterTestPlugin +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.rest.YamlRestTestPlugin +import org.elasticsearch.gradle.internal.test.InternalClusterTestPlugin import java.nio.file.Files import java.security.KeyPair diff --git a/plugins/repository-hdfs/build.gradle b/plugins/repository-hdfs/build.gradle index 2f10d77e8262..2272f7e00e54 100644 --- a/plugins/repository-hdfs/build.gradle +++ b/plugins/repository-hdfs/build.gradle @@ -7,8 +7,8 @@ */ import org.apache.tools.ant.taskdefs.condition.Os -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask import java.nio.file.Files import java.nio.file.Path @@ -106,7 +106,7 @@ String krb5conf = project(':test:fixtures:krb5kdc-fixture').ext.krb5Conf("hdfs") // Create HDFS File System Testing Fixtures for HA/Secure combinations for (String fixtureName : ['hdfsFixture', 'haHdfsFixture', 'secureHdfsFixture', 'secureHaHdfsFixture']) { - project.tasks.register(fixtureName, org.elasticsearch.gradle.test.AntFixture) { + project.tasks.register(fixtureName, org.elasticsearch.gradle.internal.test.AntFixture) { dependsOn project.configurations.hdfsFixture, project(':test:fixtures:krb5kdc-fixture').tasks.postProcessFixture executable = "${BuildParams.runtimeJavaHome}/bin/java" env 'CLASSPATH', "${-> project.configurations.hdfsFixture.asPath}" diff --git a/plugins/repository-s3/build.gradle b/plugins/repository-s3/build.gradle index 87ef2f58d70f..ee7552c77e04 100644 --- a/plugins/repository-s3/build.gradle +++ b/plugins/repository-s3/build.gradle @@ -1,8 +1,8 @@ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.test.rest.YamlRestTestPlugin -import org.elasticsearch.gradle.test.InternalClusterTestPlugin +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.rest.YamlRestTestPlugin +import org.elasticsearch.gradle.internal.test.InternalClusterTestPlugin import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE diff --git a/plugins/transport-nio/build.gradle b/plugins/transport-nio/build.gradle index 127644e913bf..2e0e3454f118 100644 --- a/plugins/transport-nio/build.gradle +++ b/plugins/transport-nio/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/qa/ccs-rolling-upgrade-remote-cluster/build.gradle b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle index 79507e080da3..5b9413f5f146 100644 --- a/qa/ccs-rolling-upgrade-remote-cluster/build.gradle +++ b/qa/ccs-rolling-upgrade-remote-cluster/build.gradle @@ -7,7 +7,7 @@ */ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/qa/die-with-dignity/build.gradle b/qa/die-with-dignity/build.gradle index 5d655968c43d..4ef36b0383dd 100644 --- a/qa/die-with-dignity/build.gradle +++ b/qa/die-with-dignity/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.util.GradleUtils apply plugin: 'elasticsearch.java-rest-test' diff --git a/qa/full-cluster-restart/build.gradle b/qa/full-cluster-restart/build.gradle index ce45f33e5ec0..8eaf7b322954 100644 --- a/qa/full-cluster-restart/build.gradle +++ b/qa/full-cluster-restart/build.gradle @@ -8,7 +8,7 @@ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/qa/mixed-cluster/build.gradle b/qa/mixed-cluster/build.gradle index c214efcb7ecb..0b71981b2692 100644 --- a/qa/mixed-cluster/build.gradle +++ b/qa/mixed-cluster/build.gradle @@ -7,8 +7,8 @@ */ 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.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/qa/multi-cluster-search/build.gradle b/qa/multi-cluster-search/build.gradle index e59ed02d63d7..fbbd4b9a029c 100644 --- a/qa/multi-cluster-search/build.gradle +++ b/qa/multi-cluster-search/build.gradle @@ -6,7 +6,7 @@ * Side Public License, v 1. */ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/qa/os/windows-2012r2/build.gradle b/qa/os/windows-2012r2/build.gradle index 1a35b3ba9156..30df2ee0a144 100644 --- a/qa/os/windows-2012r2/build.gradle +++ b/qa/os/windows-2012r2/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.GradleDistroTestTask +import org.elasticsearch.gradle.internal.test.GradleDistroTestTask String boxId = project.properties.get('vagrant.windows-2012r2.id') if (boxId != null) { diff --git a/qa/os/windows-2016/build.gradle b/qa/os/windows-2016/build.gradle index 6f87222324b4..d2c1b4240b15 100644 --- a/qa/os/windows-2016/build.gradle +++ b/qa/os/windows-2016/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.GradleDistroTestTask +import org.elasticsearch.gradle.internal.test.GradleDistroTestTask String boxId = project.properties.get('vagrant.windows-2016.id') if (boxId != null) { diff --git a/qa/remote-clusters/build.gradle b/qa/remote-clusters/build.gradle index a291309fc7f6..b81f4a50450a 100644 --- a/qa/remote-clusters/build.gradle +++ b/qa/remote-clusters/build.gradle @@ -7,8 +7,8 @@ */ import org.elasticsearch.gradle.Architecture -import org.elasticsearch.gradle.VersionProperties -import org.elasticsearch.gradle.testfixtures.TestFixturesPlugin +import org.elasticsearch.gradle.internal.VersionProperties +import org.elasticsearch.gradle.internal.testfixtures.TestFixturesPlugin apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.test.fixtures' diff --git a/qa/repository-multi-version/build.gradle b/qa/repository-multi-version/build.gradle index 05bedf0bbd38..8078c05d85f2 100644 --- a/qa/repository-multi-version/build.gradle +++ b/qa/repository-multi-version/build.gradle @@ -7,7 +7,7 @@ */ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/qa/rolling-upgrade/build.gradle b/qa/rolling-upgrade/build.gradle index e2b4abc5a7aa..fb8dacb76af6 100644 --- a/qa/rolling-upgrade/build.gradle +++ b/qa/rolling-upgrade/build.gradle @@ -7,7 +7,7 @@ */ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/qa/smoke-test-plugins/build.gradle b/qa/smoke-test-plugins/build.gradle index 67a54372e67e..d4b4a9cd2487 100644 --- a/qa/smoke-test-plugins/build.gradle +++ b/qa/smoke-test-plugins/build.gradle @@ -6,8 +6,8 @@ * Side Public License, v 1. */ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/qa/verify-version-constants/build.gradle b/qa/verify-version-constants/build.gradle index 8f9f1527b3eb..ecb275de779a 100644 --- a/qa/verify-version-constants/build.gradle +++ b/qa/verify-version-constants/build.gradle @@ -7,8 +7,8 @@ */ 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.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/qa/wildfly/build.gradle b/qa/wildfly/build.gradle index e6c1c03bb786..346a9cd19bdf 100644 --- a/qa/wildfly/build.gradle +++ b/qa/wildfly/build.gradle @@ -7,7 +7,7 @@ */ import org.elasticsearch.gradle.Architecture -import org.elasticsearch.gradle.VersionProperties +import org.elasticsearch.gradle.internal.VersionProperties apply plugin: 'war' apply plugin: 'elasticsearch.java' diff --git a/test/external-modules/build.gradle b/test/external-modules/build.gradle index dea70712e8c7..68274506581f 100644 --- a/test/external-modules/build.gradle +++ b/test/external-modules/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.info.BuildParams; +import org.elasticsearch.gradle.internal.info.BuildParams; subprojects { apply plugin: 'elasticsearch.esplugin' diff --git a/test/framework/build.gradle b/test/framework/build.gradle index f7b9528bdbb3..d711dca45d1d 100644 --- a/test/framework/build.gradle +++ b/test/framework/build.gradle @@ -5,7 +5,7 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import org.elasticsearch.gradle.info.BuildParams; +import org.elasticsearch.gradle.internal.info.BuildParams; apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.publish' diff --git a/x-pack/plugin/async-search/qa/build.gradle b/x-pack/plugin/async-search/qa/build.gradle index c4a938d61ebe..e6dedf1cdcdb 100644 --- a/x-pack/plugin/async-search/qa/build.gradle +++ b/x-pack/plugin/async-search/qa/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.build' tasks.named("test").configure { enabled = false } diff --git a/x-pack/plugin/async-search/qa/rest/build.gradle b/x-pack/plugin/async-search/qa/rest/build.gradle index ba6a281f23f1..96346f61e75d 100644 --- a/x-pack/plugin/async-search/qa/rest/build.gradle +++ b/x-pack/plugin/async-search/qa/rest/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.yaml-rest-test' diff --git a/x-pack/plugin/autoscaling/build.gradle b/x-pack/plugin/autoscaling/build.gradle index c5d75d755da1..53c36cbaedb9 100644 --- a/x-pack/plugin/autoscaling/build.gradle +++ b/x-pack/plugin/autoscaling/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.internal-cluster-test' diff --git a/x-pack/plugin/autoscaling/qa/rest/build.gradle b/x-pack/plugin/autoscaling/qa/rest/build.gradle index e68e108dc24f..e95ad8846905 100644 --- a/x-pack/plugin/autoscaling/qa/rest/build.gradle +++ b/x-pack/plugin/autoscaling/qa/rest/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' diff --git a/x-pack/plugin/build.gradle b/x-pack/plugin/build.gradle index 92f79dac3380..7be785068f5d 100644 --- a/x-pack/plugin/build.gradle +++ b/x-pack/plugin/build.gradle @@ -1,6 +1,6 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.util.GradleUtils -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' diff --git a/x-pack/plugin/ccr/qa/build.gradle b/x-pack/plugin/ccr/qa/build.gradle index dbb83e1b61f4..741fa7c208aa 100644 --- a/x-pack/plugin/ccr/qa/build.gradle +++ b/x-pack/plugin/ccr/qa/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.build' tasks.named("test").configure { enabled = false } diff --git a/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle b/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle index 355df38be0a3..3072e29069f3 100644 --- a/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle +++ b/x-pack/plugin/ccr/qa/downgrade-to-basic-license/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle index 0a13e84eeed0..9fabf5cc9488 100644 --- a/x-pack/plugin/ccr/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/ccr/qa/multi-cluster/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle b/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle index a20fab7d86d6..eee3c91d1922 100644 --- a/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle +++ b/x-pack/plugin/ccr/qa/non-compliant-license/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/plugin/ccr/qa/restart/build.gradle b/x-pack/plugin/ccr/qa/restart/build.gradle index f143a4fade14..3fa08b8d40bc 100644 --- a/x-pack/plugin/ccr/qa/restart/build.gradle +++ b/x-pack/plugin/ccr/qa/restart/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/x-pack/plugin/ccr/qa/security/build.gradle b/x-pack/plugin/ccr/qa/security/build.gradle index 411799ac72a2..3d7da8652939 100644 --- a/x-pack/plugin/ccr/qa/security/build.gradle +++ b/x-pack/plugin/ccr/qa/security/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/plugin/core/build.gradle b/x-pack/plugin/core/build.gradle index 8420f067f9ac..fe0bac508e39 100644 --- a/x-pack/plugin/core/build.gradle +++ b/x-pack/plugin/core/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams import java.nio.file.Paths diff --git a/x-pack/plugin/data-streams/qa/multi-node/build.gradle b/x-pack/plugin/data-streams/qa/multi-node/build.gradle index c83e2d623b05..5536044f0f7a 100644 --- a/x-pack/plugin/data-streams/qa/multi-node/build.gradle +++ b/x-pack/plugin/data-streams/qa/multi-node/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/data-streams/qa/rest/build.gradle b/x-pack/plugin/data-streams/qa/rest/build.gradle index 4dca8dca6b4f..9ef638db9e3e 100644 --- a/x-pack/plugin/data-streams/qa/rest/build.gradle +++ b/x-pack/plugin/data-streams/qa/rest/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' apply plugin: 'elasticsearch.yaml-rest-test' diff --git a/x-pack/plugin/deprecation/qa/rest/build.gradle b/x-pack/plugin/deprecation/qa/rest/build.gradle index 8b72e2666aa4..b2145ef775e5 100644 --- a/x-pack/plugin/deprecation/qa/rest/build.gradle +++ b/x-pack/plugin/deprecation/qa/rest/build.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.util.GradleUtils -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/enrich/qa/build.gradle b/x-pack/plugin/enrich/qa/build.gradle index c4a938d61ebe..e6dedf1cdcdb 100644 --- a/x-pack/plugin/enrich/qa/build.gradle +++ b/x-pack/plugin/enrich/qa/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.build' tasks.named("test").configure { enabled = false } diff --git a/x-pack/plugin/enrich/qa/rest-with-advanced-security/build.gradle b/x-pack/plugin/enrich/qa/rest-with-advanced-security/build.gradle index b739133a4e18..d46f3303e988 100644 --- a/x-pack/plugin/enrich/qa/rest-with-advanced-security/build.gradle +++ b/x-pack/plugin/enrich/qa/rest-with-advanced-security/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'elasticsearch.java-rest-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams dependencies { javaRestTestImplementation project(path: xpackModule('core')) diff --git a/x-pack/plugin/enrich/qa/rest-with-security/build.gradle b/x-pack/plugin/enrich/qa/rest-with-security/build.gradle index 47e98b6550c0..c836314945ce 100644 --- a/x-pack/plugin/enrich/qa/rest-with-security/build.gradle +++ b/x-pack/plugin/enrich/qa/rest-with-security/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'elasticsearch.java-rest-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams dependencies { javaRestTestImplementation project(path: xpackModule('core')) diff --git a/x-pack/plugin/enrich/qa/rest/build.gradle b/x-pack/plugin/enrich/qa/rest/build.gradle index 0aaca0c6cc75..ca3e1409a914 100644 --- a/x-pack/plugin/enrich/qa/rest/build.gradle +++ b/x-pack/plugin/enrich/qa/rest/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.java-rest-test' apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams restResources { restApi { diff --git a/x-pack/plugin/eql/build.gradle b/x-pack/plugin/eql/build.gradle index 803444b2e53d..85bde933306f 100644 --- a/x-pack/plugin/eql/build.gradle +++ b/x-pack/plugin/eql/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.internal-cluster-test' esplugin { diff --git a/x-pack/plugin/eql/qa/build.gradle b/x-pack/plugin/eql/qa/build.gradle index c4a938d61ebe..e6dedf1cdcdb 100644 --- a/x-pack/plugin/eql/qa/build.gradle +++ b/x-pack/plugin/eql/qa/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.build' tasks.named("test").configure { enabled = false } diff --git a/x-pack/plugin/eql/qa/correctness/build.gradle b/x-pack/plugin/eql/qa/correctness/build.gradle index 2f7fbc93d370..d0f175155d6d 100644 --- a/x-pack/plugin/eql/qa/correctness/build.gradle +++ b/x-pack/plugin/eql/qa/correctness/build.gradle @@ -4,7 +4,7 @@ apply plugin: 'elasticsearch.testclusters' tasks.named("test").configure { enabled = false } import org.elasticsearch.gradle.testclusters.RunTask -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams dependencies { javaRestTestImplementation project(':test:framework') diff --git a/x-pack/plugin/eql/qa/mixed-node/build.gradle b/x-pack/plugin/eql/qa/mixed-node/build.gradle index e02130fe89f5..cce1b378395e 100644 --- a/x-pack/plugin/eql/qa/mixed-node/build.gradle +++ b/x-pack/plugin/eql/qa/mixed-node/build.gradle @@ -4,8 +4,8 @@ apply from : "$rootDir/gradle/bwc-test.gradle" apply plugin: 'elasticsearch.rest-test' 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.testclusters.StandaloneRestIntegTestTask dependencies { diff --git a/x-pack/plugin/eql/qa/rest/build.gradle b/x-pack/plugin/eql/qa/rest/build.gradle index 2cef8e06e372..f86a868e87e1 100644 --- a/x-pack/plugin/eql/qa/rest/build.gradle +++ b/x-pack/plugin/eql/qa/rest/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'elasticsearch.java-rest-test' apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams restResources { restApi { diff --git a/x-pack/plugin/eql/qa/security/build.gradle b/x-pack/plugin/eql/qa/security/build.gradle index 253665b340d5..226c12cf4ae5 100644 --- a/x-pack/plugin/eql/qa/security/build.gradle +++ b/x-pack/plugin/eql/qa/security/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'elasticsearch.java-rest-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams dependencies { javaRestTestImplementation project(path: xpackModule('eql:qa:common')) diff --git a/x-pack/plugin/fleet/qa/rest/build.gradle b/x-pack/plugin/fleet/qa/rest/build.gradle index 33faddc12611..b4d566a54bfd 100644 --- a/x-pack/plugin/fleet/qa/rest/build.gradle +++ b/x-pack/plugin/fleet/qa/rest/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.yaml-rest-test' diff --git a/x-pack/plugin/identity-provider/build.gradle b/x-pack/plugin/identity-provider/build.gradle index 2b4b5d604320..c0f6fb8ff0ef 100644 --- a/x-pack/plugin/identity-provider/build.gradle +++ b/x-pack/plugin/identity-provider/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.publish' apply plugin: 'elasticsearch.internal-cluster-test' diff --git a/x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle b/x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle index 4c9ed4a01dc1..a06851805420 100644 --- a/x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle +++ b/x-pack/plugin/identity-provider/qa/idp-rest-tests/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' dependencies { diff --git a/x-pack/plugin/ilm/qa/multi-cluster/build.gradle b/x-pack/plugin/ilm/qa/multi-cluster/build.gradle index a3d576e43090..f7096984ef1e 100644 --- a/x-pack/plugin/ilm/qa/multi-cluster/build.gradle +++ b/x-pack/plugin/ilm/qa/multi-cluster/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/plugin/ilm/qa/multi-node/build.gradle b/x-pack/plugin/ilm/qa/multi-node/build.gradle index 395231c245d7..d666fc10fb0a 100644 --- a/x-pack/plugin/ilm/qa/multi-node/build.gradle +++ b/x-pack/plugin/ilm/qa/multi-node/build.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.util.GradleUtils -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/ml/qa/basic-multi-node/build.gradle b/x-pack/plugin/ml/qa/basic-multi-node/build.gradle index d690f1e408f2..9d6cd9568f6d 100644 --- a/x-pack/plugin/ml/qa/basic-multi-node/build.gradle +++ b/x-pack/plugin/ml/qa/basic-multi-node/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/ml/qa/disabled/build.gradle b/x-pack/plugin/ml/qa/disabled/build.gradle index f9b697fb0d0a..0b6fd5afed82 100644 --- a/x-pack/plugin/ml/qa/disabled/build.gradle +++ b/x-pack/plugin/ml/qa/disabled/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle b/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle index 9971fe8a31d6..4a2fd3176eb6 100644 --- a/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle +++ b/x-pack/plugin/ml/qa/native-multi-node-tests/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' dependencies { diff --git a/x-pack/plugin/ml/qa/single-node-tests/build.gradle b/x-pack/plugin/ml/qa/single-node-tests/build.gradle index a3b7646a0851..2f8f3ac3703a 100644 --- a/x-pack/plugin/ml/qa/single-node-tests/build.gradle +++ b/x-pack/plugin/ml/qa/single-node-tests/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/repositories-metering-api/qa/azure/build.gradle b/x-pack/plugin/repositories-metering-api/qa/azure/build.gradle index 9fb21a521a6f..7f2d5947d0f3 100644 --- a/x-pack/plugin/repositories-metering-api/qa/azure/build.gradle +++ b/x-pack/plugin/repositories-metering-api/qa/azure/build.gradle @@ -5,7 +5,7 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/plugin/repositories-metering-api/qa/gcs/build.gradle b/x-pack/plugin/repositories-metering-api/qa/gcs/build.gradle index 4341df5cc8d1..0d4b193e4e03 100644 --- a/x-pack/plugin/repositories-metering-api/qa/gcs/build.gradle +++ b/x-pack/plugin/repositories-metering-api/qa/gcs/build.gradle @@ -5,8 +5,8 @@ * in compliance with, at your election, the Elastic License 2.0 or the Server * Side Public License, v 1. */ -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.MavenFilteringHack import java.nio.file.Files import java.security.KeyPair diff --git a/x-pack/plugin/repositories-metering-api/qa/s3/build.gradle b/x-pack/plugin/repositories-metering-api/qa/s3/build.gradle index 7e4fdf19e80b..ed0e0af0d849 100644 --- a/x-pack/plugin/repositories-metering-api/qa/s3/build.gradle +++ b/x-pack/plugin/repositories-metering-api/qa/s3/build.gradle @@ -1,5 +1,5 @@ import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-test' diff --git a/x-pack/plugin/rollup/build.gradle b/x-pack/plugin/rollup/build.gradle index 5902f8e7c6f3..6cd764827758 100644 --- a/x-pack/plugin/rollup/build.gradle +++ b/x-pack/plugin/rollup/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.esplugin' esplugin { diff --git a/x-pack/plugin/rollup/qa/rest/build.gradle b/x-pack/plugin/rollup/qa/rest/build.gradle index 29a02e1f8323..6cc3a3904551 100644 --- a/x-pack/plugin/rollup/qa/rest/build.gradle +++ b/x-pack/plugin/rollup/qa/rest/build.gradle @@ -4,7 +4,7 @@ * 2.0; you may not use this file except in compliance with the Elastic License * 2.0. */ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.yaml-rest-compat-test' diff --git a/x-pack/plugin/searchable-snapshots/qa/azure/build.gradle b/x-pack/plugin/searchable-snapshots/qa/azure/build.gradle index 983bc4a5f66d..3046567c4c13 100644 --- a/x-pack/plugin/searchable-snapshots/qa/azure/build.gradle +++ b/x-pack/plugin/searchable-snapshots/qa/azure/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle b/x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle index 4fd000131768..7ec8cdc67bb1 100644 --- a/x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle +++ b/x-pack/plugin/searchable-snapshots/qa/gcs/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.MavenFilteringHack import java.nio.file.Files import java.security.KeyPair diff --git a/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle b/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle index 282dc905f1a6..5918f11e5fd4 100644 --- a/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle +++ b/x-pack/plugin/searchable-snapshots/qa/hdfs/build.gradle @@ -6,9 +6,9 @@ */ import org.apache.tools.ant.taskdefs.condition.Os -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask -import org.elasticsearch.gradle.util.ports.ReservedPortRange +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.util.ports.ReservedPortRange import java.nio.file.Files import java.nio.file.Paths @@ -66,7 +66,7 @@ String krb5conf = krbFixtureProject.ext.krb5Conf("hdfs") // Create HDFS File System Testing Fixtures for (String fixtureName : ['hdfsFixture', 'secureHdfsFixture']) { - project.tasks.register(fixtureName, org.elasticsearch.gradle.test.AntFixture) { + project.tasks.register(fixtureName, org.elasticsearch.gradle.internal.test.AntFixture) { dependsOn project.configurations.hdfsFixture, krbFixtureProject.tasks.postProcessFixture executable = "${BuildParams.runtimeJavaHome}/bin/java" env 'CLASSPATH', "${-> project.configurations.hdfsFixture.asPath}" diff --git a/x-pack/plugin/searchable-snapshots/qa/s3/build.gradle b/x-pack/plugin/searchable-snapshots/qa/s3/build.gradle index 5cdd86299ff9..723e4a53c82e 100644 --- a/x-pack/plugin/searchable-snapshots/qa/s3/build.gradle +++ b/x-pack/plugin/searchable-snapshots/qa/s3/build.gradle @@ -1,5 +1,5 @@ import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-test' diff --git a/x-pack/plugin/security/cli/build.gradle b/x-pack/plugin/security/cli/build.gradle index 08cfc0c8474a..738dcaf338de 100644 --- a/x-pack/plugin/security/cli/build.gradle +++ b/x-pack/plugin/security/cli/build.gradle @@ -1,5 +1,5 @@ import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.build' diff --git a/x-pack/plugin/security/qa/basic-enable-security/build.gradle b/x-pack/plugin/security/qa/basic-enable-security/build.gradle index 99afa12a831a..4aae54c3a21e 100644 --- a/x-pack/plugin/security/qa/basic-enable-security/build.gradle +++ b/x-pack/plugin/security/qa/basic-enable-security/build.gradle @@ -1,6 +1,6 @@ import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask -import org.elasticsearch.gradle.test.rest.JavaRestTestPlugin -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.test.rest.JavaRestTestPlugin +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/security/qa/security-basic/build.gradle b/x-pack/plugin/security/qa/security-basic/build.gradle index f9ed4ef39b2a..a2114e7d6c0b 100644 --- a/x-pack/plugin/security/qa/security-basic/build.gradle +++ b/x-pack/plugin/security/qa/security-basic/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'elasticsearch.java-rest-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams dependencies { javaRestTestImplementation(testArtifact(project(xpackModule('security')))) diff --git a/x-pack/plugin/security/qa/security-disabled/build.gradle b/x-pack/plugin/security/qa/security-disabled/build.gradle index 94a2777b6599..03e24ced1225 100644 --- a/x-pack/plugin/security/qa/security-disabled/build.gradle +++ b/x-pack/plugin/security/qa/security-disabled/build.gradle @@ -5,7 +5,7 @@ * For example: If a cluster has a pipeline with the set_security_user processor * defined, it should be not fail */ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/plugin/security/qa/tls-basic/build.gradle b/x-pack/plugin/security/qa/tls-basic/build.gradle index 4e65c0e4472c..efcf6835fd5e 100644 --- a/x-pack/plugin/security/qa/tls-basic/build.gradle +++ b/x-pack/plugin/security/qa/tls-basic/build.gradle @@ -1,6 +1,6 @@ apply plugin: 'elasticsearch.java-rest-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams dependencies { testImplementation(testArtifact(project(xpackModule('security')))) diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/azure/build.gradle b/x-pack/plugin/snapshot-repo-test-kit/qa/azure/build.gradle index a568112ea190..f07607f6736f 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/azure/build.gradle +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/azure/build.gradle @@ -5,7 +5,7 @@ * 2.0. */ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/gcs/build.gradle b/x-pack/plugin/snapshot-repo-test-kit/qa/gcs/build.gradle index dd5dcdab36e4..b7d5438c6979 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/gcs/build.gradle +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/gcs/build.gradle @@ -5,8 +5,8 @@ * 2.0. */ -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.MavenFilteringHack import java.nio.file.Files import java.security.KeyPair diff --git a/x-pack/plugin/snapshot-repo-test-kit/qa/s3/build.gradle b/x-pack/plugin/snapshot-repo-test-kit/qa/s3/build.gradle index 0d18dbd98e30..01e6f984cc9f 100644 --- a/x-pack/plugin/snapshot-repo-test-kit/qa/s3/build.gradle +++ b/x-pack/plugin/snapshot-repo-test-kit/qa/s3/build.gradle @@ -5,7 +5,7 @@ * 2.0. */ import static org.elasticsearch.gradle.PropertyNormalization.IGNORE_VALUE -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.standalone-rest-test' apply plugin: 'elasticsearch.rest-test' diff --git a/x-pack/plugin/sql/build.gradle b/x-pack/plugin/sql/build.gradle index b2f2de8c484a..3da4a0cc0e35 100644 --- a/x-pack/plugin/sql/build.gradle +++ b/x-pack/plugin/sql/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'elasticsearch.esplugin' apply plugin: 'elasticsearch.internal-cluster-test' -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams esplugin { name 'x-pack-sql' diff --git a/x-pack/plugin/sql/qa/jdbc/build.gradle b/x-pack/plugin/sql/qa/jdbc/build.gradle index 191fd3e07dbf..cf0c212eb778 100644 --- a/x-pack/plugin/sql/qa/jdbc/build.gradle +++ b/x-pack/plugin/sql/qa/jdbc/build.gradle @@ -1,8 +1,8 @@ -import org.elasticsearch.gradle.BwcVersions.UnreleasedVersionInfo +import org.elasticsearch.gradle.internal.BwcVersions.UnreleasedVersionInfo import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.VersionProperties -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.VersionProperties +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask description = 'Integration tests for SQL JDBC driver' apply plugin: 'elasticsearch.java' diff --git a/x-pack/plugin/sql/qa/jdbc/security/build.gradle b/x-pack/plugin/sql/qa/jdbc/security/build.gradle index 67baeb48e318..950b5b225064 100644 --- a/x-pack/plugin/sql/qa/jdbc/security/build.gradle +++ b/x-pack/plugin/sql/qa/jdbc/security/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask dependencies { testImplementation project(':x-pack:plugin:core') diff --git a/x-pack/plugin/sql/qa/jdbc/security/with-ssl/build.gradle b/x-pack/plugin/sql/qa/jdbc/security/with-ssl/build.gradle index 8409e4f84df5..89c5d93ac3ee 100644 --- a/x-pack/plugin/sql/qa/jdbc/security/with-ssl/build.gradle +++ b/x-pack/plugin/sql/qa/jdbc/security/with-ssl/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.test-with-ssl' diff --git a/x-pack/plugin/sql/qa/jdbc/security/without-ssl/build.gradle b/x-pack/plugin/sql/qa/jdbc/security/without-ssl/build.gradle index bd666bab10f0..a33b27be3a16 100644 --- a/x-pack/plugin/sql/qa/jdbc/security/without-ssl/build.gradle +++ b/x-pack/plugin/sql/qa/jdbc/security/without-ssl/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask tasks.withType(RestIntegTestTask).configureEach { systemProperty 'tests.ssl.enabled', 'false' diff --git a/x-pack/plugin/sql/qa/mixed-node/build.gradle b/x-pack/plugin/sql/qa/mixed-node/build.gradle index 5314e78663e0..24ecfa74dd94 100644 --- a/x-pack/plugin/sql/qa/mixed-node/build.gradle +++ b/x-pack/plugin/sql/qa/mixed-node/build.gradle @@ -4,8 +4,8 @@ apply from : "$rootDir/gradle/bwc-test.gradle" apply plugin: 'elasticsearch.rest-test' 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.testclusters.StandaloneRestIntegTestTask dependencies { diff --git a/x-pack/plugin/sql/qa/server/security/with-ssl/build.gradle b/x-pack/plugin/sql/qa/server/security/with-ssl/build.gradle index 3ee0801b09f4..b2b4aaa65e62 100644 --- a/x-pack/plugin/sql/qa/server/security/with-ssl/build.gradle +++ b/x-pack/plugin/sql/qa/server/security/with-ssl/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.test-with-ssl' diff --git a/x-pack/plugin/sql/sql-cli/build.gradle b/x-pack/plugin/sql/sql-cli/build.gradle index a30a38b2e6dc..f04c54baedb8 100644 --- a/x-pack/plugin/sql/sql-cli/build.gradle +++ b/x-pack/plugin/sql/sql-cli/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams /* * This project is named sql-cli because it is in the "org.elasticsearch.plugin" diff --git a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle index e14786a68afc..89515069d054 100644 --- a/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle +++ b/x-pack/plugin/transform/qa/multi-cluster-tests-with-security/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/plugin/watcher/qa/rest/build.gradle b/x-pack/plugin/watcher/qa/rest/build.gradle index 5e89752e9e22..a6a685b860dc 100644 --- a/x-pack/plugin/watcher/qa/rest/build.gradle +++ b/x-pack/plugin/watcher/qa/rest/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' apply plugin: 'elasticsearch.yaml-rest-test' diff --git a/x-pack/plugin/watcher/qa/with-monitoring/build.gradle b/x-pack/plugin/watcher/qa/with-monitoring/build.gradle index 39705cc684ed..369b0bd15c11 100644 --- a/x-pack/plugin/watcher/qa/with-monitoring/build.gradle +++ b/x-pack/plugin/watcher/qa/with-monitoring/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.java-rest-test' diff --git a/x-pack/qa/full-cluster-restart/build.gradle b/x-pack/qa/full-cluster-restart/build.gradle index 4b482212e473..1de100d0f38c 100644 --- a/x-pack/qa/full-cluster-restart/build.gradle +++ b/x-pack/qa/full-cluster-restart/build.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/x-pack/qa/mixed-tier-cluster/build.gradle b/x-pack/qa/mixed-tier-cluster/build.gradle index 552a5693e181..1c01d1e01831 100644 --- a/x-pack/qa/mixed-tier-cluster/build.gradle +++ b/x-pack/qa/mixed-tier-cluster/build.gradle @@ -4,8 +4,8 @@ apply from : "$rootDir/gradle/bwc-test.gradle" apply plugin: 'elasticsearch.rest-test' 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.testclusters.StandaloneRestIntegTestTask dependencies { diff --git a/x-pack/qa/multi-cluster-search-security/build.gradle b/x-pack/qa/multi-cluster-search-security/build.gradle index 8a80e273f26f..498daacfaa21 100644 --- a/x-pack/qa/multi-cluster-search-security/build.gradle +++ b/x-pack/qa/multi-cluster-search-security/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.info.BuildParams -import org.elasticsearch.gradle.test.RestIntegTestTask +import org.elasticsearch.gradle.internal.info.BuildParams +import org.elasticsearch.gradle.internal.test.RestIntegTestTask apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-test' diff --git a/x-pack/qa/reindex-tests-with-security/build.gradle b/x-pack/qa/reindex-tests-with-security/build.gradle index f8d67c31e82d..977f95e64220 100644 --- a/x-pack/qa/reindex-tests-with-security/build.gradle +++ b/x-pack/qa/reindex-tests-with-security/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/qa/rolling-upgrade-basic/build.gradle b/x-pack/qa/rolling-upgrade-basic/build.gradle index f417fa38f654..5cf558bcba7a 100644 --- a/x-pack/qa/rolling-upgrade-basic/build.gradle +++ b/x-pack/qa/rolling-upgrade-basic/build.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle b/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle index 75eff8fce273..e452ba402b99 100644 --- a/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle +++ b/x-pack/qa/rolling-upgrade-multi-cluster/build.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index 158ff4ed699d..8a4be8683c0d 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -1,5 +1,5 @@ import org.elasticsearch.gradle.Version -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams import org.elasticsearch.gradle.testclusters.StandaloneRestIntegTestTask apply plugin: 'elasticsearch.testclusters' diff --git a/x-pack/qa/smoke-test-plugins-ssl/build.gradle b/x-pack/qa/smoke-test-plugins-ssl/build.gradle index f5b6fd8699fb..b2274f8f4721 100644 --- a/x-pack/qa/smoke-test-plugins-ssl/build.gradle +++ b/x-pack/qa/smoke-test-plugins-ssl/build.gradle @@ -1,7 +1,6 @@ -import org.elasticsearch.gradle.MavenFilteringHack +import org.elasticsearch.gradle.internal.MavenFilteringHack -import org.elasticsearch.gradle.http.WaitForHttpResource -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/qa/smoke-test-plugins/build.gradle b/x-pack/qa/smoke-test-plugins/build.gradle index c3f5b915aa23..60845deb9b03 100644 --- a/x-pack/qa/smoke-test-plugins/build.gradle +++ b/x-pack/qa/smoke-test-plugins/build.gradle @@ -1,5 +1,5 @@ -import org.elasticsearch.gradle.MavenFilteringHack -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.MavenFilteringHack +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/qa/third-party/jira/build.gradle b/x-pack/qa/third-party/jira/build.gradle index 24c6a513f22a..7c39714b00ef 100644 --- a/x-pack/qa/third-party/jira/build.gradle +++ b/x-pack/qa/third-party/jira/build.gradle @@ -3,7 +3,7 @@ import groovy.json.JsonSlurper import javax.net.ssl.HttpsURLConnection import java.nio.charset.StandardCharsets -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/qa/third-party/pagerduty/build.gradle b/x-pack/qa/third-party/pagerduty/build.gradle index aacd7f05f560..967a6dca6e80 100644 --- a/x-pack/qa/third-party/pagerduty/build.gradle +++ b/x-pack/qa/third-party/pagerduty/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/qa/third-party/slack/build.gradle b/x-pack/qa/third-party/slack/build.gradle index fbdb314da869..addc48925541 100644 --- a/x-pack/qa/third-party/slack/build.gradle +++ b/x-pack/qa/third-party/slack/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.info.BuildParams +import org.elasticsearch.gradle.internal.info.BuildParams apply plugin: 'elasticsearch.testclusters' apply plugin: 'elasticsearch.standalone-rest-test' diff --git a/x-pack/test/idp-fixture/build.gradle b/x-pack/test/idp-fixture/build.gradle index 9e5dd4ec58e9..cd435c1c55ca 100644 --- a/x-pack/test/idp-fixture/build.gradle +++ b/x-pack/test/idp-fixture/build.gradle @@ -1,4 +1,4 @@ -import org.elasticsearch.gradle.VersionProperties +import org.elasticsearch.gradle.internal.VersionProperties import org.elasticsearch.gradle.Architecture apply plugin: 'elasticsearch.test.fixtures'