From 5de9ba3350c12aa54b3069fb060f3abda944a5a5 Mon Sep 17 00:00:00 2001 From: Lars Grefer Date: Thu, 3 Oct 2019 22:31:53 +0200 Subject: [PATCH] Implement workaround for https://github.com/gradle/gradle/issues/10555 --- .../gradle/plugins/maven/plugin/MavenPluginPlugin.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/maven-plugin-plugin/src/main/java/io/freefair/gradle/plugins/maven/plugin/MavenPluginPlugin.java b/maven-plugin-plugin/src/main/java/io/freefair/gradle/plugins/maven/plugin/MavenPluginPlugin.java index ac733356..8d97bddb 100644 --- a/maven-plugin-plugin/src/main/java/io/freefair/gradle/plugins/maven/plugin/MavenPluginPlugin.java +++ b/maven-plugin-plugin/src/main/java/io/freefair/gradle/plugins/maven/plugin/MavenPluginPlugin.java @@ -23,7 +23,15 @@ public void apply(Project project) { project.getPlugins().apply(JavaPlugin.class); MavenPublishJavaPlugin mavenPublishJavaPlugin = project.getPlugins().apply(MavenPublishJavaPlugin.class); - mavenPublishJavaPlugin.getPublication().getPom().setPackaging("maven-plugin"); + // https://github.com/gradle/gradle/issues/10555#issue-492150084 + if (project.getGradle().getGradleVersion().startsWith("5.6")) { + mavenPublishJavaPlugin.getPublication().getPom().withXml(xmlProvider -> + xmlProvider.asNode().appendNode("packaging", "maven-plugin") + ); + } + else { + mavenPublishJavaPlugin.getPublication().getPom().setPackaging("maven-plugin"); + } TaskProvider generateMavenPom = project.getTasks().named("generatePomFileForMavenJavaPublication", GenerateMavenPom.class);