diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java index ca6189e22e357..db8a632df9579 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java @@ -10,11 +10,12 @@ package org.elasticsearch.gradle.internal.transport; import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin; +import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin; +import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin; import org.elasticsearch.gradle.util.GradleUtils; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.tasks.SourceSet; -import org.gradle.language.base.plugins.LifecycleBasePlugin; import static org.elasticsearch.gradle.internal.transport.TransportVersionResourcesPlugin.TRANSPORT_REFERENCES_TOPIC; @@ -22,7 +23,7 @@ public class TransportVersionReferencesPlugin implements Plugin { @Override public void apply(Project project) { - project.getPluginManager().apply(LifecycleBasePlugin.class); + project.getPluginManager().apply(PrecommitTaskPlugin.class); project.getPlugins() .apply(ProjectSubscribeServicePlugin.class) @@ -50,6 +51,6 @@ public void apply(Project project) { t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file"); t.getReferencesFile().set(collectTask.get().getOutputFile()); }); - project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask)); + project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask)); } } diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java index bca2dbaca2f66..7b9755b47c883 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java @@ -12,12 +12,13 @@ import org.elasticsearch.gradle.Version; import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin; import org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin; +import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin; +import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin; import org.gradle.api.Plugin; import org.gradle.api.Project; import org.gradle.api.file.Directory; import org.gradle.api.plugins.JavaPlugin; import org.gradle.api.tasks.Copy; -import org.gradle.language.base.plugins.LifecycleBasePlugin; import java.util.Map; import java.util.Properties; @@ -28,7 +29,7 @@ public class TransportVersionResourcesPlugin implements Plugin { @Override public void apply(Project project) { - project.getPluginManager().apply(LifecycleBasePlugin.class); + project.getPluginManager().apply(PrecommitTaskPlugin.class); project.getPluginManager().apply(VersionPropertiesPlugin.class); var psService = project.getPlugins().apply(ProjectSubscribeServicePlugin.class).getService(); @@ -67,7 +68,7 @@ public void apply(Project project) { t.getShouldValidateDensity().convention(true); t.getShouldValidatePrimaryIdNotPatch().convention(true); }); - project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask)); + project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask)); var generateManifestTask = project.getTasks() .register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {