Skip to content

Commit 0d88b00

Browse files
committed
Add scm info to shadow jars as well
1 parent 9ed9d26 commit 0d88b00

File tree

1 file changed

+15
-12
lines changed

1 file changed

+15
-12
lines changed

buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy

+15-12
Original file line numberDiff line numberDiff line change
@@ -371,18 +371,6 @@ class BuildPlugin implements Plugin<Project> {
371371

372372
/**Configuration generation of maven poms. */
373373
static void configurePomGeneration(Project project) {
374-
// Add git origin info to generated POM files
375-
project.pluginManager.withPlugin('nebula.maven-base-publish') {
376-
PublishingExtension publishing = project.extensions.getByType(PublishingExtension)
377-
MavenPublication nebulaPublication = (MavenPublication) publishing.publications.getByName('nebula')
378-
nebulaPublication.pom.withXml { XmlProvider xml ->
379-
Node root = xml.asNode()
380-
root.appendNode('url', PluginBuildPlugin.urlFromOrigin(BuildParams.gitOrigin))
381-
Node scmNode = root.appendNode('scm')
382-
scmNode.appendNode('url', BuildParams.gitOrigin)
383-
}
384-
}
385-
386374
project.plugins.withType(MavenPublishPlugin).whenPluginAdded {
387375
TaskProvider generatePomTask = project.tasks.register("generatePom") { Task task ->
388376
task.dependsOn 'generatePomFileForNebulaPublication'
@@ -404,6 +392,7 @@ class BuildPlugin implements Plugin<Project> {
404392
shadow.component(publication)
405393
// Workaround for https://github.com/johnrengelman/shadow/issues/334
406394
// Here we manually add any project dependencies in the "shadow" configuration to our generated POM
395+
publication.pom.withXml(this.&addScmInfo)
407396
publication.pom.withXml { xml ->
408397
Node dependenciesNode = (xml.asNode().get('dependencies') as NodeList).get(0) as Node
409398
project.configurations.getByName(ShadowBasePlugin.CONFIGURATION_NAME).allDependencies.each { dependency ->
@@ -419,6 +408,20 @@ class BuildPlugin implements Plugin<Project> {
419408
generatePomTask.configure({ Task t -> t.dependsOn = ['generatePomFileForShadowPublication'] } as Action<Task>)
420409
}
421410
}
411+
412+
// Add git origin info to generated POM files
413+
project.pluginManager.withPlugin('nebula.maven-base-publish') {
414+
PublishingExtension publishing = project.extensions.getByType(PublishingExtension)
415+
MavenPublication nebulaPublication = (MavenPublication) publishing.publications.getByName('nebula')
416+
nebulaPublication.pom.withXml(this.&addScmInfo)
417+
}
418+
}
419+
420+
private static void addScmInfo(XmlProvider xml) {
421+
Node root = xml.asNode()
422+
root.appendNode('url', PluginBuildPlugin.urlFromOrigin(BuildParams.gitOrigin))
423+
Node scmNode = root.appendNode('scm')
424+
scmNode.appendNode('url', BuildParams.gitOrigin)
422425
}
423426

424427
/**

0 commit comments

Comments
 (0)