Merge branch 'main' into apm-logs-event-dataset

Author: carsonip

build-conventions/build.gradle

@@ -17,88 +17,89 @@ buildscript {
 }
 
 plugins {
-    id 'java-gradle-plugin'
-    id 'java-test-fixtures'
-    id 'eclipse'
+  id 'java-gradle-plugin'
+  id 'java-test-fixtures'
+  id 'eclipse'
 }
 
 group = "org.elasticsearch"
 
 // This project contains Checkstyle rule implementations used by IDEs which use a Java 11 runtime
 java {
-  targetCompatibility = 11
-  sourceCompatibility = 11
+  targetCompatibility = 17
+  sourceCompatibility = 17
 }
 
 gradlePlugin {
-    // We already configure publication and we don't need or want the one that comes
-    // with the java-gradle-plugin
-    automatedPublishing = false
-    plugins {
-        internalLicenseheaders {
-            id = 'elasticsearch.internal-licenseheaders'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersPrecommitPlugin'
-        }
-        eclipse {
-            id = 'elasticsearch.eclipse'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.EclipseConventionPlugin'
-        }
-        publish {
-            id = 'elasticsearch.publish'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.PublishPlugin'
-        }
-        licensing {
-            id = 'elasticsearch.licensing'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.LicensingPlugin'
-        }
-        buildTools {
-            id = 'elasticsearch.build-tools'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.BuildToolsConventionsPlugin'
-        }
-        versions {
-            id = 'elasticsearch.versions'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin'
-        }
-        formatting {
-            id = 'elasticsearch.formatting'
-            implementationClass = 'org.elasticsearch.gradle.internal.conventions.precommit.FormattingPrecommitPlugin'
-        }
+  // We already configure publication and we don't need or want the one that comes
+  // with the java-gradle-plugin
+  automatedPublishing = false
+  plugins {
+    internalLicenseheaders {
+      id = 'elasticsearch.internal-licenseheaders'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.precommit.LicenseHeadersPrecommitPlugin'
     }
+    eclipse {
+      id = 'elasticsearch.eclipse'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.EclipseConventionPlugin'
+    }
+    publish {
+      id = 'elasticsearch.publish'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.PublishPlugin'
+    }
+    licensing {
+      id = 'elasticsearch.licensing'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.LicensingPlugin'
+    }
+    buildTools {
+      id = 'elasticsearch.build-tools'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.BuildToolsConventionsPlugin'
+    }
+    versions {
+      id = 'elasticsearch.versions'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.VersionPropertiesPlugin'
+    }
+    formatting {
+      id = 'elasticsearch.formatting'
+      implementationClass = 'org.elasticsearch.gradle.internal.conventions.precommit.FormattingPrecommitPlugin'
+    }
+  }
 }
 
 repositories {
-    mavenCentral()
-    gradlePluginPortal()
+  mavenCentral()
+  gradlePluginPortal()
 }
 
 dependencies {
-    api buildLibs.maven.model
-    api buildLibs.shadow.plugin
-    api buildLibs.apache.rat
-    compileOnly buildLibs.checkstyle
-    constraints {
-      api("org.eclipse.platform:org.eclipse.osgi:3.18.300") {
-        because("Use the same version as we do in spotless gradle plugin at runtime")
-      }
-    }
-    api(buildLibs.spotless.plugin) {
-      exclude module: "groovy-xml"
+  api buildLibs.maven.model
+  api buildLibs.shadow.plugin
+  api buildLibs.apache.rat
+  api buildLibs.nmcp
+  compileOnly buildLibs.checkstyle
+  constraints {
+    api("org.eclipse.platform:org.eclipse.osgi:3.18.300") {
+      because("Use the same version as we do in spotless gradle plugin at runtime")
     }
+  }
+  api(buildLibs.spotless.plugin) {
+    exclude module: "groovy-xml"
+  }
 }
 
 project.getPlugins().withType(JavaBasePlugin.class) {
-    java.getModularity().getInferModulePath().set(false);
-    eclipse.getClasspath().getFile().whenMerged { classpath ->
-        /*
-         * give each source folder a unique corresponding output folder
-         * outside of the usual `build` folder. We can't put the build
-         * in the usual build folder because eclipse becomes *very* sad
-         * if we delete it. Which `gradlew clean` does all the time.
-         */
-        classpath.getEntries().findAll{ s -> s instanceof SourceFolder }.eachWithIndex { s, i ->
-            s.setOutput("out/eclipse" + i)
-        }
+  java.getModularity().getInferModulePath().set(false);
+  eclipse.getClasspath().getFile().whenMerged { classpath ->
+    /*
+     * give each source folder a unique corresponding output folder
+     * outside of the usual `build` folder. We can't put the build
+     * in the usual build folder because eclipse becomes *very* sad
+     * if we delete it. Which `gradlew clean` does all the time.
+     */
+    classpath.getEntries().findAll { s -> s instanceof SourceFolder }.eachWithIndex { s, i ->
+      s.setOutput("out/eclipse" + i)
     }
+  }
 }
 
 tasks.withType(JavaCompile).configureEach {

build-conventions/src/main/java/org/elasticsearch/gradle/internal/conventions/PublishPlugin.java

@@ -14,6 +14,8 @@
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension;
 import com.github.jengelman.gradle.plugins.shadow.ShadowPlugin;
 
+import nmcp.NmcpPlugin;
+
 import org.elasticsearch.gradle.internal.conventions.info.GitInfo;
 import org.elasticsearch.gradle.internal.conventions.precommit.PomValidationPrecommitPlugin;
 import org.elasticsearch.gradle.internal.conventions.util.Util;
@@ -27,6 +29,7 @@
 import org.gradle.api.plugins.ExtensionContainer;
 import org.gradle.api.plugins.JavaLibraryPlugin;
 import org.gradle.api.plugins.JavaPlugin;
+import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.MapProperty;
 import org.gradle.api.provider.Provider;
 import org.gradle.api.provider.ProviderFactory;
@@ -65,6 +68,7 @@ public void apply(Project project) {
         project.getPluginManager().apply(MavenPublishPlugin.class);
         project.getPluginManager().apply(PomValidationPrecommitPlugin.class);
         project.getPluginManager().apply(LicensingPlugin.class);
+        project.getPluginManager().apply(NmcpPlugin.class);
         configureJavadocJar(project);
         configureSourcesJar(project);
         configurePomGeneration(project);
@@ -82,6 +86,11 @@ private void configurePublications(Project project) {
                 publication.from(project.getComponents().getByName("java"));
             }
         });
+        project.getPlugins().withType(JavaPlugin.class, plugin -> {
+            var javaPluginExtension = project.getExtensions().getByType(JavaPluginExtension.class);
+            javaPluginExtension.withJavadocJar();
+            javaPluginExtension.withSourcesJar();
+        });
         @SuppressWarnings("unchecked")
         var projectLicenses = (MapProperty<String, Provider<String>>) project.getExtensions().getExtraProperties().get("projectLicenses");
         publication.getPom().withXml(xml -> {

build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/BuildPluginFuncTest.groovy

@@ -123,8 +123,6 @@ class BuildPluginFuncTest extends AbstractGradleFuncTest {
         then:
         result.task(":assemble").outcome == TaskOutcome.SUCCESS
         file("build/distributions/hello-world.jar").exists()
-        file("build/distributions/hello-world-javadoc.jar").exists()
-        file("build/distributions/hello-world-sources.jar").exists()
         assertValidJar(file("build/distributions/hello-world.jar"))
     }
 
@@ -162,7 +160,6 @@ class BuildPluginFuncTest extends AbstractGradleFuncTest {
         result.task(":forbiddenPatterns").outcome == TaskOutcome.SUCCESS
         result.task(":validateModule").outcome == TaskOutcome.SUCCESS
         result.task(":splitPackagesAudit").outcome == TaskOutcome.SUCCESS
-        result.task(":validateElasticPom").outcome == TaskOutcome.SUCCESS
         // disabled but check for being on the task graph
         result.task(":forbiddenApisMain").outcome == TaskOutcome.SKIPPED
         result.task(":checkstyleMain").outcome == TaskOutcome.SKIPPED