Skip to content

Commit 5b57c1b

Browse files
committed
Run transport version validation tasks on precommit (elastic#134482)
(cherry picked from commit 36181aa) # Conflicts: # build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java
1 parent 7ab4874 commit 5b57c1b

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionReferencesPlugin.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
package org.elasticsearch.gradle.internal.transport;
1111

1212
import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin;
13+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
14+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin;
1315
import org.elasticsearch.gradle.util.GradleUtils;
1416
import org.gradle.api.Plugin;
1517
import org.gradle.api.Project;
@@ -23,6 +25,7 @@ public class TransportVersionReferencesPlugin implements Plugin<Project> {
2325
@Override
2426
public void apply(Project project) {
2527
project.getPluginManager().apply(LifecycleBasePlugin.class);
28+
project.getPluginManager().apply(PrecommitTaskPlugin.class);
2629

2730
project.getPlugins()
2831
.apply(ProjectSubscribeServicePlugin.class)
@@ -50,6 +53,6 @@ public void apply(Project project) {
5053
t.setDescription("Validates that all TransportVersion references used in the project have an associated definition file");
5154
t.getReferencesFile().set(collectTask.get().getOutputFile());
5255
});
53-
project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
56+
project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask));
5457
}
5558
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionResourcesPlugin.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@
99

1010
package org.elasticsearch.gradle.internal.transport;
1111

12+
import org.elasticsearch.gradle.Version;
1213
import org.elasticsearch.gradle.internal.ProjectSubscribeServicePlugin;
14+
import org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin;
15+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitPlugin;
16+
import org.elasticsearch.gradle.internal.conventions.precommit.PrecommitTaskPlugin;
1317
import org.gradle.api.Plugin;
1418
import org.gradle.api.Project;
1519
import org.gradle.api.file.Directory;
@@ -18,6 +22,7 @@
1822
import org.gradle.language.base.plugins.LifecycleBasePlugin;
1923

2024
import java.util.Map;
25+
import java.util.Properties;
2126

2227
public class TransportVersionResourcesPlugin implements Plugin<Project> {
2328

@@ -26,6 +31,7 @@ public class TransportVersionResourcesPlugin implements Plugin<Project> {
2631
@Override
2732
public void apply(Project project) {
2833
project.getPluginManager().apply(LifecycleBasePlugin.class);
34+
project.getPluginManager().apply(PrecommitTaskPlugin.class);
2935
var psService = project.getPlugins().apply(ProjectSubscribeServicePlugin.class).getService();
3036
var resourceRoot = getResourceRoot(project);
3137

@@ -55,7 +61,7 @@ public void apply(Project project) {
5561
t.setDescription("Validates that all transport version resources are internally consistent with each other");
5662
t.getReferencesFiles().setFrom(tvReferencesConfig);
5763
});
58-
project.getTasks().named(LifecycleBasePlugin.CHECK_TASK_NAME).configure(t -> t.dependsOn(validateTask));
64+
project.getTasks().named(PrecommitPlugin.PRECOMMIT_TASK_NAME).configure(t -> t.dependsOn(validateTask));
5965

6066
var generateManifestTask = project.getTasks()
6167
.register("generateTransportVersionManifest", GenerateTransportVersionManifestTask.class, t -> {

0 commit comments

Comments
 (0)