Skip to content

Added JUnit 6 to platform #3399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iloveeclipse merged 1 commit into from
Oct 7, 2025
Merged

Added JUnit 6 to platform #3399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 64 additions & 0 deletions eclipse.platform.releng.prereqs.sdk/eclipse-sdk-prereqs.target
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions eclipse.platform.releng/bundles/org.eclipse.test/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 7 additions & 2 deletions ...atform.releng/bundles/org.eclipse.test/src/org/eclipse/test/LegacyXmlResultFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.sdk.tests"
label="%featureName"
version="4.38.0.qualifier"
version="4.38.100.qualifier"
Copy link
Member

@HannesWell HannesWell Nov 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This version increment should not be necessary (a enforced qualifier-update, if necessary at all, could probably have been sufficient).
In general this version should be aligned with the eclipse release version and the current state breaks the release preparation workflow (respectively the workflow detects the missing version increment and fails).

This is work-around with

provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading