Skip to content

Commit 9df1530

Browse files
committed
Restrict more versions of JUnit-dependencies in pde.unit.runtime.tests
and define runtime requirements in the MANIFEST.MF with proper version-ranges instead of in the pom.xml with unbound versions. Required for - #2013
1 parent 7f0b12b commit 9df1530

File tree

5 files changed

+8
-25
lines changed

5 files changed

+8
-25
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ 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)"
20+
junit-jupiter-api;bundle-version="[5.14.0,6.0.0)",
21+
org.eclipse.jdt.junit4.runtime;bundle-version="[1.3.0,2.0.0)",
22+
org.eclipse.jdt.junit5.runtime;bundle-version="[1.1.0,2.0.0)",
23+
org.eclipse.pde.junit.runtime;bundle-version="[3.8.0,4.0.0)"
2124
Import-Package: org.assertj.core.api;version="3.14.0",
2225
org.junit,
2326
org.junit.rules,

ui/org.eclipse.pde.junit.runtime.tests/pom.xml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,6 @@
4949
<id>org.eclipse.osgi.compatibility.state</id>
5050
<versionRange>0.0.0</versionRange>
5151
</requirement>
52-
<requirement>
53-
<type>eclipse-plugin</type>
54-
<id>junit-jupiter-api</id>
55-
<versionRange>0.0.0</versionRange>
56-
</requirement>
57-
<requirement>
58-
<type>eclipse-plugin</type>
59-
<id>org.eclipse.jdt.junit4.runtime</id>
60-
<versionRange>0.0.0</versionRange>
61-
</requirement>
62-
<requirement>
63-
<type>eclipse-plugin</type>
64-
<id>org.eclipse.jdt.junit5.runtime</id>
65-
<versionRange>0.0.0</versionRange>
66-
</requirement>
67-
<requirement>
68-
<type>eclipse-plugin</type>
69-
<id>org.eclipse.pde.junit.runtime</id>
70-
<versionRange>0.0.0</versionRange>
71-
</requirement>
7252
</extraRequirements>
7353
</dependency-resolution>
7454
</configuration>

ui/org.eclipse.pde.junit.runtime.tests/test-bundles/verification.tests.junit4.platform/META-INF/MANIFEST.MF

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ Bundle-Version: 1.0.0.qualifier
66
Automatic-Module-Name: verification.tests
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
88
Require-Bundle: org.junit;bundle-version="4.12.0",
9-
junit-platform-runner;bundle-version="1.4.0",
10-
junit-jupiter-api;bundle-version="5.4.0"
9+
junit-platform-runner;bundle-version="[1.4.0,2.0.0)",
10+
junit-jupiter-api;bundle-version="[5.4.0,6.0.0)"
1111
Export-Package: verification.tests.junit4.platform

ui/org.eclipse.pde.junit.runtime.tests/test-bundles/verification.tests.junit5.suite/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ Bundle-SymbolicName: verification.tests.junit5.suite
55
Bundle-Version: 1.0.0.qualifier
66
Automatic-Module-Name: verification.tests
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8-
Require-Bundle: junit-platform-suite-api;bundle-version="1.8.1",
8+
Require-Bundle: junit-platform-suite-api;bundle-version="[1.8.1,2.0.0)",
99
verification.tests.junit5
1010
Export-Package: verification.tests.junit5.suite

ui/org.eclipse.pde.junit.runtime.tests/test-bundles/verification.tests.junit5/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Bundle-SymbolicName: verification.tests.junit5
55
Bundle-Version: 1.0.0.qualifier
66
Automatic-Module-Name: verification.tests
77
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
8-
Require-Bundle: junit-jupiter-api;bundle-version="5.4.0"
8+
Require-Bundle: junit-jupiter-api;bundle-version="[5.4.0,6.0.0)"
99
Export-Package: verification.tests.junit5

0 commit comments

Comments
 (0)