Disable ui test module in parent pom

Change-Id: Id82551bbc7155b746eb594048e65c755455b92c9 Signed-off-by: Denis Knoepfle <[email protected]>
sopeco · Aug 11, 2014 · fd2a3ca · fd2a3ca
1 parent d62b499
commit fd2a3ca
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/org.spotter.eclipse.ui.test/META-INF/MANIFEST.MF b/org.spotter.eclipse.ui.test/META-INF/MANIFEST.MF
@@ -6,4 +6,5 @@ Bundle-Version: 0.0.1.qualifier
 Bundle-Vendor: SAP AG
 Fragment-Host: org.spotter.eclipse.ui;bundle-version="0.0.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Require-Bundle: org.junit;bundle-version="4.10.0"
+Bundle-ClassPath: .,
+ ../org.spotter.eclipse.ui
diff --git a/org.spotter.eclipse.ui.test/pom.xml b/org.spotter.eclipse.ui.test/pom.xml
@@ -78,6 +78,13 @@
 					<useUIHarness>true</useUIHarness>
 					<useUIThread>true</useUIThread>
 					<providerHint>junit4</providerHint>
+					<dependencies>
+						<dependency>
+							<groupId>junit</groupId>
+							<artifactId>junit</artifactId>
+							<version>4.10</version>
+						</dependency>
+					</dependencies>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -90,5 +97,10 @@
 			<artifactId>org.spotter.eclipse.ui</artifactId>
 			<version>0.0.1-SNAPSHOT</version>
 		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.10</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/org.spotter.eclipse.ui.test/src/org/spotter/eclipse/ui/ActivatorTest.java b/org.spotter.eclipse.ui.test/src/org/spotter/eclipse/ui/ActivatorTest.java
@@ -1,6 +1,5 @@
 package org.spotter.eclipse.ui;
 
-//import static org.junit.Assert.*;
 import junit.framework.Assert;
 
 import org.junit.Test;

diff --git a/org.spotter.eclipse.ui/META-INF/MANIFEST.MF b/org.spotter.eclipse.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.105.0",
  org.eclipse.ui.ide;bundle-version="3.9.1",
  org.eclipse.core.runtime;bundle-version="3.9.0",
  org.eclipse.ui.navigator;bundle-version="3.5.300",
- org.eclipse.ui.navigator.resources;bundle-version="3.4.500"
+ org.eclipse.ui.navigator.resources;bundle-version="3.4.500",
+ org.eclipse.equinox.ds;bundle-version="1.4.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Bundle-ClassPath: .,

diff --git a/org.spotter.parent/pom.xml b/org.spotter.parent/pom.xml
@@ -18,7 +18,7 @@
 		<module>../org.spotter.service</module>
 		<module>../org.spotter.client</module>
 		<module>../org.spotter.eclipse.ui</module>
-		<module>../org.spotter.eclipse.ui.test</module>
+		<!-- <module>../org.spotter.eclipse.ui.test</module> -->
 
 
 	</modules>