Added JUnit 6 to platform

Author: trancexpress

eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target

@@ -792,6 +792,70 @@
 			  </dependency>
 		  </dependencies>
 	  </location>
+	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="JUnit 6" missingManifest="error" type="Maven">
+		  <dependencies>
+			  <dependency>
+				  <groupId>org.junit.jupiter</groupId>
+				  <artifactId>junit-jupiter-api</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.jupiter</groupId>
+				  <artifactId>junit-jupiter-engine</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.jupiter</groupId>
+				  <artifactId>junit-jupiter-migrationsupport</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.jupiter</groupId>
+				  <artifactId>junit-jupiter-params</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.platform</groupId>
+				  <artifactId>junit-platform-commons</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.platform</groupId>
+				  <artifactId>junit-platform-engine</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.platform</groupId>
+				  <artifactId>junit-platform-launcher</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.platform</groupId>
+				  <artifactId>junit-platform-suite-api</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.platform</groupId>
+				  <artifactId>junit-platform-suite-engine</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+			  <dependency>
+				  <groupId>org.junit.vintage</groupId>
+				  <artifactId>junit-vintage-engine</artifactId>
+				  <version>6.0.0</version>
+				  <type>jar</type>
+			  </dependency>
+		  </dependencies>
+	  </location>
 	  <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" label="Jakarta EE" missingManifest="error" type="Maven">
 		  <dependencies>
 			  <dependency>

eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.test; singleton:=true
-Bundle-Version: 3.6.300.qualifier
+Bundle-Version: 3.6.400.qualifier
 Eclipse-BundleShape: dir
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -20,7 +20,6 @@ Import-Package: org.junit.jupiter.api,
  org.junit.platform.launcher,
  org.junit.platform.launcher.core,
  org.junit.platform.commons,
- org.junit.platform.commons.util,
  org.junit.jupiter.engine
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17

eclipse.platform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java

@@ -15,7 +15,9 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.PrintWriter;
 import java.io.Reader;
+import java.io.StringWriter;
 import java.util.Date;
 import java.util.Map;
 import java.util.Optional;
@@ -31,7 +33,6 @@
 import org.apache.tools.ant.taskdefs.optional.junitlauncher.TestResultFormatter;
 import org.apache.tools.ant.util.DOMElementWriter;
 import org.apache.tools.ant.util.DateUtils;
-import org.junit.platform.commons.util.ExceptionUtils;
 import org.junit.platform.engine.TestExecutionResult;
 import org.junit.platform.engine.TestSource;
 import org.junit.platform.engine.reporting.ReportEntry;
@@ -333,7 +334,11 @@ private static void writeIfPresentInMap(XMLStreamWriter writer, TestIdentifier t
 				writer.writeAttribute(ATTR_TYPE, t.getClass().getName());
 
 				if (writeExceptionStackTrace) {
-					writer.writeCharacters(ExceptionUtils.readStackTrace(t));
+					StringWriter stringWriter = new StringWriter();
+					try (PrintWriter printWriter = new PrintWriter(stringWriter)) {
+						t.printStackTrace(printWriter);
+					}
+					writer.writeCharacters(stringWriter.toString());
 				}
 			}
 			writer.writeEndElement();

eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.sdk.tests"
       label="%featureName"
-      version="4.38.0.qualifier"
+      version="4.38.100.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">

eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.test"
       label="%featureName"
-      version="3.9.400.qualifier"
+      version="3.9.500.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">