commit 56fa11e9a3475793f8d989dd0438b4e975ab6458
author Rolf Theunissen <rolf.theunissen@gmail.com> Tue Aug 17 21:13:50 2021 +0200
committer Rolf Theunissen <rolf.theunissen@gmail.com> Sat Aug 21 10:21:39 2021 -0400
tree 7c1bb66b3d2c83f853ea93e6af5ef7b31a65975c
parent 563638f7b32c901b3dbf1fa0c00af8c6536118fd

Bug 575418 - [tests] missing dependency on org.eclipse.equinox.event in
UI Test Suite

- Add OSGi Require-Capability header
- Remove unnecessary dependencies from pom.xml

Change-Id: If1e9869846e537281d912ccc801b9fb6d747bdd5
Signed-off-by: Rolf Theunissen <rolf.theunissen@gmail.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui/+/184168

tests/org.eclipse.ui.ide.application.tests/pom.xml

diff --git a/tests/org.eclipse.ui.ide.application.tests/pom.xml b/tests/org.eclipse.ui.ide.application.tests/pom.xml
index 0b29da1..a96ecf6 100644
--- a/tests/org.eclipse.ui.ide.application.tests/pom.xml
+++ b/tests/org.eclipse.ui.ide.application.tests/pom.xml
@@ -35,13 +35,6 @@
         <configuration>
           <useUIHarness>false</useUIHarness>
           <useUIThread>false</useUIThread>
-            <dependencies>
-              <dependency>
-                <type>eclipse-plugin</type>
-                <artifactId>org.eclipse.equinox.event</artifactId>
-                <version>0.0.0</version>
-              </dependency>
-            </dependencies>
         </configuration>
       </plugin>
     </plugins>

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

diff --git a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
index b72c812..8c8eece 100644
--- a/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
@@ -55,4 +55,9 @@
 Export-Package: org.eclipse.ui.tests.api,
  org.eclipse.ui.tests.menus
 Bundle-RequiredExecutionEnvironment: JavaSE-11
+Require-Capability: osgi.extender;
+  filter:="(&(osgi.extender=osgi.component)(version>=1.2)(!(version>=2.0)))",
+ osgi.service;
+  filter:="(objectClass=org.osgi.service.event.EventAdmin)";
+  effective:="active"
 Automatic-Module-Name: org.eclipse.ui.tests

tests/org.eclipse.ui.tests/pom.xml

diff --git a/tests/org.eclipse.ui.tests/pom.xml b/tests/org.eclipse.ui.tests/pom.xml
index a79dd0f..6983097 100644
--- a/tests/org.eclipse.ui.tests/pom.xml
+++ b/tests/org.eclipse.ui.tests/pom.xml
@@ -37,16 +37,6 @@
         <useUIHarness>true</useUIHarness>
         <useUIThread>true</useUIThread>
           <dependencies>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.equinox.event</artifactId>
-              <version>0.0.0</version>
-            </dependency>
-            <dependency>
-              <type>eclipse-plugin</type>
-              <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-              <version>0.0.0</version>
-            </dependency>
           <dependency>
             <type>eclipse-plugin</type>
             <artifactId>org.eclipse.jdt.ui</artifactId>