Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions build-tools-internal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Project> {
public class TransportVersionReferencesPlugin implements Plugin<Project> {

@Override
public void apply(Project project) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<Project> {
public class TransportVersionResourcesPlugin implements Plugin<Project> {

@Override
public void apply(Project project) {
Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -85,7 +85,7 @@ private record IdAndDefinition(TransportVersionId id, TransportVersionDefinition
Map<String, TransportVersionLatest> latestByBranch = new HashMap<>();

@Inject
public ValidateTransportVersionDefinitionsTask(ExecOperations execOperations) {
public ValidateTransportVersionResourcesTask(ExecOperations execOperations) {
this.execOperations = execOperations;
this.rootPath = getProject().getRootProject().getLayout().getProjectDirectory().getAsFile().toPath();
}
Expand Down
4 changes: 2 additions & 2 deletions server/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugin/esql/compute/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down