From ea512e393e52360530f9a63437bcf6529fc66a37 Mon Sep 17 00:00:00 2001 From: Andriy Redko Date: Wed, 4 Jan 2023 15:25:02 -0500 Subject: [PATCH] Update nebula-publishing-plugin to 19.2.0 Signed-off-by: Andriy Redko --- CHANGELOG.md | 1 + buildSrc/build.gradle | 2 +- .../opensearch/gradle/plugin/PluginBuildPlugin.groovy | 2 +- .../java/org/opensearch/gradle/PublishPlugin.java | 11 ++++++++--- .../java/org/opensearch/gradle/pluginzip/Publish.java | 2 +- .../org/opensearch/gradle/pluginzip/PublishTests.java | 6 +++--- distribution/archives/integ-test-zip/build.gradle | 1 + modules/build.gradle | 2 +- server/build.gradle | 2 +- 9 files changed, 18 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dd70f3cfbe4e..0333bd77731e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), - Bumps `maven-model` from 3.6.2 to 3.8.6 ([#5599](https://github.com/opensearch-project/OpenSearch/pull/5599)) - Bumps `maxmind-db` from 2.1.0 to 3.0.0 ([#5601](https://github.com/opensearch-project/OpenSearch/pull/5601)) - Bumps `protobuf-java` from 3.21.11 to 3.21.12 ([#5603](https://github.com/opensearch-project/OpenSearch/pull/5603)) +- Update nebula-publishing-plugin to 19.2.0 ([#5704](https://github.com/opensearch-project/OpenSearch/pull/5704)) ### Changed - [CCR] Add getHistoryOperationsFromTranslog method to fetch the history snapshot from translogs ([#3948](https://github.com/opensearch-project/OpenSearch/pull/3948)) diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index 2669e5ebfdc8b..129f60378b47e 100644 --- a/buildSrc/build.gradle +++ b/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' diff --git a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy index b7c78991a0da3..2428d9e2fa4fa 100644 --- a/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy +++ b/buildSrc/src/main/groovy/org/opensearch/gradle/plugin/PluginBuildPlugin.groovy @@ -149,7 +149,7 @@ class PluginBuildPlugin implements Plugin { 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" diff --git a/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java b/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java index be12fdd99c1df..1015a2dfb7d72 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/PublishPlugin.java @@ -67,7 +67,8 @@ public class PublishPlugin implements Plugin { @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) { diff --git a/buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java b/buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java index 6b581fcaa7774..4849065c78a6d 100644 --- a/buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java +++ b/buildSrc/src/main/java/org/opensearch/gradle/pluginzip/Publish.java @@ -59,7 +59,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)) { diff --git a/buildSrc/src/test/java/org/opensearch/gradle/pluginzip/PublishTests.java b/buildSrc/src/test/java/org/opensearch/gradle/pluginzip/PublishTests.java index 148a836f32b41..ce33b6bdd5b04 100644 --- a/buildSrc/src/test/java/org/opensearch/gradle/pluginzip/PublishTests.java +++ b/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) ); } diff --git a/distribution/archives/integ-test-zip/build.gradle b/distribution/archives/integ-test-zip/build.gradle index 35c5a9b60b568..f3f848797961c 100644 --- a/distribution/archives/integ-test-zip/build.gradle +++ b/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" diff --git a/modules/build.gradle b/modules/build.gradle index b493c4a577cec..126bf0c8870ac 100644 --- a/modules/build.gradle +++ b/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 diff --git a/server/build.gradle b/server/build.gradle index ae79ea2dabc29..1172fddd04e51 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -37,7 +37,7 @@ apply plugin: 'opensearch.internal-cluster-test' publishing { publications { - nebula { + nebula(MavenPublication) { artifactId 'opensearch' } }