Skip to content

Commit 60dc886

Browse files
committed
Make dependency from test plugin to OS support implementation explicit
The latest version of PDE calculates the minimal set of required plugins when executing a test case. Because there is no clear dependency from "org.eclipse.wb.so" to its platform-specific implementations, only an incomplete set of plugins is selected, which leads to an OSSupportError during execution. We can add them directly due to their platform filter. So instead the dependency is described via the "Provide-Capability" and "Require-Capability" OSGi headers.
1 parent d055ed1 commit 60dc886

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

org.eclipse.wb.os.linux/META-INF/MANIFEST.MF

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ Import-Package: org.apache.commons.io;version="[2.16.1,3.0.0)",
2020
org.apache.commons.lang3;version="[3.14.0,4.0.0)",
2121
org.eclipse.wb.os
2222
Automatic-Module-Name: org.eclipse.wb.os.linux
23+
Provide-Capability: wbp;type=os

org.eclipse.wb.os.macosx/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.os.macosx;singleton:=true
5-
Bundle-Version: 1.9.800.qualifier
5+
Bundle-Version: 1.9.900.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Eclipse-PlatformFilter: (osgi.os=macosx)
@@ -18,4 +18,5 @@ Bundle-Localization: plugin
1818
Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)",
1919
org.eclipse.wb.os
2020
Automatic-Module-Name: org.eclipse.wb.os.macosx
21+
Provide-Capability: wbp;type=os
2122

org.eclipse.wb.os.macosx/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.eclipse.wb</groupId>
1313
<artifactId>org.eclipse.wb.os.macosx</artifactId>
14-
<version>1.9.800-SNAPSHOT</version>
14+
<version>1.9.900-SNAPSHOT</version>
1515
<packaging>eclipse-plugin</packaging>
1616

1717
<build>

org.eclipse.wb.os.win32/META-INF/MANIFEST.MF

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: %pluginName
44
Bundle-SymbolicName: org.eclipse.wb.os.win32;singleton:=true
5-
Bundle-Version: 1.10.200.qualifier
5+
Bundle-Version: 1.10.300.qualifier
66
Bundle-Vendor: %providerName
77
Bundle-RequiredExecutionEnvironment: JavaSE-21
88
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.31.100,4.0.0)",
@@ -14,3 +14,4 @@ Bundle-Localization: plugin
1414
Import-Package: org.apache.commons.lang3;version="[3.14.0,4.0.0)",
1515
org.eclipse.wb.os
1616
Automatic-Module-Name: org.eclipse.wb.os.win32
17+
Provide-Capability: wbp;type=os

org.eclipse.wb.os.win32/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<groupId>org.eclipse.wb</groupId>
1313
<artifactId>org.eclipse.wb.os.win32</artifactId>
14-
<version>1.10.200-SNAPSHOT</version>
14+
<version>1.10.300-SNAPSHOT</version>
1515
<packaging>eclipse-plugin</packaging>
1616

1717
<build>

org.eclipse.wb.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,4 +164,4 @@ Import-Package: com.jgoodies.forms.factories;version="[1.9.0,2.0.0]",
164164
org.assertj.core.util;version="[3.26.0,4.0.0)",
165165
org.slf4j;version="[1.7.0,2.0.0)"
166166
Automatic-Module-Name: org.eclipse.wb.tests
167-
167+
Require-Capability: wbp;filter:="(type=os)"

0 commit comments

Comments
 (0)