From f892746c008a088287f24baaa9e856fcc59c441e Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Mon, 30 Mar 2020 09:46:38 -0500
Subject: [PATCH] uploadArchives customizePom for bom

Previously the bom was not being customized for the uploadArchives task.

This commit enhances the bom plugin to support uploadArchives.

Closes gh-7975
---
 buildSrc/src/main/groovy/MavenBomTask.groovy | 38 ++++++++++++--------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/buildSrc/src/main/groovy/MavenBomTask.groovy b/buildSrc/src/main/groovy/MavenBomTask.groovy
index fbdf4a3991..c9450b15fb 100644
--- a/buildSrc/src/main/groovy/MavenBomTask.groovy
+++ b/buildSrc/src/main/groovy/MavenBomTask.groovy
@@ -30,20 +30,30 @@ public class MavenBomTask extends DefaultTask {
 		}
 		project.install {
 			repositories.mavenInstaller {
-				pom.whenConfigured {
-					packaging = "pom"
-					withXml {
-						asNode().children().last() + {
-							delegate.dependencyManagement {
-								delegate.dependencies {
-									projects.sort { dep -> "$dep.group:$dep.name" }.each { p ->
+				customizePom(pom)
+			}
+		}
 
-										delegate.dependency {
-											delegate.groupId(p.group)
-											delegate.artifactId(p.name)
-											delegate.version(p.version)
-										}
-									}
+		project.uploadArchives {
+			repositories.mavenDeployer {
+				customizePom(pom)
+			}
+		}
+	}
+
+	public void customizePom(pom) {
+		pom.whenConfigured {
+			packaging = "pom"
+			withXml {
+				asNode().children().last() + {
+					delegate.dependencyManagement {
+						delegate.dependencies {
+							projects.sort { dep -> "$dep.group:$dep.name" }.each { p ->
+
+								delegate.dependency {
+									delegate.groupId(p.group)
+									delegate.artifactId(p.name)
+									delegate.version(p.version)
 								}
 							}
 						}
@@ -52,4 +62,4 @@ public class MavenBomTask extends DefaultTask {
 			}
 		}
 	}
-}
\ No newline at end of file
+}