瀏覽代碼

Simplify applying build tools conventions (#73877)

Share common conventions for build tools in one plugin.
e.g. we always apply the license headers check for build tools too
Rene Groeschke 4 年之前
父節點
當前提交
7df3771a2c

+ 3 - 3
build-conventions/build.gradle

@@ -41,9 +41,9 @@ gradlePlugin {
             id = 'elasticsearch.licensing'
             implementationClass = 'org.elasticsearch.gradle.internal.conventions.LicensingPlugin'
         }
-        basics {
-            id = 'elasticsearch.basic-build-tool-conventions'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.BasicBuildToolConventionsPlugin'
+        buildTools {
+            id = 'elasticsearch.build-tools'
+            implementationClass = 'org.elasticsearch.gradle.internal.conventions.BuildToolsConventionsPlugin'
         }
     }
 }

+ 3 - 1
build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/BasicBuildToolConventionsPlugin.java → build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/BuildToolsConventionsPlugin.java

@@ -10,6 +10,7 @@ package org.elasticsearch.gradle.internal.conventions;
 
 import org.elasticsearch.gradle.internal.conventions.info.ParallelDetector;
 import org.elasticsearch.gradle.internal.conventions.util.Util;
+import org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersPrecommitPlugin;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.tasks.bundling.Jar;
@@ -17,10 +18,11 @@ import org.gradle.api.tasks.testing.Test;
 
 import java.io.File;
 
-public class BasicBuildToolConventionsPlugin implements Plugin<Project> {
+public class BuildToolsConventionsPlugin implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
+        project.getPlugins().apply(LicenseHeadersPrecommitPlugin.class);
         int defaultParallel = ParallelDetector.findDefaultParallel(project);
         project.getTasks().withType(Test.class).configureEach(test -> {
             test.onlyIf((t) -> Util.getBooleanProperty("tests.fips.enabled", false) == false);

+ 1 - 2
build-tools-internal/build.gradle

@@ -17,8 +17,7 @@ plugins {
   id 'java-gradle-plugin'
   id 'groovy-gradle-plugin'
   id 'groovy'
-  id 'elasticsearch.internal-licenseheaders'
-  id 'elasticsearch.basic-build-tool-conventions'
+  id 'elasticsearch.build-tools'
   id 'elasticsearch.eclipse'
 }
 

+ 1 - 2
build-tools/build.gradle

@@ -12,8 +12,7 @@ plugins {
     id 'groovy'
     id 'java-test-fixtures'
     id 'elasticsearch.publish'
-    id 'elasticsearch.internal-licenseheaders'
-    id 'elasticsearch.basic-build-tool-conventions'
+    id 'elasticsearch.build-tools'
 }
 
 description = "The elasticsearch build tools"