Skip to content

Commit 5107605

Browse files
marcphilippmarcphilipp
committed
Bump and align versions to 6.0.0-SNAPSHOT
1 parent 65c9cba commit 5107605

File tree

48 files changed

+111
-182
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+111
-182
lines changed

‎.github/workflows/release.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -248,16 +248,13 @@ jobs:
248248
with:
249249
script: |
250250
const releaseVersion = "${{ github.event.inputs.releaseVersion }}";
251-
const jupiterVersion = releaseVersion;
252-
const vintageVersion = releaseVersion;
253-
const platformVersion = "1." + releaseVersion.substring(2);
254251
const requestBody = {
255252
owner: context.repo.owner,
256253
repo: context.repo.repo,
257254
tag_name: `r${releaseVersion}`,
258255
name: `JUnit ${releaseVersion}`,
259256
generate_release_notes: true,
260-
body: `JUnit ${jupiterVersion} = Platform ${platformVersion} + Jupiter ${jupiterVersion} + Vintage ${vintageVersion}\n\nSee [Release Notes](https://junit.org/junit5/docs/${releaseVersion}/release-notes/).`,
257+
body: `JUnit ${releaseVersion} = Platform ${releaseVersion} + Jupiter ${releaseVersion} + Vintage ${releaseVersion}\n\nSee [Release Notes](https://junit.org/junit5/docs/${releaseVersion}/release-notes/).`,
261258
prerelease: releaseVersion.includes("-"),
262259
};
263260
console.log(requestBody);

‎RELEASING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
## Pre-release steps
44

