diff --git a/build.gradle.kts b/build.gradle.kts index 92aa8bde1cd3..083945a7dab9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -96,10 +96,6 @@ allprojects { maven(url = "https://oss.sonatype.org/content/repositories/snapshots") } - dependencies { - api("org.apiguardian:apiguardian-api:${Versions.apiGuardian}") - } - tasks.compileJava { options.encoding = "UTF-8" @@ -212,6 +208,10 @@ subprojects { apply(from = "$rootDir/gradle/publishing.gradle.kts") + dependencies { + api("org.apiguardian:apiguardian-api:${Versions.apiGuardian}") + } + tasks.javadoc { options { memberLevel = JavadocMemberLevel.PROTECTED diff --git a/junit-bom/junit-bom.gradle.kts b/junit-bom/junit-bom.gradle.kts index e6232fe4e8c2..d5cb55daca82 100644 --- a/junit-bom/junit-bom.gradle.kts +++ b/junit-bom/junit-bom.gradle.kts @@ -2,31 +2,19 @@ description = "${rootProject.description} (Bill of Materials)" apply(from = "$rootDir/gradle/publishing.gradle.kts") +dependencies { + constraints { + val mavenizedProjects: List by rootProject.extra + mavenizedProjects.sorted() + .filter { it.name != "junit-platform-console-standalone" } + .forEach { api("${it.group}:${it.name}:${it.version}") } + } +} + the().publications.named("maven") { + from(components["javaLibraryPlatform"]) pom { - packaging = "pom" description.set("This Bill of Materials POM can be used to ease dependency management " + "when referencing multiple JUnit artifacts using Gradle or Maven.") - withXml { - asElement().apply { - getElementsByTagName("dependencies") - .let { children -> (0 until children.length).map { children.item(it) } } - .forEach { removeChild(it) } - appendChild(ownerDocument.createElement("dependencyManagement")).apply { - appendChild(ownerDocument.createElement("dependencies")).apply { - val mavenizedProjects: List by rootProject.extra - mavenizedProjects.sorted() - .filter { it != project(":junit-platform-console-standalone") } - .forEach { project -> - appendChild(ownerDocument.createElement("dependency")).apply { - appendChild(ownerDocument.createElement("groupId")).textContent = project.group as String - appendChild(ownerDocument.createElement("artifactId")).textContent = project.name - appendChild(ownerDocument.createElement("version")).textContent = project.version as String - } - } - } - } - } - } } }