Use same POM configuration for install and uploadArchives tasks

Author: marcphilipp

gradle/maven.gradle

@@ -35,65 +35,68 @@ uploadArchives {
 			snapshotRepository(url: "https://oss.sonatype.org/content/repositories/snapshots/") {
 				authentication(userName: ossrhUsername, password: ossrhPassword)
 			}
+		}
+	}
+}
 
-			def projectLicense = licenseOf(project)
-
-			pom.project {
-				name "${project.group}:${project.name}"
-				packaging 'jar'
-				description "Module \"${project.name}\" of JUnit 5."
-				url 'http://junit.org/junit5/'
+def projectLicense = licenseOf(project)
+def mavenInstaller = install.repositories.mavenInstaller
+def mavenDeployer = uploadArchives.repositories.mavenDeployer
 
-				scm {
-					connection 'scm:git:git://github.com/junit-team/junit5.git'
-					developerConnection 'scm:git:git://github.com/junit-team/junit5.git'
-					url 'https://github.com/junit-team/junit5'
-				}
+[mavenInstaller, mavenDeployer]*.pom {
+	project {
+		name "${project.group}:${project.name}"
+		packaging 'jar'
+		description "Module \"${project.name}\" of JUnit 5."
+		url 'http://junit.org/junit5/'
 
-				licenses {
-					license {
-						name projectLicense['name']
-						url projectLicense['url']
-					}
-				}
+		scm {
+			connection 'scm:git:git://github.com/junit-team/junit5.git'
+			developerConnection 'scm:git:git://github.com/junit-team/junit5.git'
+			url 'https://github.com/junit-team/junit5'
+		}
 
-				developers {
-					developer {
-						id 'bechte'
-						name 'Stefan Bechtold'
-						email '[email protected]'
-					}
-					developer {
-						id 'jlink'
-						name 'Johannes Link'
-						email '[email protected]'
-					}
-					developer {
-						id 'marcphilipp'
-						name 'Marc Philipp'
-						email '[email protected]'
-					}
-					developer {
-						id 'mmerdes'
-						name 'Matthias Merdes'
-						email '[email protected]'
-					}
-					developer {
-						id 'sbrannen'
-						name 'Sam Brannen'
-						email '[email protected]'
-					}
-					developer {
-						id 'sormuras'
-						name 'Christian Stein'
-						email '[email protected]'
-					}
-				}
+		licenses {
+			license {
+				name projectLicense['name']
+				url projectLicense['url']
 			}
+		}
 
-			pom.whenConfigured {
-				dependencies = dependencies.findAll { dep -> dep.scope != 'test' }
+		developers {
+			developer {
+				id 'bechte'
+				name 'Stefan Bechtold'
+				email '[email protected]'
+			}
+			developer {
+				id 'jlink'
+				name 'Johannes Link'
+				email '[email protected]'
+			}
+			developer {
+				id 'marcphilipp'
+				name 'Marc Philipp'
+				email '[email protected]'
+			}
+			developer {
+				id 'mmerdes'
+				name 'Matthias Merdes'
+				email '[email protected]'
+			}
+			developer {
+				id 'sbrannen'
+				name 'Sam Brannen'
+				email '[email protected]'
+			}
+			developer {
+				id 'sormuras'
+				name 'Christian Stein'
+				email '[email protected]'
 			}
 		}
 	}
+	whenConfigured {
+		dependencies = dependencies.findAll { dep -> dep.scope != 'test' }
+	}
 }

junit-bom/junit-bom.gradle

@@ -7,32 +7,34 @@ artifacts {
 
 apply from: "$rootDir/gradle/maven.gradle"
 
-uploadArchives {
-	enabled = true
-	repositories.mavenDeployer.pom {
-		project {
-			artifactId = project.name
-			name = project.description
-			description = project.description
-		}
-		whenConfigured {
-			packaging = "pom"
-			dependencies = []
-			withXml {
-				asNode().children().last() + {
-					delegate.dependencyManagement {
-						delegate.dependencies {
-							parent.mavenizedProjects.sort()
-								.findAll { name -> project.name != name }
-								.collect { name -> rootProject.project(name) }
-								.each { project ->
-									delegate.dependency {
-										delegate.groupId(project.group)
-										delegate.artifactId(project.name)
-										delegate.version(project.version)
-									}
+uploadArchives.enabled = true
+
+def mavenInstaller = install.repositories.mavenInstaller
+def mavenDeployer = uploadArchives.repositories.mavenDeployer
+
+[mavenInstaller, mavenDeployer]*.pom {
+	project {
+		artifactId = project.name
+		name = project.description
+		description = project.description
+	}
+	whenConfigured {
+		packaging = 'pom'
+		dependencies = []
+		withXml {
+			asNode().children().last() + {
+				delegate.dependencyManagement {
+					delegate.dependencies {
+						parent.mavenizedProjects.sort()
+							.findAll { name -> name != 'junit-platform-console-standalone' }
+							.collect { name -> rootProject.project(name) }
+							.each { project ->
+								delegate.dependency {
+									delegate.groupId(project.group)
+									delegate.artifactId(project.name)
+									delegate.version(project.version)
 								}
-						}
+							}
 					}
 				}
 			}