Only support latest JUnit 5

Historically Tycho has multiple providers for JUnit 5 to support
different version. This has different drawbacks like maintenance burden
and actually if one is coding against the JUnit 4 API there should be no
immediate need to use older versions. Also as Tycho is loading providers
from the maven classpath users that really require an older version can
always choose to stay on a previous release (of Tycho) for that part
like it is already possible with JDT compiler.

Because of this we should from now on only ever support one (preferably
the latest) JUnit 5 release and make it automatic updateable.

Author: laeubi

RELEASE_NOTES.md

@@ -438,6 +438,21 @@ Alternatively the new `mirror-target-platform` mojo can be used.
 Tycho for a long time has shipped with support for older JUnit 3/4 versions.
 As JUnit 3/4 is actually EOL we no longer support version before 4.7 anymore.
 
+For users that are previously have used a specific provider in their configuration (like `junit47`) this means they need
+to change that to use only `junit4` from now on.
+
+### Only one JUnit 5 provider
+
+Historically Tycho has multiple providers for JUnit 5 to support different version. As Tycho is loading providers from
+the maven classpath users that really require an older version can always choose to stay on a previous release (of Tycho)
+for that part like it is already possible with JDT compiler.
+
+Because of this Tycho will now only ship with one JUnit 5 provider that is updated alongside with the JUnit 5 release
+like we already do for other dependencies like Eclipse Platform.
+
+For users that are previously have used a specific provider in their configuration (like `junit59`) this means they need
+to change that to use only `junit5` from now on.
+
 ## 4.0.8
 
 backports:

tycho-surefire/org.eclipse.tycho.surefire.junit47/.gitignore renamed to tycho-surefire/org.eclipse.tycho.surefire.junit4/.gitignore

@@ -17,9 +17,9 @@
 		<artifactId>tycho-surefire</artifactId>
 		<version>5.0.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>org.eclipse.tycho.surefire.junit47</artifactId>
+	<artifactId>org.eclipse.tycho.surefire.junit4</artifactId>
 	<packaging>jar</packaging>
-	<name>Tycho Surefire OSGi JUnit 4.7 Runner</name>
+	<name>Tycho Surefire OSGi JUnit 4.x Runner</name>
 	<build>
 		<plugins>
 			<plugin>

tycho-surefire/org.eclipse.tycho.surefire.junit47/.settings/org.eclipse.jdt.core.prefs renamed to tycho-surefire/org.eclipse.tycho.surefire.junit4/.settings/org.eclipse.jdt.core.prefs

@@ -1,12 +1,13 @@
 Import-Package: \
 	org.junit.jupiter.api.*;version='[5,6)',\
-	org.junit.runner.*;resolution:=optional;version='[4.12,5)',\
-	org.junit.runners.*;resolution:=optional;version='[4.12,5)',\
-	org.junit.experimental.categories;resolution:=optional;version='[4.12,5)',\
-	org.junit.internal.*;version='[4.12,5)';resolution:=optional,\
-	org.junit;resolution:=optional;version='[4.12,5)',\
+	org.junit.platform.suite.api;resolution:=optional;version='[1,2)',\
+	org.opentest4j;version='[1.2,2)',\
 	!org.apache.maven.surefire.*,\
 	!org.apache.maven.plugin.surefire.*,\
 	*
 Fragment-Host: org.eclipse.tycho.surefire.osgibooter
--removeheaders: Tool, Bnd-*, Created-By, Private-Package
+# The JUnit Runner is still compatible with Java 1.8, as all included upstream dependencies are.
+# (This is checked in the tycho-surefire-plugin's pom.xml. See execution 'enforce-runtime-jdk-compatibility'.)
+Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
+-removeheaders: Tool, Bnd-*, Created-By, Private-Package
+-fixupmessages "Classes found in the wrong directory"; is:=warning

tycho-surefire/org.eclipse.tycho.surefire.junit47/.settings/org.eclipse.jdt.ui.prefs renamed to tycho-surefire/org.eclipse.tycho.surefire.junit4/.settings/org.eclipse.jdt.ui.prefs

@@ -19,11 +19,11 @@
 	</parent>
 	<artifactId>org.eclipse.tycho.surefire.junit5</artifactId>
 	<packaging>jar</packaging>
-	<name>Tycho Surefire OSGi JUnit 5 Runner</name>
+	<name>Tycho Surefire OSGi JUnit 5.x Runner</name>
 	<properties>
 		<!-- When updating JUnit version(s), double-check Import-Package statements generated by bnd-maven-plugin and possibly adapt instructions in bnd.bnd  -->
-		<junit-platform-version>1.0.3</junit-platform-version>
-		<junit-jupiter-version>5.0.3</junit-jupiter-version>
+		<junit-platform-version>1.9.1</junit-platform-version>
+		<junit-jupiter-version>5.9.1</junit-jupiter-version>
 	</properties>
 	<build>
 		<plugins>
@@ -63,24 +63,29 @@
 							<version>${junit-jupiter-version}</version>
 						</artifactItem>
 						<artifactItem>
-							<groupId>org.apache.maven.surefire</groupId>
-							<artifactId>common-java5</artifactId>
-							<version>${surefire-version}</version>
+							<groupId>org.junit.platform</groupId>
+							<artifactId>junit-platform-suite-api</artifactId>
+							<version>${junit-platform-version}</version>
+						</artifactItem>
+						<artifactItem>
+							<groupId>org.junit.platform</groupId>
+							<artifactId>junit-platform-suite-commons</artifactId>
+							<version>${junit-platform-version}</version>
 						</artifactItem>
 						<artifactItem>
