Skip to content

feat: upgrade to JUnit 6 + Eclipse 4.39 (simrel 2026-03) #1327

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

Open
joaodinissf wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: upgrade to JUnit 6 + Eclipse 4.39 (simrel 2026-03) #1327

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
11 changes: 9 additions & 2 deletions com.avaloq.tools.ddk.xtext.test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<configuration>
<trimStackTrace>false</trimStackTrace>
<skip>false</skip>
<providerHint>junit6</providerHint>
<testClass>${test.testClass}</testClass>
<failIfNoTests>false</failIfNoTests>
<useUIThread>false</useUIThread>
Expand Down Expand Up @@ -48,9 +49,15 @@
<id>org.eclipse.xtext.sdk</id>
<versionRange>0.0.0</versionRange>
</requirement>
<!--
org.eclipse.pde feature group is replaced in ddk-target/ddk.target by an
explicit list of pde.core / pde.ui / pde.ua.core / pde.junit.runtime so we
avoid pulling jdt.junit5.runtime (which strict-pins JUnit 5.14.x and conflicts
with our JUnit 6 stack).
-->
<requirement>
<type>eclipse-feature</type>
<id>org.eclipse.pde</id>
<type>eclipse-plugin</type>
<id>org.eclipse.pde.junit.runtime</id>
<versionRange>0.0.0</versionRange>
</requirement>
<requirement>
Expand Down
55 changes: 32 additions & 23 deletions ddk-target/ddk.target
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,29 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
<target name="DDK Target" sequenceNumber="28">
<target name="DDK Target" sequenceNumber="29">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
<unit id="org.eclipse.swtbot.junit5.feature.group" version="0.0.0"/>
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.2.1/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
<!-- Curated bundle list instead of org.eclipse.pde.feature.group: that aggregator pulls
BOTH org.eclipse.jdt.junit5.runtime (which strict-pins JUnit 5.14.x) AND
org.eclipse.jdt.junit6.runtime (JUnit 6.x), producing the dual-version pollution
that crashed test discovery in PR #1292's silent-zero. The bundles below are the
minimum DDK actually uses (verified via static analysis of all MANIFEST.MFs and
src/ Java/Xtend imports); pde.junit.runtime + jdt.junit.runtime supply the OSGi-side
test launcher and depend only on the version-agnostic jdt.junit.runtime base. -->
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
<unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
<unit id="org.eclipse.pde.core" version="0.0.0"/>
<unit id="org.eclipse.pde.ui" version="0.0.0"/>
<unit id="org.eclipse.pde.ua.core" version="0.0.0"/>
<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
<unit id="org.eclipse.jdt.junit.runtime" version="0.0.0"/>
<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
<repository location="https://download.eclipse.org/releases/2026-03/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
Expand All @@ -35,32 +44,32 @@
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
<unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.42.0/"/>
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.43.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/lsp4j/updates/releases/1.0.0/"/>
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.37.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.17.7"/>
<unit id="org.objenesis" version="3.4.0"/>
<unit id="org.mockito.mockito-core" version="5.19.0"/>
<repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.39.0"/>
<unit id="net.bytebuddy.byte-buddy" version="1.18.5"/>
<unit id="org.objenesis" version="3.5.0"/>
<unit id="org.mockito.mockito-core" version="5.21.0"/>
<unit id="org.hamcrest" version="2.2.0"/>
<unit id="org.apache.commons.logging" version="1.2.0"/>
<unit id="org.apache.commons.text" version="1.14.0"/>
<unit id="org.apache.commons.lang3" version="3.18.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.1"/>
<unit id="org.apache.logging.log4j.api" version="2.25.1"/>
<unit id="org.apache.commons.text" version="1.15.0"/>
<unit id="org.apache.commons.lang3" version="3.20.0"/>
<unit id="org.apache.logging.log4j.core" version="2.25.3"/>
<unit id="org.apache.logging.log4j.api" version="2.25.3"/>
<unit id="org.apache.log4j" version="1.2.26"/> <!--use reload4j 1.2.26 for org.eclipse.xtext dependencies to log4j-->
<unit id="junit-jupiter-api" version="5.13.4"/>
<unit id="junit-jupiter-engine" version="5.13.4"/>
<unit id="junit-jupiter-params" version="5.13.4"/>
<unit id="junit-platform-commons" version="1.13.4"/>
<unit id="junit-platform-engine" version="1.13.4"/>
<unit id="junit-platform-launcher" version="1.13.4"/>
<unit id="junit-platform-suite-api" version="1.13.4"/>
<unit id="junit-platform-suite-engine" version="1.13.4"/>
<unit id="junit-jupiter-api" version="6.0.3"/>
<unit id="junit-jupiter-engine" version="6.0.3"/>
<unit id="junit-jupiter-params" version="6.0.3"/>
<unit id="junit-platform-commons" version="6.0.3"/>
<unit id="junit-platform-engine" version="6.0.3"/>
<unit id="junit-platform-launcher" version="6.0.3"/>
<unit id="junit-platform-suite-api" version="6.0.3"/>
<unit id="junit-platform-suite-engine" version="6.0.3"/>
</location>
</locations>
</target>
Loading