Bump JDK baseline to 17

.github/actions/setup-test-jdk/action.yml

@@ -15,3 +15,10 @@ runs:
         check-latest: true
     - shell: bash
       run: echo "JDK8=$JAVA_HOME" >> $GITHUB_ENV
+    - uses: actions/setup-java@7a6d8a8234af8eb26422e24e3006232cccaa061b # v4
+      with:
+        distribution: ${{ inputs.distribution }}
+        java-version: 17
+        check-latest: true
+    - shell: bash
+      run: echo "JDK17=$JAVA_HOME" >> $GITHUB_ENV

.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

@@ -25,8 +25,8 @@ val modularProjects: List<Project> by rootProject
 modularProjects.forEach { evaluationDependsOn(it.path) }
 
 javaLibrary {
-	mainJavaVersion = JavaVersion.VERSION_1_8
-	testJavaVersion = JavaVersion.VERSION_1_8
+	mainJavaVersion = JavaVersion.VERSION_17
+	testJavaVersion = JavaVersion.VERSION_17
 }
 
 val apiReport = configurations.dependencyScope("apiReport")
@@ -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/release-notes/index.adoc

@@ -17,6 +17,8 @@ authors as well as build tool and IDE vendors.
 
 include::{includedir}/link-attributes.adoc[]
 
+include::{basedir}/release-notes-6.0.0-M1.adoc[]
+
 include::{basedir}/release-notes-5.13.0-M3.adoc[]
 
 include::{basedir}/release-notes-5.13.0-M2.adoc[]

documentation/src/docs/asciidoc/release-notes/release-notes-6.0.0-M1.adoc

@@ -0,0 +1,86 @@
+[[release-notes-6.0.0-M1]]
+== 6.0.0-M1
+
+*Date of Release:* ❓
+
+*Scope:* ❓
+
+For a complete list of all _closed_ issues and pull requests for this release, consult the
+link:{junit5-repo}+/milestone/87?closed=1+[6.0.0-M1] milestone page in the JUnit
+repository on GitHub.
+
+
+[[release-notes-6.0.0-M1-overall-improvements]]
+=== Overall Improvements
+
+[[release-notes-6.0.0-M1-overall-bug-fixes]]
+==== Bug Fixes
+
+* ❓
+
+[[release-notes-6.0.0-M1-overall-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* Minimum required Java version is now Java 17.
+
+[[release-notes-6.0.0-M1-overall-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-6.0.0-M1-junit-platform]]
+=== JUnit Platform
+
+[[release-notes-6.0.0-M1-junit-platform-bug-fixes]]
+==== Bug Fixes
+
+* ❓
+
+[[release-notes-6.0.0-M1-junit-platform-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* ❓
+
+[[release-notes-6.0.0-M1-junit-platform-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-6.0.0-M1-junit-jupiter]]
+=== JUnit Jupiter
+
+[[release-notes-6.0.0-M1-junit-jupiter-bug-fixes]]
+==== Bug Fixes
+
+* ❓
+
+[[release-notes-6.0.0-M1-junit-jupiter-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* ❓
+
+[[release-notes-6.0.0-M1-junit-jupiter-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓
+
+
+[[release-notes-6.0.0-M1-junit-vintage]]
+=== JUnit Vintage
+
+[[release-notes-6.0.0-M1-junit-vintage-bug-fixes]]
+==== Bug Fixes
+
+* ❓
+
+[[release-notes-6.0.0-M1-junit-vintage-deprecations-and-breaking-changes]]
+==== Deprecations and Breaking Changes
+
+* ❓
+
+[[release-notes-6.0.0-M1-junit-vintage-new-features-and-improvements]]
+==== New Features and Improvements
+
+* ❓

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