fixing bundle and tycho plugin config

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 987dc18900ae444f051bc43d1e502ed13a06a81f..a9e96c9d0bd204a6cdcbef235ccadb0f6ecc42d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -21,8 +21,7 @@ Require-Bundle: org.eclipse.ui,
  org.apache.log4j,
  org.hamcrest,
  org.eclipse.swtbot.eclipse.core,
- org.eclipse.swtbot.eclipse.finder,
- eu.etaxonomy.taxeditor.webapp;bundle-version="3.13.0"
+ org.eclipse.swtbot.eclipse.finder
 Eclipse-RegisterBuddy: org.apache.log4j, org.eclipse.swtbot.swt.finder
 Bundle-ClassPath: .,
  lib/byte-buddy-0.5.1.jar,

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 6f93684dd4aee504b0971c6b1cb7a34958cb58e5..023411377be845ab82fca8d477c4293294d9db77 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -48,28 +48,22 @@
               <removeAll />
             </filter>
           </filters>
+          <dependency-resolution>
+           <extraRequirements>
+              <requirement>
+                 <type>eclipse-feature</type>
+                 <id>eu.etaxonomy.taxeditor.feature</id>
+                 <versionRange>1.0.0</versionRange>
+              </requirement>
+           </extraRequirements>
+        </dependency-resolution>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho.version}</version>
-        <configuration>
-          <!-- currently we run only the non-ui unit tests so we don't the 
-            harness -->
-          <!-- <useUIHarness>true</useUIHarness> -->
-          <dependencies>
-            <!-- This will pull the feature and its dependent plugins into 
-              the classpath for the tests. Note that this requires ALL taxeditor projects 
-              to be installed. -->
-            <dependency>
-              <type>eclipse-feature</type>
-              <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
-              <!-- This is the minimum required version -->
-              <version>1.0.0</version>
-            </dependency>
-          </dependencies>
-        </configuration>
+        
       </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>