Update nebula-publishing-plugin to 19.2.0 (opensearch-project#5704) (opensearch-project#5733)

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Signed-off-by: Andriy Redko <andriy.redko@aiven.io>

Author: reta

CHANGELOG.md

@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Bumps `gradle-info-plugin` from 7.1.3 to 12.0.0 ([#5684](https://github.com/opensearch-project/OpenSearch/pull/5684))
 - Bumps `reactor-netty` from 1.0.18 to 1.1.1 ([#5685](https://github.com/opensearch-project/OpenSearch/pull/5685))
 - Bumps `apache-rat` from 0.13 to 0.15 ([#5686](https://github.com/opensearch-project/OpenSearch/pull/5686))
+- Update nebula-publishing-plugin to 19.2.0 ([#5704](https://github.com/opensearch-project/OpenSearch/pull/5704))
 
 ### Changed
 - Change http code for DecommissioningFailedException from 500 to 400 ([#5283](https://github.com/opensearch-project/OpenSearch/pull/5283))

buildSrc/build.gradle

@@ -106,7 +106,7 @@ dependencies {
   api 'org.apache.commons:commons-compress:1.22'
   api 'org.apache.ant:ant:1.10.12'
   api 'com.netflix.nebula:gradle-extra-configurations-plugin:8.0.0'
-  api 'com.netflix.nebula:nebula-publishing-plugin:4.6.0'
+  api 'com.netflix.nebula:nebula-publishing-plugin:19.2.0'
   api 'com.netflix.nebula:gradle-info-plugin:12.0.0'
   api 'org.apache.rat:apache-rat:0.15'
   api 'commons-io:commons-io:2.7'

buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy

@@ -149,7 +149,7 @@ class PluginBuildPlugin implements Plugin<Project> {
     private void configurePublishing(Project project, PluginPropertiesExtension extension) {
         // Only configure publishing if applied externally
         if (extension.hasClientJar) {
-            project.pluginManager.apply('nebula.maven-base-publish')
+            project.pluginManager.apply('com.netflix.nebula.maven-base-publish')
             // Only change Jar tasks, we don't want a -client zip so we can't change archivesBaseName
             project.tasks.withType(Jar) {
                 archiveBaseName = archiveBaseName.get() +  "-client"

buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java

@@ -67,7 +67,8 @@ public class PublishPlugin implements Plugin<Project> {
 
     @Override
     public void apply(Project project) {
-        project.getPluginManager().apply("nebula.maven-base-publish");
+        project.getPluginManager().apply("com.netflix.nebula.maven-base-publish");
+        project.getPluginManager().apply("com.netflix.nebula.maven-nebula-publish");
         project.getPluginManager().apply(PomValidationPrecommitPlugin.class);
 
         configureJavadocJar(project);
@@ -108,8 +109,12 @@ public String call() throws Exception {
             // Here we manually add any project dependencies in the "shadow" configuration to our generated POM
             publication.getPom().withXml(xml -> {
                 Node root = xml.asNode();
-                root.appendNode("name", project.getName());
-                root.appendNode("description", project.getDescription());
+                if (((NodeList) root.get("name")).isEmpty()) {
+                    root.appendNode("name", project.getName());
+                }
+                if (((NodeList) root.get("description")).isEmpty()) {
+                    root.appendNode("description", project.getDescription());
+                }
                 Node dependenciesNode = (Node) ((NodeList) root.get("dependencies")).get(0);
                 project.getConfigurations().getByName(ShadowBasePlugin.CONFIGURATION_NAME).getAllDependencies().all(dependency -> {
                     if (dependency instanceof ProjectDependency) {

buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java

@@ -85,7 +85,7 @@ private void addZipArtifact(Project project) {
 
     @Override
     public void apply(Project project) {
-        project.getPluginManager().apply("nebula.maven-base-publish");
+        project.getPluginManager().apply("com.netflix.nebula.maven-nebula-publish");
         project.getPluginManager().apply(MavenPublishPlugin.class);
         project.afterEvaluate(evaluatedProject -> {
             if (isZipPublicationPresent(project)) {

buildSrc/src/test/java/org/opensearch/gradle/pluginzip/PublishTests.java

@@ -89,7 +89,7 @@ public void applyZipPublicationPluginNoConfig() {
             project.getTasks().size()
         );
 
-        // Tasks applied from "nebula.maven-base-publish"
+        // Tasks applied from "com.netflix.nebula.maven-base-publish"
         assertTrue(
             project.getTasks()
                 .findByName("generateMetadataFileForNebulaPublication") instanceof org.gradle.api.publish.tasks.GenerateModuleMetadata
@@ -126,8 +126,8 @@ public void applyZipPublicationPluginNoConfig() {
             project.getPlugins().findPlugin(org.gradle.api.publish.plugins.PublishingPlugin.class)
         );
         assertNotNull(
-            "Project is expected to have nebula MavenBasePublishPlugin plugin (applied from OpenSearch pluginzip plugin)",
-            project.getPlugins().findPlugin(nebula.plugin.publishing.maven.MavenBasePublishPlugin.class)
+            "Project is expected to have nebula MavenNebulaPublishPlugin plugin (applied from OpenSearch pluginzip plugin)",
+            project.getPlugins().findPlugin(nebula.plugin.publishing.maven.MavenNebulaPublishPlugin.class)
         );
     }
 

distribution/archives/integ-test-zip/build.gradle

@@ -34,6 +34,7 @@ apply plugin: 'opensearch.rest-test'
 
 // The integ-test-distribution is published to maven
 apply plugin: 'opensearch.publish'
+apply plugin: 'com.netflix.nebula.maven-publish'
 
 group = "org.opensearch.distribution.integ-test-zip"
 

modules/build.gradle

@@ -32,7 +32,7 @@ configure(subprojects.findAll { it.parent.path == project.path }) {
   group = 'org.opensearch.plugin' // for modules which publish client jars
   apply plugin: 'opensearch.testclusters'
   apply plugin: 'opensearch.opensearchplugin'
-
+  
   opensearchplugin {
     // for local OpenSearch plugins, the name of the plugin is the same as the directory
     name project.name

server/build.gradle

@@ -37,7 +37,7 @@ apply plugin: 'opensearch.internal-cluster-test'
 
 publishing {
   publications {
-    nebula {
+    nebula(MavenPublication) {
       artifactId 'opensearch'
     }
   }