Bump and align versions to 6.0.0-SNAPSHOT

Author: marcphilipp

.github/workflows/release.yml

@@ -248,16 +248,13 @@ jobs:
         with:
           script: |
             const releaseVersion = "${{ github.event.inputs.releaseVersion }}";
-            const jupiterVersion = releaseVersion;
-            const vintageVersion = releaseVersion;
-            const platformVersion = "1." + releaseVersion.substring(2);
             const requestBody = {
               owner: context.repo.owner,
               repo: context.repo.repo,
               tag_name: `r${releaseVersion}`,
               name: `JUnit ${releaseVersion}`,
               generate_release_notes: true,
-              body: `JUnit ${jupiterVersion} = Platform ${platformVersion} + Jupiter ${jupiterVersion} + Vintage ${vintageVersion}\n\nSee [Release Notes](https://junit.org/junit5/docs/${releaseVersion}/release-notes/).`,
+              body: `JUnit ${releaseVersion} = Platform ${releaseVersion} + Jupiter ${releaseVersion} + Vintage ${releaseVersion}\n\nSee [Release Notes](https://junit.org/junit5/docs/${releaseVersion}/release-notes/).`,
               prerelease: releaseVersion.includes("-"),
             };
             console.log(requestBody);

RELEASING.md

@@ -3,13 +3,13 @@
 ## Pre-release steps
 
 - [ ] Switch or create the release branch for this feature release (e.g. `releases/5.12.x`)
-- [ ] Change `version`, `platformVersion`, and `vintageVersion` in `gradle.properties` to the versions about to be released
+- [ ] Change `version` in `gradle.properties` to the versions about to be released
 - [ ] Change release date in Release Notes
 - [ ] Change release date in `README.MD`
 - [ ] Commit with message "Release ${VERSION}"
 - [ ] Execute `./gradlew --no-build-cache --no-configuration-cache clean build publish closeSonatypeStagingRepository`
 - [ ] Tag current commit: `git tag -s -m ${VERSION} r${VERSION}`
