Add junit-bom subproject

Issue: #316

Author: marcphilipp

build.gradle

@@ -291,10 +291,16 @@ subprojects { subproj ->
 	}
 
 	if (subproj.name in mavenizedProjects) {
-		apply plugin: 'maven'
-		apply plugin: 'signing'
 
-		if (subproj.name in platformProjects) {
+		apply from: "$rootDir/gradle/maven.gradle"
+
+		subproj.ext.baseline = null
+
+		if (subproj.name in jupiterProjects) {
+			subproj.group = jupiterGroup
+			subproj.baseline = jupiterBaseline
+		}
+		else if (subproj.name in platformProjects) {
 			subproj.group = platformGroup
 			subproj.version = platformVersion
 			subproj.baseline = platformBaseline
@@ -371,102 +377,7 @@ subprojects { subproj ->
 			}
 		}
 
-		def isSnapshot = project.version.contains('SNAPSHOT')
-		def isContinuousIntegrationEnvironment = Boolean.parseBoolean(System.getenv('CI'))
-		def isJitPackEnvironment = Boolean.parseBoolean(System.getenv('JITPACK'))
-		def signArtifacts = !(isSnapshot || isContinuousIntegrationEnvironment || isJitPackEnvironment)
-
-		afterEvaluate {
-			if (signArtifacts && uploadArchives.enabled) {
-				signing {
-					sign configurations.archives
-				}
-			}
-		}
-
-		uploadArchives {
-
-			dependsOn check
-
-			repositories {
-				mavenDeployer {
-
-					if (signArtifacts) {
-						beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-					}
-
-					def ossrhUsername = rootProject.hasProperty('ossrhUsername') ? rootProject.ossrhUsername : ''
-					def ossrhPassword = rootProject.hasProperty('ossrhPassword') ? rootProject.ossrhPassword : ''
-
-					repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
-						authentication(userName: ossrhUsername, password: ossrhPassword)
-					}
-
-					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/'
-
-						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'
-						}
-
-						licenses {
-							license {
-								name projectLicense['name']
-								url projectLicense['url']
-							}
-						}
 
-						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]'
-							}
-						}
-					}
-
-					pom.whenConfigured { p ->
-						p.dependencies = p.dependencies.findAll { dep -> dep.scope != 'test' }
-					}
-				}
-			}
-		}
 	} else {
 		jar.enabled = false
 		javadoc.enabled = false

gradle.properties

@@ -1,6 +1,8 @@
-group               = org.junit.jupiter
+group               = org.junit
 version             = 5.2.0-SNAPSHOT
-baseline            = 5.1.0
+
+jupiterGroup        = org.junit.jupiter
+jupiterBaseline     = 5.1.0
 
 platformGroup       = org.junit.platform
 platformVersion     = 1.2.0-SNAPSHOT

gradle/maven.gradle

@@ -0,0 +1,99 @@
+apply plugin: 'maven'
+apply plugin: 'signing'
+
+def isSnapshot = project.version.contains('SNAPSHOT')
+def isContinuousIntegrationEnvironment = Boolean.parseBoolean(System.getenv('CI'))
+def isJitPackEnvironment = Boolean.parseBoolean(System.getenv('JITPACK'))
+def signArtifacts = !(isSnapshot || isContinuousIntegrationEnvironment || isJitPackEnvironment)
+
+afterEvaluate {
+	if (signArtifacts && uploadArchives.enabled) {
+		signing {
+			sign configurations.archives
+		}
+	}
+}
+
+uploadArchives {
+
+	dependsOn check
+
+	repositories {
+		mavenDeployer {
+
+			if (signArtifacts) {
+				beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+			}
+
+			def ossrhUsername = rootProject.hasProperty('ossrhUsername') ? rootProject.ossrhUsername : ''
+			def ossrhPassword = rootProject.hasProperty('ossrhPassword') ? rootProject.ossrhPassword : ''
+
+			repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2/") {
+				authentication(userName: ossrhUsername, password: ossrhPassword)
+			}
+
+			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/'
+
+				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'
+				}
+
+				licenses {
+					license {
+						name projectLicense['name']
+						url projectLicense['url']
+					}
+				}
+
+				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]'
+					}
+				}
+			}
+
+			pom.whenConfigured {
+				dependencies = dependencies.findAll { dep -> dep.scope != 'test' }
+			}
+		}
+	}
+}

junit-bom/README.md

@@ -0,0 +1,9 @@
+# Module junit-bom
+
+This module provides a Bill of Materials POM to ease dependency management
+using Maven [1] or Gradle [2]. Please refer to the JUnit 5 User Guide [3] for
+details.
+
+[1] https://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html#Importing_Dependencies
+[2] https://docs.gradle.org/4.6-rc-1/userguide/managing_transitive_dependencies.html#sec:bom_import
+[3] https://junit.org/junit5/docs/current/user-guide/#dependency-metadata-junit-bom

junit-bom/junit-bom.gradle

@@ -0,0 +1,41 @@
+description = rootProject.description + " (Bill of Materials)"
+
+configurations.archives.artifacts.clear()
+artifacts {
+	archives file("README.md") // work around GRADLE-2406 by attaching text artifact
+}
+
+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)
+									}
+								}
+						}
+					}
+				}
+			}
+		}
+	}
+}

platform-tests/src/test/java/org/junit/AutomaticModuleNameTests.java

@@ -68,6 +68,7 @@ private static List<String> moduleDirectoryNames() throws IOException {
 				.filter(line -> line.startsWith(startOfModuleLine))
 				.map(line -> line.substring(startOfModuleLine.length(), line.length() - 1))
 				.filter(name -> !name.equals("junit-platform-console-standalone"))
+				.filter(name -> !name.equals("junit-bom"))
 				.filter(name -> !name.endsWith("-java-9"))
 				.filter(name -> name.startsWith("junit-"))) {
 			return stream.collect(Collectors.toList());

settings.gradle

@@ -24,6 +24,7 @@ include 'junit-platform-suite-api'
 include 'junit-platform-surefire-provider'
 include 'junit-vintage-engine'
 include 'platform-tests'
+include 'junit-bom'
 
 // check that every subproject has a custom build file
 // based on the project name