-							<groupId>org.junit.vintage</groupId>
-							<artifactId>junit-vintage-engine</artifactId>
-							<version>4.12.3</version>
+							<groupId>org.junit.platform</groupId>
+							<artifactId>junit-platform-suite-engine</artifactId>
+							<version>${junit-platform-version}</version>
 						</artifactItem>
 						<artifactItem>
-							<groupId>org.opentest4j</groupId>
-							<artifactId>opentest4j</artifactId>
-							<version>1.0.0</version>
+							<groupId>org.apache.maven.surefire</groupId>
+							<artifactId>common-java5</artifactId>
+							<version>${surefire-version}</version>
 						</artifactItem>
 						<artifactItem>
 							<groupId>org.apiguardian</groupId>
 							<artifactId>apiguardian-api</artifactId>
-							<version>1.0.0</version>
+							<version>1.1.2</version>
 						</artifactItem>
 					</artifactItems>
 				</configuration>

tycho-surefire/org.eclipse.tycho.surefire.junit47/bnd.bnd renamed to tycho-surefire/org.eclipse.tycho.surefire.junit4/bnd.bnd

@@ -1,4 +1,2 @@
-# Manual merge of META-INF/services/org.junit.platform.engine.TestEngine of both junit-vintage-engine and junit-jupiter-engine
-# otherwise only one of the two files would win when extracting dependencies
 org.junit.jupiter.engine.JupiterTestEngine
-org.junit.vintage.engine.VintageTestEngine
+org.junit.platform.suite.engine.SuiteTestEngine

tycho-surefire/org.eclipse.tycho.surefire.junit47/pom.xml renamed to tycho-surefire/org.eclipse.tycho.surefire.junit4/pom.xml

@@ -22,7 +22,7 @@ <h3>License</h3>
 apply to your use of any object code in the Content.  Check the Redistributor's license that was 
 provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
+and such source code may be obtained at <a href="https://www.eclipse.org">https://www.eclipse.org</a>.</p>
 
 <h3>Third Party Content</h3>
 <p>The Content includes items that have been sourced from third parties as set out below. If you 
@@ -34,36 +34,36 @@ <h4>Surefire Shared Java 5 Provider Base</h4>
 <p>The plug-in includes Surefire Shared Java 5 Provider Base ${surefire-version} developed by the Apache Software Foundation.  Therefore:</p>
 
 <blockquote>
-This product includes software developed by the Apache Software Foundation (<a href="http://www.apache.org/">http://www.apache.org/</a>).
+This product includes software developed by the Apache Software Foundation (<a href="https://www.apache.org/">https://www.apache.org/</a>).
 </blockquote>
 
 <p>Surefire Shared Java 5 Provider Base is:</p>
 
 <blockquote>Copyright 2004-2015 The Apache Software Foundation.</blockquote>
 
 <p>Your use of the Surefire Shared Java 5 Provider Base code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
-in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>.
 
 <p>The Apache attribution <a href="about_files/NOTICE">NOTICE</a> file is included with the Content in accordance with 4d of the Apache License, Version 2.0.</p>
 
-<p>Examples and documentation as well as updated source code for Surefire Shared Java 5 Provider Base is available at <a href="http://maven.apache.org/surefire/">http://maven.apache.org/surefire/</a>.</p>
+<p>Examples and documentation as well as updated source code for Surefire Shared Java 5 Provider Base is available at <a href="https://maven.apache.org/surefire/">https://maven.apache.org/surefire/</a>.</p>
 
 <h4>opentest4j</h4>
 <p>The plug-in includes opentest4j 1.0.0.
 <p>Your use of the opentest4j code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
-in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>.
 <p>Examples and documentation as well as updated source code for opentest4j is available at <a href="https://github.com/ota4j-team/opentest4j/">https://github.com/ota4j-team/opentest4j/</a>.</p>
 
 <h4>API Guardian</h4>
 <p>The plug-in includes API Guardian 1.0.0.
 <p>Your use of the API Guardian code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
-in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>.
 <p>Examples and documentation as well as updated source code for opentest4j is available at <a href="https://github.com/apiguardian-team/apiguardian/">https://github.com/apiguardian-team/apiguardian/</a>.</p>
 
 <h4>junit-platform-surefire-provider</h4>
 <p>The plug-in includes junit-platform-surefire-provider ${junit-platform-version}.
 <p>Your use of the junit-platform-surefire-provider code is subject to the terms and conditions of the Apache Software License 2.0.  A copy of the license is contained
-in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="http://www.apache.org/licenses/LICENSE-2.0.html">http://www.apache.org/licenses/LICENSE-2.0.html</a>.
+in the file <a href="about_files/LICENSE">LICENSE</a> and is also available at <a href="https://www.apache.org/licenses/LICENSE-2.0.html">https://www.apache.org/licenses/LICENSE-2.0.html</a>.
 <p>Examples and documentation as well as updated source code for junit-platform-surefire-provider is available at <a href="https://github.com/junit-team/junit5/">https://github.com/junit-team/junit5/</a>.</p>
 
 <h4>junit-jupiter-engine, junit-vintage-engine, junit-platform-commons, junit-platform-engine, junit-platform-launcher</h4>