Bug 416915: Allow to run tests with tycho-surefire-plugin
- org.eclipse.jdt.ui.tests.refactoring can't have a hard dependency on o.e.jdt.annotations 2.0.0, since that would block testing with 1.7
- include LeakTestSuite
diff --git a/org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF b/org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF
index a69076b..1c9fef5 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF
+++ b/org.eclipse.jdt.ui.tests.refactoring/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.jdt.core,
- org.eclipse.jdt.annotation;bundle-version="[2.0.0,3.0.0)",
org.eclipse.jdt.core.manipulation,
org.eclipse.jdt.ui,
org.eclipse.jdt.ui.tests,
diff --git a/org.eclipse.jdt.ui.tests.refactoring/pom.xml b/org.eclipse.jdt.ui.tests.refactoring/pom.xml
index 5fc7651..fc8d278 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/pom.xml
+++ b/org.eclipse.jdt.ui.tests.refactoring/pom.xml
@@ -44,6 +44,11 @@
<artifactId>org.eclipse.equinox.event</artifactId>
<version>0.0.0</version>
</dependency>
+ <dependency> <!-- For PullUpTests18 -->
+ <type>eclipse-plugin</type>
+ <artifactId>org.eclipse.jdt.annotation</artifactId>
+ <version>[2.0.0,3.0.0)</version>
+ </dependency>
</dependencies>
</configuration>
</plugin>
diff --git a/org.eclipse.jdt.ui.tests/pom.xml b/org.eclipse.jdt.ui.tests/pom.xml
index e39cf90..d23c6eb 100644
--- a/org.eclipse.jdt.ui.tests/pom.xml
+++ b/org.eclipse.jdt.ui.tests/pom.xml
@@ -24,8 +24,6 @@
<packaging>eclipse-test-plugin</packaging>
<properties>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
- <testSuite>${project.artifactId}</testSuite>
- <testClass>org.eclipse.jdt.ui.tests.AutomatedSuite</testClass>
</properties>
<build>
@@ -37,6 +35,10 @@
<configuration>
<useUIHarness>true</useUIHarness>
<useUIThread>true</useUIThread>
+ <includes>
+ <include>org/eclipse/jdt/ui/tests/AutomatedSuite.class</include>
+ <include>org/eclipse/jdt/ui/tests/LeakTestSuite.class</include>
+ </includes>
<explodedBundles>
<bundle>org.junit</bundle>
</explodedBundles>
