From fd2a3ca144fdbeeba39be48ecd2dcb73520e1fcc Mon Sep 17 00:00:00 2001 From: Denis Knoepfle Date: Mon, 11 Aug 2014 12:23:07 +0200 Subject: [PATCH] Disable ui test module in parent pom Change-Id: Id82551bbc7155b746eb594048e65c755455b92c9 Signed-off-by: Denis Knoepfle --- org.spotter.eclipse.ui.test/META-INF/MANIFEST.MF | 3 ++- org.spotter.eclipse.ui.test/pom.xml | 12 ++++++++++++ .../src/org/spotter/eclipse/ui/ActivatorTest.java | 1 - org.spotter.eclipse.ui/META-INF/MANIFEST.MF | 3 ++- org.spotter.parent/pom.xml | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/org.spotter.eclipse.ui.test/META-INF/MANIFEST.MF b/org.spotter.eclipse.ui.test/META-INF/MANIFEST.MF index 49290cd..a5484a9 100644 --- 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 index 071d7f3..79e2d9d 100644 --- a/org.spotter.eclipse.ui.test/pom.xml +++ b/org.spotter.eclipse.ui.test/pom.xml @@ -78,6 +78,13 @@ true true junit4 + + + junit + junit + 4.10 + + @@ -90,5 +97,10 @@ org.spotter.eclipse.ui 0.0.1-SNAPSHOT + + junit + junit + 4.10 + \ No newline at end of file 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 index 4799f39..91fefc9 100644 --- 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 index eb78287..049096a 100644 --- 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 index ca27d62..05d415a 100644 --- a/org.spotter.parent/pom.xml +++ b/org.spotter.parent/pom.xml @@ -18,7 +18,7 @@ ../org.spotter.service ../org.spotter.client ../org.spotter.eclipse.ui - ../org.spotter.eclipse.ui.test +