-- [ ] Change `version`, `platformVersion`, and `vintageVersion` properties in `gradle.properties` on release branch to new development versions and commit with message "Back to snapshots for further development" or similar
+- [ ] Change `version` in `gradle.properties` on release branch to new development versions and commit with message "Back to snapshots for further development" or similar
 - [ ] Push release branch and tag to GitHub: `git push --set-upstream --follow-tags origin HEAD`
 - [ ] Trigger a [release build](https://github.com/junit-team/junit5/actions/workflows/release.yml): `gh workflow run --ref r${VERSION} -f releaseVersion=${VERSION} -f stagingRepoId=orgjunit-1234 release.yml`
   - Select the release branch

documentation/documentation.gradle.kts

@@ -295,15 +295,9 @@ tasks {
 		// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
 		inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
 
-		val platformVersion: String by project
-		val vintageVersion: String by project
-
 		attributeProviders += AsciidoctorAttributeProvider {
 			mapOf(
-				"jupiter-version" to version,
-				"platform-version" to platformVersion,
-				"vintage-version" to vintageVersion,
-				"bom-version" to version,
+				"version" to version,
 				"junit4-version" to libs.versions.junit4.get(),
 				"apiguardian-version" to libs.versions.apiguardian.get(),
 				"ota4j-version" to libs.versions.opentest4j.get(),

documentation/src/docs/asciidoc/user-guide/advanced-topics/junit-platform-reporting.adoc

@@ -63,7 +63,7 @@ using Gradle's Build Cache.
 .Groovy DSL
 ----
 dependencies {
-    testRuntimeOnly("org.junit.platform:junit-platform-reporting:{platform-version}")
+    testRuntimeOnly("org.junit.platform:junit-platform-reporting:{version}")
 }
 tasks.withType(Test).configureEach {
     def outputDir = reports.junitXml.outputLocation
@@ -81,7 +81,7 @@ tasks.withType(Test).configureEach {
 .Kotlin DSL
 ----
 dependencies {
-    testRuntimeOnly("org.junit.platform:junit-platform-reporting:{platform-version}")
+    testRuntimeOnly("org.junit.platform:junit-platform-reporting:{version}")
 }
 tasks.withType<Test>().configureEach {
     val outputDir = reports.junitXml.outputLocation
@@ -109,7 +109,7 @@ XML reports as follows:
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-reporting</artifactId>
-			<version>{platform-version}</version>
+			<version>{version}</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -140,7 +140,7 @@ output by setting the configuration parameters via `--config`:
 
 [source,console,subs=attributes+]
 ----
-$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
+$ java -jar junit-platform-console-standalone-{version}.jar <OPTIONS> \
   --config=junit.platform.reporting.open.xml.enabled=true \
   --config=junit.platform.reporting.output.dir=reports
 ----
@@ -150,7 +150,7 @@ classpath resource via the `--config-resource` option:
 
 [source,console,subs=attributes+]
 ----
-$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
+$ java -jar junit-platform-console-standalone-{version}.jar <OPTIONS> \
   --config-resource=configuration.properties
 ----
 

documentation/src/docs/asciidoc/user-guide/advanced-topics/testkit.adoc

@@ -5,7 +5,7 @@
 
 The `junit-platform-testkit` artifact provides support for executing a test plan on the
 JUnit Platform and then verifying the expected results. As of JUnit Platform
-{platform-version}, this support is limited to the execution of a single `TestEngine` (see
+{version}, this support is limited to the execution of a single `TestEngine` (see
 <<testkit-engine>>).
 
 [[testkit-engine]]

documentation/src/docs/asciidoc/user-guide/appendix.adoc

@@ -45,7 +45,7 @@ Please refer to the corresponding sections for <<running-tests-build-maven-bom,
 ==== JUnit Platform
 
 * *Group ID*: `org.junit.platform`
-* *Version*: `{platform-version}`
+* *Version*: `{version}`
 * *Artifact IDs*:
   `junit-platform-commons`::
     Common APIs and support utilities for the JUnit Platform. Any API annotated with
@@ -94,7 +94,7 @@ Please refer to the corresponding sections for <<running-tests-build-maven-bom,
 ==== JUnit Jupiter
 
 * *Group ID*: `org.junit.jupiter`
-* *Version*: `{jupiter-version}`
+* *Version*: `{version}`
 * *Artifact IDs*:
   `junit-jupiter`::
     JUnit Jupiter aggregator artifact that transitively pulls in dependencies on
@@ -114,7 +114,7 @@ Please refer to the corresponding sections for <<running-tests-build-maven-bom,
 ==== JUnit Vintage
 
 * *Group ID*: `org.junit.vintage`
-* *Version*: `{vintage-version}`
+* *Version*: `{version}`
 * *Artifact ID*:
   `junit-vintage-engine`::
     JUnit Vintage test engine implementation that allows one to run _vintage_ JUnit tests
@@ -131,7 +131,7 @@ or https://docs.gradle.org/current/userguide/platforms.html#sub:bom_import[Gradl
 
 * *Group ID*: `org.junit`
 * *Artifact ID*: `junit-bom`
-* *Version*: `{bom-version}`
+* *Version*: `{version}`
 
 [[dependency-metadata-dependencies]]
 ==== Dependencies

documentation/src/docs/asciidoc/user-guide/running-tests.adoc

@@ -13,15 +13,15 @@ however, that it is recommended to use IDEA 2017.3 or newer since more recent ve
 IDEA download the following JARs automatically based on the API version used in the
 project: `junit-platform-launcher`, `junit-jupiter-engine`, and `junit-vintage-engine`.
 
-In order to use a different JUnit 5 version (e.g., {jupiter-version}), you may need to
+In order to use a different JUnit 5 version (e.g., {version}), you may need to
 include the corresponding versions of the `junit-platform-launcher`,
 `junit-jupiter-engine`, and `junit-vintage-engine` JARs in the classpath.
 
 .Additional Gradle Dependencies
 [source,groovy]
 [subs=attributes+]
 ----
-testImplementation(platform("org.junit:junit-bom:{bom-version}"))
+testImplementation(platform("org.junit:junit-bom:{version}"))
 testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
 testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
@@ -54,7 +54,7 @@ testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>junit-bom</artifactId>
-			<version>{bom-version}</version>
+			<version>{version}</version>
 			<type>pom</type>
 			<scope>import</scope>
 		</dependency>
@@ -160,7 +160,7 @@ versions of all JUnit 5 artifacts.
 .Explicit platform dependency on the BOM
 ----
 dependencies {
-	testImplementation(platform("org.junit:junit-bom:{bom-version}"))
+	testImplementation(platform("org.junit:junit-bom:{version}"))
 	testImplementation("org.junit.jupiter:junit-jupiter")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
@@ -181,7 +181,7 @@ artifacts.
 .Implicit platform dependency on the BOM
 ----
 dependencies {
-	testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}") // <1>
+	testImplementation("org.junit.jupiter:junit-jupiter:{version}") // <1>
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher") // <2>
 }
 ----
@@ -212,7 +212,7 @@ on the dependency-aggregating JUnit Jupiter artifact similar to the following.
 [subs=attributes+]
 ----
 dependencies {
-	testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}")
+	testImplementation("org.junit.jupiter:junit-jupiter:{version}")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 ----
@@ -228,7 +228,7 @@ support.
 testing {
 	suites {
 		named<JvmTestSuite>("test") {
-			useJUnitJupiter("{jupiter-version}")
+			useJUnitJupiter("{version}")
 		}
 	}
 }
@@ -241,7 +241,7 @@ testing {
 testing {
 	suites {
 		test {
-			useJUnitJupiter("{jupiter-version}")
+			useJUnitJupiter("{version}")
 		}
 	}
 }
@@ -256,7 +256,7 @@ implementation similar to the following.
 ----
 dependencies {
 	testImplementation("junit:junit:{junit4-version}")
-	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{vintage-version}")
+	testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{version}")
 	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
 }
 ----
@@ -337,7 +337,7 @@ Maven build as follows.
 <dependency>
     <groupId>org.junit.platform</groupId>
     <artifactId>junit-platform-launcher</artifactId>
-    <version>{platform-version}</version>
+    <version>{version}</version>
     <scope>test</scope>
 </dependency>
 ----
@@ -358,7 +358,7 @@ versions of all JUnit 5 artifacts.
 		<dependency>
 			<groupId>org.junit</groupId>
 			<artifactId>junit-bom</artifactId>
-			<version>{bom-version}</version>
+			<version>{version}</version>
 			<type>pom</type>
 			<scope>import</scope>
 		</dependency>
@@ -391,7 +391,7 @@ following.
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter</artifactId>
-			<version>{jupiter-version}</version> <!-- can be omitted when using the BOM -->
+			<version>{version}</version> <!-- can be omitted when using the BOM -->
 			<scope>test</scope>
 		</dependency>
 		<!-- ... -->
@@ -430,7 +430,7 @@ long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintag
 		<dependency>
 			<groupId>org.junit.vintage</groupId>
 			<artifactId>junit-vintage-engine</artifactId>
-			<version>{vintage-version}</version> <!-- can be omitted when using the BOM -->
+			<version>{version}</version> <!-- can be omitted when using the BOM -->
 			<scope>test</scope>
 		</dependency>
 		<!-- ... -->
@@ -659,7 +659,7 @@ With Gradle you can override the JUnit Jupiter version by including the followin
 [source,groovy,indent=0]
 [subs=attributes+]
 ----
-	ext['junit-jupiter.version'] = '{jupiter-version}'
+	ext['junit-jupiter.version'] = '{version}'
 ----
 
 With Maven you can override the JUnit Jupiter version by including the following in your
@@ -669,7 +669,7 @@ With Maven you can override the JUnit Jupiter version by including the following
 [subs=attributes+]
 ----
 	<properties>
-		<junit-jupiter.version>{jupiter-version}</junit-jupiter.version>
+		<junit-jupiter.version>{version}</junit-jupiter.version>
 	</properties>
 ----
 
@@ -680,7 +680,7 @@ The `{ConsoleLauncher}` is a command-line Java application that lets you launch
 Platform from the console. For example, it can be used to run JUnit Vintage and JUnit
 Jupiter tests and print test execution results to the console.
 
-An executable _Fat JAR_ (`junit-platform-console-standalone-{platform-version}.jar`) that
+An executable _Fat JAR_ (`junit-platform-console-standalone-{version}.jar`) that
 contains the contents of all of its dependencies is published in the {Maven_Central}
 repository under the
 https://repo1.maven.org/maven2/org/junit/platform/junit-platform-console-standalone[junit-platform-console-standalone]
@@ -711,7 +711,7 @@ standalone `ConsoleLauncher` as shown below.
 
 [source,console,subs=attributes+]
 ----
-$ java -jar junit-platform-console-standalone-{platform-version}.jar execute <OPTIONS>
+$ java -jar junit-platform-console-standalone-{version}.jar execute <OPTIONS>
 
 ├─ JUnit Vintage
 │  └─ example.JUnit4Tests
@@ -820,7 +820,7 @@ files using the `--redirect-stdout` and `--redirect-stderr` options:
 
 [source,console,subs=attributes+]
 ----
-$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
+$ java -jar junit-platform-console-standalone-{version}.jar <OPTIONS> \
   --redirect-stdout=stdout.txt \
   --redirect-stderr=stderr.txt
 ----
@@ -1255,7 +1255,7 @@ to a problem.
 In order to record Flight Recorder events generated while running tests, you need to:
 
 1. Ensure that you are using either Java 8 Update 262 or higher or Java 11 or later.
-2. Provide the `org.junit.platform.jfr` module (`junit-platform-jfr-{platform-version}.jar`)
+2. Provide the `org.junit.platform.jfr` module (`junit-platform-jfr-{version}.jar`)
    on the class-path or module-path at test runtime.
 3. Start flight recording when launching a test run. Flight Recorder can be started via
    java command line option:

gradle.properties

@@ -1,13 +1,4 @@
-group           = org.junit
-version         = 5.13.0-SNAPSHOT
-
-jupiterGroup    = org.junit.jupiter
-
-platformGroup   = org.junit.platform
-platformVersion = 1.13.0-SNAPSHOT
-
-vintageGroup    = org.junit.vintage
-vintageVersion  = 5.13.0-SNAPSHOT
+version = 6.0.0-SNAPSHOT
 
 # We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
 org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError

gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts

@@ -9,18 +9,11 @@ val jupiterProjects: List<Project> by rootProject
 val platformProjects: List<Project> by rootProject
 val vintageProjects: List<Project> by rootProject
 
-when (project) {
-	in jupiterProjects -> {
-		group = property("jupiterGroup")!!
-	}
-	in platformProjects -> {
-		group = property("platformGroup")!!
-		version = property("platformVersion")!!
-	}
-	in vintageProjects -> {
-		group = property("vintageGroup")!!
-		version = property("vintageVersion")!!
-	}
+group = when (project) {
+	in jupiterProjects -> "org.junit.jupiter"
+	in platformProjects -> "org.junit.platform"
+	in vintageProjects -> "org.junit.vintage"
+	else -> "org.junit"
 }
 
 // ensure project is built successfully before publishing it

junit-jupiter-engine/junit-jupiter-engine.gradle.kts

@@ -19,15 +19,14 @@ dependencies {
 tasks {
 	jar {
 		bundle {
-			val platformVersion: String by rootProject.extra
 			bnd("""
 				Provide-Capability:\
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-jupiter';\
 						version:Version="${'$'}{version_cleanup;${project.version}}"
 				Require-Capability:\
 					org.junit.platform.launcher;\
-						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${platformVersion}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${platformVersion}}})))';\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${project.version}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${project.version}}})))';\
 						effective:=active
 			""")
 		}