55
- [ ] Switch or create the release branch for this feature release (e.g. `releases/5.12.x`)
6-
- [ ] Change `version`, `platformVersion`, and `vintageVersion` in `gradle.properties` to the versions about to be released
6+
- [ ] Change `version` in `gradle.properties` to the versions about to be released
77
- [ ] Change release date in Release Notes
88
- [ ] Change release date in `README.MD`
99
- [ ] Commit with message "Release ${VERSION}"
1010
- [ ] Execute `./gradlew --no-build-cache --no-configuration-cache clean build publish closeSonatypeStagingRepository`
1111
- [ ] Tag current commit: `git tag -s -m ${VERSION} r${VERSION}`
12-
- [ ] 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
12+
- [ ] Change `version` in `gradle.properties` on release branch to new development versions and commit with message "Back to snapshots for further development" or similar
1313
- [ ] Push release branch and tag to GitHub: `git push --set-upstream --follow-tags origin HEAD`
1414
- [ ] 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`
1515
- Select the release branch

‎documentation/documentation.gradle.kts

+1-7
Original file line numberDiff line numberDiff line change
@@ -295,15 +295,9 @@ tasks {
295295
// Temporary workaround for https://github.com/asciidoctor/asciidoctor-gradle-plugin/issues/599
296296
inputs.dir(sourceDir).withPropertyName("sourceDir").withPathSensitivity(RELATIVE)
297297

298-
val platformVersion: String by project
299-
val vintageVersion: String by project
300-
301298
attributeProviders += AsciidoctorAttributeProvider {
302299
mapOf(
303-
"jupiter-version" to version,
304-
"platform-version" to platformVersion,
305-
"vintage-version" to vintageVersion,
306-
"bom-version" to version,
300+
"version" to version,
307301
"junit4-version" to libs.versions.junit4.get(),
308302
"apiguardian-version" to libs.versions.apiguardian.get(),
309303
"ota4j-version" to libs.versions.opentest4j.get(),

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ using Gradle's Build Cache.
6363
.Groovy DSL
6464
----
6565
dependencies {
66-
testRuntimeOnly("org.junit.platform:junit-platform-reporting:{platform-version}")
66+
testRuntimeOnly("org.junit.platform:junit-platform-reporting:{version}")
6767
}
6868
tasks.withType(Test).configureEach {
6969
def outputDir = reports.junitXml.outputLocation
@@ -81,7 +81,7 @@ tasks.withType(Test).configureEach {
8181
.Kotlin DSL
8282
----
8383
dependencies {
84-
testRuntimeOnly("org.junit.platform:junit-platform-reporting:{platform-version}")
84+
testRuntimeOnly("org.junit.platform:junit-platform-reporting:{version}")
8585
}
8686
tasks.withType<Test>().configureEach {
8787
val outputDir = reports.junitXml.outputLocation
@@ -109,7 +109,7 @@ XML reports as follows:
109109
<dependency>
110110
<groupId>org.junit.platform</groupId>
111111
<artifactId>junit-platform-reporting</artifactId>
112-
<version>{platform-version}</version>
112+
<version>{version}</version>
113113
<scope>test</scope>
114114
</dependency>
115115
</dependencies>
@@ -140,7 +140,7 @@ output by setting the configuration parameters via `--config`:
140140

141141
[source,console,subs=attributes+]
142142
----
143-
$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
143+
$ java -jar junit-platform-console-standalone-{version}.jar <OPTIONS> \
144144
--config=junit.platform.reporting.open.xml.enabled=true \
145145
--config=junit.platform.reporting.output.dir=reports
146146
----
@@ -150,7 +150,7 @@ classpath resource via the `--config-resource` option:
150150

151151
[source,console,subs=attributes+]
152152
----
153-
$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
153+
$ java -jar junit-platform-console-standalone-{version}.jar <OPTIONS> \
154154
--config-resource=configuration.properties
155155
----
156156

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

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

1111
[[testkit-engine]]

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Please refer to the corresponding sections for <<running-tests-build-maven-bom,
4545
==== JUnit Platform
4646

4747
* *Group ID*: `org.junit.platform`
48-
* *Version*: `{platform-version}`
48+
* *Version*: `{version}`
4949
* *Artifact IDs*:
5050
`junit-platform-commons`::
5151
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,
9494
==== JUnit Jupiter
9595

9696
* *Group ID*: `org.junit.jupiter`
97-
* *Version*: `{jupiter-version}`
97+
* *Version*: `{version}`
9898
* *Artifact IDs*:
9999
`junit-jupiter`::
100100
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,
114114
==== JUnit Vintage
115115

116116
* *Group ID*: `org.junit.vintage`
117-
* *Version*: `{vintage-version}`
117+
* *Version*: `{version}`
118118
* *Artifact ID*:
119119
`junit-vintage-engine`::
120120
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
131131

132132
* *Group ID*: `org.junit`
133133
* *Artifact ID*: `junit-bom`
134-
* *Version*: `{bom-version}`
134+
* *Version*: `{version}`
135135

136136
[[dependency-metadata-dependencies]]
137137
==== Dependencies

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

+19-19
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ however, that it is recommended to use IDEA 2017.3 or newer since more recent ve
1313
IDEA download the following JARs automatically based on the API version used in the
1414
project: `junit-platform-launcher`, `junit-jupiter-engine`, and `junit-vintage-engine`.
1515

16-
In order to use a different JUnit 5 version (e.g., {jupiter-version}), you may need to
16+
In order to use a different JUnit 5 version (e.g., {version}), you may need to
1717
include the corresponding versions of the `junit-platform-launcher`,
1818
`junit-jupiter-engine`, and `junit-vintage-engine` JARs in the classpath.
1919

2020
.Additional Gradle Dependencies
2121
[source,groovy]
2222
[subs=attributes+]
2323
----
24-
testImplementation(platform("org.junit:junit-bom:{bom-version}"))
24+
testImplementation(platform("org.junit:junit-bom:{version}"))
2525
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
2626
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")
2727
testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
@@ -54,7 +54,7 @@ testRuntimeOnly("org.junit.vintage:junit-vintage-engine")
5454
<dependency>
5555
<groupId>org.junit</groupId>
5656
<artifactId>junit-bom</artifactId>
57-
<version>{bom-version}</version>
57+
<version>{version}</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -160,7 +160,7 @@ versions of all JUnit 5 artifacts.
160160
.Explicit platform dependency on the BOM
161161
----
162162
dependencies {
163-
testImplementation(platform("org.junit:junit-bom:{bom-version}"))
163+
testImplementation(platform("org.junit:junit-bom:{version}"))
164164
testImplementation("org.junit.jupiter:junit-jupiter")
165165
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
166166
}
@@ -181,7 +181,7 @@ artifacts.
181181
.Implicit platform dependency on the BOM
182182
----
183183
dependencies {
184-
testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}") // <1>
184+
testImplementation("org.junit.jupiter:junit-jupiter:{version}") // <1>
185185
testRuntimeOnly("org.junit.platform:junit-platform-launcher") // <2>
186186
}
187187
----
@@ -212,7 +212,7 @@ on the dependency-aggregating JUnit Jupiter artifact similar to the following.
212212
[subs=attributes+]
213213
----
214214
dependencies {
215-
testImplementation("org.junit.jupiter:junit-jupiter:{jupiter-version}")
215+
testImplementation("org.junit.jupiter:junit-jupiter:{version}")
216216
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
217217
}
218218
----
@@ -228,7 +228,7 @@ support.
228228
testing {
229229
suites {
230230
named<JvmTestSuite>("test") {
231-
useJUnitJupiter("{jupiter-version}")
231+
useJUnitJupiter("{version}")
232232
}
233233
}
234234
}
@@ -241,7 +241,7 @@ testing {
241241
testing {
242242
suites {
243243
test {
244-
useJUnitJupiter("{jupiter-version}")
244+
useJUnitJupiter("{version}")
245245
}
246246
}
247247
}
@@ -256,7 +256,7 @@ implementation similar to the following.
256256
----
257257
dependencies {
258258
testImplementation("junit:junit:{junit4-version}")
259-
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{vintage-version}")
259+
testRuntimeOnly("org.junit.vintage:junit-vintage-engine:{version}")
260260
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
261261
}
262262
----
@@ -337,7 +337,7 @@ Maven build as follows.
337337
<dependency>
338338
<groupId>org.junit.platform</groupId>
339339
<artifactId>junit-platform-launcher</artifactId>
340-
<version>{platform-version}</version>
340+
<version>{version}</version>
341341
<scope>test</scope>
342342
</dependency>
343343
----
@@ -358,7 +358,7 @@ versions of all JUnit 5 artifacts.
358358
<dependency>
359359
<groupId>org.junit</groupId>
360360
<artifactId>junit-bom</artifactId>
361-
<version>{bom-version}</version>
361+
<version>{version}</version>
362362
<type>pom</type>
363363
<scope>import</scope>
364364
</dependency>
@@ -391,7 +391,7 @@ following.
391391
<dependency>
392392
<groupId>org.junit.jupiter</groupId>
393393
<artifactId>junit-jupiter</artifactId>
394-
<version>{jupiter-version}</version> <!-- can be omitted when using the BOM -->
394+
<version>{version}</version> <!-- can be omitted when using the BOM -->
395395
<scope>test</scope>
396396
</dependency>
397397
<!-- ... -->
@@ -430,7 +430,7 @@ long as you configure `test` scoped dependencies on JUnit 4 and the JUnit Vintag
430430
<dependency>
431431
<groupId>org.junit.vintage</groupId>
432432
<artifactId>junit-vintage-engine</artifactId>
433-
<version>{vintage-version}</version> <!-- can be omitted when using the BOM -->
433+
<version>{version}</version> <!-- can be omitted when using the BOM -->
434434
<scope>test</scope>
435435
</dependency>
436436
<!-- ... -->
@@ -659,7 +659,7 @@ With Gradle you can override the JUnit Jupiter version by including the followin
659659
[source,groovy,indent=0]
660660
[subs=attributes+]
661661
----
662-
ext['junit-jupiter.version'] = '{jupiter-version}'
662+
ext['junit-jupiter.version'] = '{version}'
663663
----
664664

665665
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
669669
[subs=attributes+]
670670
----
671671
<properties>
672-
<junit-jupiter.version>{jupiter-version}</junit-jupiter.version>
672+
<junit-jupiter.version>{version}</junit-jupiter.version>
673673
</properties>
674674
----
675675

@@ -680,7 +680,7 @@ The `{ConsoleLauncher}` is a command-line Java application that lets you launch
680680
Platform from the console. For example, it can be used to run JUnit Vintage and JUnit
681681
Jupiter tests and print test execution results to the console.
682682

683-
An executable _Fat JAR_ (`junit-platform-console-standalone-{platform-version}.jar`) that
683+
An executable _Fat JAR_ (`junit-platform-console-standalone-{version}.jar`) that
684684
contains the contents of all of its dependencies is published in the {Maven_Central}
685685
repository under the
686686
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.
711711

712712
[source,console,subs=attributes+]
713713
----
714-
$ java -jar junit-platform-console-standalone-{platform-version}.jar execute <OPTIONS>
714+
$ java -jar junit-platform-console-standalone-{version}.jar execute <OPTIONS>
715715
716716
├─ JUnit Vintage
717717
│ └─ example.JUnit4Tests
@@ -820,7 +820,7 @@ files using the `--redirect-stdout` and `--redirect-stderr` options:
820820

821821
[source,console,subs=attributes+]
822822
----
823-
$ java -jar junit-platform-console-standalone-{platform-version}.jar <OPTIONS> \
823+
$ java -jar junit-platform-console-standalone-{version}.jar <OPTIONS> \
824824
--redirect-stdout=stdout.txt \
825825
--redirect-stderr=stderr.txt
826826
----
@@ -1255,7 +1255,7 @@ to a problem.
12551255
In order to record Flight Recorder events generated while running tests, you need to:
12561256

12571257
1. Ensure that you are using either Java 8 Update 262 or higher or Java 11 or later.
1258-
2. Provide the `org.junit.platform.jfr` module (`junit-platform-jfr-{platform-version}.jar`)
1258+
2. Provide the `org.junit.platform.jfr` module (`junit-platform-jfr-{version}.jar`)
12591259
on the class-path or module-path at test runtime.
12601260
3. Start flight recording when launching a test run. Flight Recorder can be started via
12611261
java command line option:

‎gradle.properties

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
group = org.junit
2-
version = 5.13.0-SNAPSHOT
3-
4-
jupiterGroup = org.junit.jupiter
5-
6-
platformGroup = org.junit.platform
7-
platformVersion = 1.13.0-SNAPSHOT
8-
9-
vintageGroup = org.junit.vintage
10-
vintageVersion = 5.13.0-SNAPSHOT
1+
version = 6.0.0-SNAPSHOT
112

123
# We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
134
org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError

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

+5-12
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,11 @@ val jupiterProjects: List<Project> by rootProject
99
val platformProjects: List<Project> by rootProject
1010
val vintageProjects: List<Project> by rootProject
1111

12-
when (project) {
13-
in jupiterProjects -> {
14-
group = property("jupiterGroup")!!
15-
}
16-
in platformProjects -> {
17-
group = property("platformGroup")!!
18-
version = property("platformVersion")!!
19-
}
20-
in vintageProjects -> {
21-
group = property("vintageGroup")!!
22-
version = property("vintageVersion")!!
23-
}
12+
group = when (project) {
13+
in jupiterProjects -> "org.junit.jupiter"
14+
in platformProjects -> "org.junit.platform"
15+
in vintageProjects -> "org.junit.vintage"
16+
else -> "org.junit"
2417
}
2518

2619
// ensure project is built successfully before publishing it

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ dependencies {
1919
tasks {
2020
jar {
2121
bundle {
22-
val platformVersion: String by rootProject.extra
2322
bnd("""
2423
Provide-Capability:\
2524
org.junit.platform.engine;\
2625
org.junit.platform.engine='junit-jupiter';\
2726
version:Version="${'$'}{version_cleanup;${project.version}}"
2827
Require-Capability:\
2928
org.junit.platform.launcher;\
30-
filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${platformVersion}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${platformVersion}}})))';\
29+
filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${project.version}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${project.version}}})))';\
3130
effective:=active
3231
""")
3332
}

‎junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ dependencies {
2121
osgiVerification(libs.openTestReporting.tooling.spi)
2222
}
2323

24-
val jupiterVersion = rootProject.version
25-
val vintageVersion: String by project
26-
2724
tasks {
2825
jar {
2926
manifest {
@@ -76,8 +73,8 @@ tasks {
7673
"Implementation-Title" to project.name,
7774
// Generate test engine version information in single shared manifest file.
7875
// Pattern of key and value: `"Engine-Version-{YourTestEngine#getId()}": "47.11"`
79-
"Engine-Version-junit-jupiter" to jupiterVersion,
80-
"Engine-Version-junit-vintage" to vintageVersion,
76+
"Engine-Version-junit-jupiter" to project.version,
77+
"Engine-Version-junit-vintage" to project.version,
8178
// Version-aware binaries are already included - set Multi-Release flag here.
8279
// See https://openjdk.java.net/jeps/238 for details
8380
// Note: the "jar --update ... --release X" command does not work with the

0 commit comments

Comments
 (0)