Commit 2ff5804
feat: upgrade to JUnit 6 + Eclipse 4.39 (simrel 2026-03) — milestone Xtext
End-to-end JUnit 6 + Eclipse 4.39 upgrade. Verified locally:
357 tests, 0 failures, 0 errors. The OSGi runtime contains only
JUnit 6.0.3 bundles (no JUnit 5.14.x, no jdt.junit5.runtime).
Two layers of dual-version JUnit pollution had to be peeled back:
1. Eclipse PDE umbrella feature transitively pulls jdt.junit5.runtime
(strict-pinned to JUnit 5.14.x). Workaround: replace
org.eclipse.pde.feature.group in the target with a curated bundle
list of the six PDE bundles DDK uses (pde.core, pde.ui,
pde.ua.core, pde.junit.runtime, jdt.junit.runtime, jdt.annotation).
Verified load-bearing: dropping the curated list and going back to
pde.feature.group makes target resolution unsatisfiable.
2. Xtext 2.42.0's org.eclipse.xtext.testing hard-pins
org.junit.jupiter.api [5.1.0,6.0.0). Fix: eclipse-xtext/xtext#3660
"Junit 6 support" landed in Xtext 2.43.0. This branch points at
the 2.43.0.M2 milestone; a one-line follow-up PR will flip the
URL to releases/2.43.0/ once stable ships on 2026-05-25.
Branch convention exception: this PR uses an Xtext milestone URL
rather than a stable release. The standing project rule is
stable-only. The exception is narrow: blocker fully understood,
upstream fix confirmed in M2, stable date on the horizon, and a
follow-up PR is planned to swap to stable.
Other target file changes:
- sequenceNumber 28 -> 29
- Eclipse SDK location updates/4.34/ -> releases/2026-03/
- Source-feature IUs (platform.source.feature.group, jdt.source.*,
pde.source.*) dropped — renamed in modern simrels and not needed
for headless Tycho test runs.
- swtbot.junit5.feature.group dropped — its feature.xml requires
the JUnit 4 'org.junit' bundle which is no longer in the target,
and DDK doesn't use SWTBotJunit5Extension (verified via static
analysis).
- orbit-aggregation 4.37.0 -> 4.39.0 with JUnit 6.0.3 IUs and
dep versions back to 4.39-era (mockito 5.21.0, byte-buddy
1.18.5, objenesis 3.5.0, commons-lang3 3.20.0, commons-text
1.15.0, log4j 2.25.3).
xtext.test/pom.xml:
- <providerHint>junit5</providerHint> -> <providerHint>junit6</providerHint>
- extraRequirements: replaced the org.eclipse.pde feature requirement
with an explicit org.eclipse.pde.junit.runtime plugin requirement
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent 950b810 commit 2ff5804
2 files changed
Lines changed: 46 additions & 25 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
19 | 19 | | |
20 | 20 | | |
21 | 21 | | |
| 22 | + | |
22 | 23 | | |
23 | 24 | | |
24 | 25 | | |
| |||
48 | 49 | | |
49 | 50 | | |
50 | 51 | | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
51 | 58 | | |
52 | | - | |
53 | | - | |
| 59 | + | |
| 60 | + | |
54 | 61 | | |
55 | 62 | | |
56 | 63 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
10 | 9 | | |
11 | 10 | | |
12 | 11 | | |
13 | | - | |
14 | | - | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
15 | 19 | | |
16 | | - | |
17 | | - | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
18 | 27 | | |
19 | 28 | | |
20 | 29 | | |
| |||
35 | 44 | | |
36 | 45 | | |
37 | 46 | | |
38 | | - | |
| 47 | + | |
| 48 | + | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
39 | 53 | | |
40 | 54 | | |
41 | 55 | | |
42 | 56 | | |
43 | 57 | | |
44 | 58 | | |
45 | | - | |
46 | | - | |
47 | | - | |
48 | | - | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
49 | 63 | | |
50 | 64 | | |
51 | | - | |
52 | | - | |
53 | | - | |
54 | | - | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
55 | 69 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
64 | 78 | | |
65 | 79 | | |
66 | 80 | | |
0 commit comments