@@ -371,18 +371,6 @@ class BuildPlugin implements Plugin<Project> {
371
371
372
372
/* *Configuration generation of maven poms. */
373
373
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
-
386
374
project. plugins. withType(MavenPublishPlugin ). whenPluginAdded {
387
375
TaskProvider generatePomTask = project. tasks. register(" generatePom" ) { Task task ->
388
376
task. dependsOn ' generatePomFileForNebulaPublication'
@@ -404,6 +392,7 @@ class BuildPlugin implements Plugin<Project> {
404
392
shadow. component(publication)
405
393
// Workaround for https://github.com/johnrengelman/shadow/issues/334
406
394
// Here we manually add any project dependencies in the "shadow" configuration to our generated POM
395
+ publication. pom. withXml(this . &addScmInfo)
407
396
publication. pom. withXml { xml ->
408
397
Node dependenciesNode = (xml. asNode(). get(' dependencies' ) as NodeList ). get(0 ) as Node
409
398
project. configurations. getByName(ShadowBasePlugin . CONFIGURATION_NAME ). allDependencies. each { dependency ->
@@ -419,6 +408,20 @@ class BuildPlugin implements Plugin<Project> {
419
408
generatePomTask. configure({ Task t -> t. dependsOn = [' generatePomFileForShadowPublication' ] } as Action<Task > )
420
409
}
421
410
}
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)
422
425
}
423
426
424
427
/**
0 commit comments