diff --git a/build-tools-internal/build.gradle b/build-tools-internal/build.gradle index 0b81ab90ceced..6f5dc5e0ca62c 100644 --- a/build-tools-internal/build.gradle +++ b/build-tools-internal/build.gradle @@ -220,13 +220,13 @@ gradlePlugin { id = 'elasticsearch.internal-yaml-rest-test' implementationClass = 'org.elasticsearch.gradle.internal.test.rest.InternalYamlRestTestPlugin' } - transportVersionManagementPlugin { - id = 'elasticsearch.transport-version-management' - implementationClass = 'org.elasticsearch.gradle.internal.transport.TransportVersionManagementPlugin' + transportVersionReferencesPlugin { + id = 'elasticsearch.transport-version-references' + implementationClass = 'org.elasticsearch.gradle.internal.transport.TransportVersionReferencesPlugin' } - globalTransportVersionManagementPlugin { - id = 'elasticsearch.global-transport-version-management' - implementationClass = 'org.elasticsearch.gradle.internal.transport.GlobalTransportVersionManagementPlugin' + transportVersionResourcesPlugin { + id = 'elasticsearch.transport-version-resources' + implementationClass = 'org.elasticsearch.gradle.internal.transport.TransportVersionResourcesPlugin' } } } diff --git a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPluginFuncTest.groovy b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPluginFuncTest.groovy index 0fcd2d0ae68c3..8eceff86f41fb 100644 --- a/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPluginFuncTest.groovy +++ b/build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPluginFuncTest.groovy @@ -92,8 +92,8 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest { file("myserver/build.gradle") << """ apply plugin: 'java-library' - apply plugin: 'elasticsearch.transport-version-management' - apply plugin: 'elasticsearch.global-transport-version-management' + apply plugin: 'elasticsearch.transport-version-references' + apply plugin: 'elasticsearch.transport-version-resources' """ definedTransportVersion("existing_91", "8012000") definedTransportVersion("existing_92", "8123000,8012001") @@ -112,7 +112,7 @@ class TransportVersionManagementPluginFuncTest extends AbstractGradleFuncTest { file("myplugin/build.gradle") << """ apply plugin: 'java-library' - apply plugin: 'elasticsearch.transport-version-management' + apply plugin: 'elasticsearch.transport-version-references' dependencies { implementation project(":myserver") diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java index f89eb3131bc7f..bcdd2431d1f01 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/BaseInternalPluginBuildPlugin.java @@ -15,7 +15,7 @@ import org.elasticsearch.gradle.internal.info.BuildParameterExtension; import org.elasticsearch.gradle.internal.precommit.JarHellPrecommitPlugin; import org.elasticsearch.gradle.internal.test.ClusterFeaturesMetadataPlugin; -import org.elasticsearch.gradle.internal.transport.TransportVersionManagementPlugin; +import org.elasticsearch.gradle.internal.transport.TransportVersionReferencesPlugin; import org.elasticsearch.gradle.plugin.PluginBuildPlugin; import org.elasticsearch.gradle.plugin.PluginPropertiesExtension; import org.elasticsearch.gradle.util.GradleUtils; @@ -37,7 +37,7 @@ public void apply(Project project) { project.getPluginManager().apply(JarHellPrecommitPlugin.class); project.getPluginManager().apply(ElasticsearchJavaPlugin.class); project.getPluginManager().apply(ClusterFeaturesMetadataPlugin.class); - project.getPluginManager().apply(TransportVersionManagementPlugin.class); + project.getPluginManager().apply(TransportVersionReferencesPlugin.class); boolean isCi = project.getRootProject().getExtensions().getByType(BuildParameterExtension.class).getCi(); // Clear default dependencies added by public PluginBuildPlugin as we add our // own project dependencies for internal builds diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java similarity index 97% rename from build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPlugin.java rename to build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java index 41c091dc886a4..60012feac5da3 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionManagementPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java @@ -20,7 +20,7 @@ import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinitionsDirectory; import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getResourcesDirectory; -public class TransportVersionManagementPlugin implements Plugin { +public class TransportVersionReferencesPlugin implements Plugin { @Override public void apply(Project project) { diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GlobalTransportVersionManagementPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java similarity index 93% rename from build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GlobalTransportVersionManagementPlugin.java rename to build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java index 9f14c95f3591d..d5591bf9a54de 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/GlobalTransportVersionManagementPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java @@ -23,7 +23,7 @@ import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getDefinitionsDirectory; import static org.elasticsearch.gradle.internal.transport.TransportVersionUtils.getResourcesDirectory; -public class GlobalTransportVersionManagementPlugin implements Plugin { +public class TransportVersionResourcesPlugin implements Plugin { @Override public void apply(Project project) { @@ -37,13 +37,13 @@ public void apply(Project project) { // iterate through all projects, and if the management plugin is applied, add that project back as a dep to check for (Project subProject : project.getRootProject().getSubprojects()) { - subProject.getPlugins().withType(TransportVersionManagementPlugin.class).configureEach(plugin -> { + subProject.getPlugins().withType(TransportVersionReferencesPlugin.class).configureEach(plugin -> { tvReferencesConfig.getDependencies().add(depsHandler.project(Map.of("path", subProject.getPath()))); }); } var validateTask = project.getTasks() - .register("validateTransportVersionDefinitions", ValidateTransportVersionDefinitionsTask.class, t -> { + .register("validateTransportVersionDefinitions", ValidateTransportVersionResourcesTask.class, t -> { t.setGroup("Transport Versions"); t.setDescription("Validates that all defined TransportVersion constants are used in at least one project"); Directory resourcesDir = getResourcesDirectory(project); diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionDefinitionsTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java similarity index 98% rename from build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionDefinitionsTask.java rename to build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java index 794c4645d6184..2791aca9e323f 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionDefinitionsTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/ValidateTransportVersionResourcesTask.java @@ -53,7 +53,7 @@ * Validates that each defined transport version constant is referenced by at least one project. */ @CacheableTask -public abstract class ValidateTransportVersionDefinitionsTask extends DefaultTask { +public abstract class ValidateTransportVersionResourcesTask extends DefaultTask { @InputDirectory @Optional @@ -85,7 +85,7 @@ private record IdAndDefinition(TransportVersionId id, TransportVersionDefinition Map latestByBranch = new HashMap<>(); @Inject - public ValidateTransportVersionDefinitionsTask(ExecOperations execOperations) { + public ValidateTransportVersionResourcesTask(ExecOperations execOperations) { this.execOperations = execOperations; this.rootPath = getProject().getRootProject().getLayout().getProjectDirectory().getAsFile().toPath(); } diff --git a/server/build.gradle b/server/build.gradle index 59615e5f42ac5..20557aefba731 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -12,8 +12,8 @@ apply plugin: 'elasticsearch.publish' apply plugin: 'elasticsearch.internal-cluster-test' apply plugin: 'elasticsearch.internal-test-artifact' apply plugin: 'elasticsearch.test-build-info' -apply plugin: 'elasticsearch.transport-version-management' -apply plugin: 'elasticsearch.global-transport-version-management' +apply plugin: 'elasticsearch.transport-version-references' +apply plugin: 'elasticsearch.transport-version-resources' publishing { publications { diff --git a/x-pack/plugin/esql/compute/build.gradle b/x-pack/plugin/esql/compute/build.gradle index 1405ac0999d76..2d30ad7debb19 100644 --- a/x-pack/plugin/esql/compute/build.gradle +++ b/x-pack/plugin/esql/compute/build.gradle @@ -3,7 +3,7 @@ import org.elasticsearch.gradle.internal.util.SourceDirectoryCommandLineArgument apply plugin: 'elasticsearch.build' apply plugin: 'elasticsearch.string-templates' apply plugin: 'elasticsearch.publish' -apply plugin: 'elasticsearch.transport-version-management' +apply plugin: 'elasticsearch.transport-version-references' base { archivesName = 'x-pack-esql-compute'