From d493f11dd1703010467d70a80c033b85e95e22ab Mon Sep 17 00:00:00 2001
From: Carlos Macasaet <github@carlos-m.net>
Date: Sun, 18 Oct 2020 14:52:52 -0700
Subject: [PATCH] Document Vintage parallel execution support

This updates the user guide and release notes with details on concurrent
test execution.

Issue: #2229
---
 .../docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc   | 2 ++
 .../src/docs/asciidoc/user-guide/migration-from-junit4.adoc   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
index 39f7d951b9c8..499883b5caf2 100644
--- a/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
+++ b/documentation/src/docs/asciidoc/release-notes/release-notes-5.8.0-M1.adoc
@@ -62,4 +62,6 @@ on GitHub.
 
 ==== New Features and Improvements
 
+* Tests can now be run in parallel by setting the appropriate `junit.jupiter.execution.parallel`
+  parameters. This is compatible with the Maven Surefire and Failsafe plugins.
 * ❓
diff --git a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
index b3fb1ded6ed8..01364cdc3fee 100644
--- a/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
+++ b/documentation/src/docs/asciidoc/user-guide/migration-from-junit4.adoc
@@ -21,7 +21,9 @@ developers have plenty of time to migrate to JUnit Jupiter on their own schedule
 
 Just make sure that the `junit-vintage-engine` artifact is in your test runtime path. In
 that case JUnit 3 and JUnit 4 tests will automatically be picked up by the JUnit Platform
-launcher.
+launcher. Limited parallel execution is supported by setting the
+`junit.jupiter.execution.parallel.enabled` configuration parameter to `true`. In addition, the
+JUnit concurrency settings in `junit.jupiter.execution.parallel.config.*` are also supported.
 
 See the example projects in the {junit5-samples-repo}[`junit5-samples`] repository to
 find out how this is done with Gradle and Maven.