Skip to content

Commit e5ecc3a

Browse files
committed
Import only junit-5 packages required for compilation in tests
After a bug fix in Tycho it's not necessary anymore to specify the complete set of junit bundles explicitly, in order to ensure that JUnit-6 bundles are not present: - eclipse-tycho/tycho#5526 This reverts most of the workarounds from - #2004 - #2054
1 parent 4a61b1f commit e5ecc3a

File tree

5 files changed

+8
-24
lines changed
  • build/org.eclipse.pde.build.tests/META-INF
  • ds/org.eclipse.pde.ds.tests/META-INF
  • e4tools/tests
    • org.eclipse.e4.tools.compatibility.migration.tests/META-INF
    • org.eclipse.e4.tools.persistence.tests/META-INF
  • ui/org.eclipse.pde.junit.runtime.tests/META-INF

5 files changed

+8
-24
lines changed

build/org.eclipse.pde.build.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ Require-Bundle: org.eclipse.core.runtime,
1414
org.apache.ant,
1515
org.eclipse.debug.core,
1616
org.eclipse.equinox.p2.publisher;bundle-version="1.1.0",
17-
org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0",
18-
junit-jupiter-api;bundle-version="[5.14.0,6.0.0)"
17+
org.eclipse.equinox.p2.publisher.eclipse;bundle-version="1.0.0"
1918
Bundle-RequiredExecutionEnvironment: JavaSE-17
2019
Import-Package: org.eclipse.equinox.frameworkadmin;version="2.0.0",
2120
org.eclipse.equinox.internal.p2.artifact.repository,

ds/org.eclipse.pde.ds.tests/META-INF/MANIFEST.MF

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,13 @@ Bundle-Activator: org.eclipse.pde.internal.ds.tests.Activator
77
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
88
org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
99
org.eclipse.pde.ds.core;bundle-version="[1.0.0,2.0.0)",
10-
org.eclipse.text;bundle-version="[3.3.0,4.0.0)",
11-
junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
12-
junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
13-
junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
14-
junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)",
15-
junit-platform-suite-commons;bundle-version="[1.14.0,2.0.0)",
16-
junit-platform-suite-engine;bundle-version="[1.14.0,2.0.0)"
10+
org.eclipse.text;bundle-version="[3.3.0,4.0.0)"
1711
Bundle-ActivationPolicy: lazy
1812
Bundle-RequiredExecutionEnvironment: JavaSE-17
1913
Bundle-Localization: plugin
2014
Bundle-Vendor: %providerName
2115
Export-Package: org.eclipse.pde.internal.ds.tests;x-internal:=true
16+
Import-Package: org.junit.jupiter.api;version="[5.13.0,6.0.0)",
17+
org.junit.platform.suite.api;version="[1.13.0,2.0.0)"
2218
Eclipse-BundleShape: dir
2319
Automatic-Module-Name: org.eclipse.pde.ds.tests

e4tools/tests/org.eclipse.e4.tools.compatibility.migration.tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,6 @@ Require-Bundle: org.eclipse.swt;bundle-version="[3.110.0,4.0.0)",
1212
org.eclipse.e4.ui.model.workbench;bundle-version="[2.1.0,3.0.0)",
1313
org.junit;bundle-version="[4.12.0,5.0.0)",
1414
org.eclipse.core.runtime;bundle-version="[3.29.0,4.0.0)",
15-
org.eclipse.ui.tests.harness;bundle-version="[1.8.100,2.0.0)",
16-
junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
17-
junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
18-
junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
19-
junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)",
20-
junit-platform-suite-commons;bundle-version="[1.14.0,2.0.0)",
21-
junit-platform-suite-engine;bundle-version="[1.14.0,2.0.0)"
15+
org.eclipse.ui.tests.harness;bundle-version="[1.8.100,2.0.0)"
2216
Bundle-ActivationPolicy: lazy
17+
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)"

e4tools/tests/org.eclipse.e4.tools.persistence.tests/META-INF/MANIFEST.MF

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
1313
org.eclipse.ui.tests.harness,
1414
org.eclipse.e4.tools.persistence,
1515
org.eclipse.e4.core.contexts,
16-
org.eclipse.e4.ui.workbench,
17-
junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
18-
junit-jupiter-engine;bundle-version="[5.14.0,6.0.0)",
19-
junit-platform-launcher;bundle-version="[1.14.0,2.0.0)",
20-
junit-platform-suite-api;bundle-version="[1.14.0,2.0.0)",
21-
junit-platform-suite-commons;bundle-version="[1.14.0,2.0.0)",
22-
junit-platform-suite-engine;bundle-version="[1.14.0,2.0.0)"
16+
org.eclipse.e4.ui.workbench
2317
Bundle-ActivationPolicy: lazy
18+
Import-Package: org.junit.jupiter.api;version="[5.14.0,6.0.0)"

ui/org.eclipse.pde.junit.runtime.tests/META-INF/MANIFEST.MF

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.29.0",
1717
org.eclipse.debug.ui;bundle-version="3.14.200",
1818
org.eclipse.ui;bundle-version="3.114.0",
1919
org.eclipse.pde.ui.tests;bundle-version="3.11.500",
20-
junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
2120
org.eclipse.jdt.junit4.runtime;bundle-version="[1.3.0,2.0.0)",
2221
org.eclipse.jdt.junit5.runtime;bundle-version="[1.1.0,2.0.0)",
2322
org.eclipse.pde.junit.runtime;bundle-version="[3.8.0,4.0.0)"

0 commit comments

Comments
 (0)