merge from trunk

[taxeditor.git] / eu.etaxonomy.taxeditor.test / pom.xml

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 8d5d8146ba8b65ccd26052785b18b90517b1f4c4..5b2e79b899cafa78ab8261f06b908e693ad1f49c 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -4,63 +4,55 @@
        <parent>\r
                <groupId>eu.etaxonomy</groupId>\r
                <artifactId>taxeditor-parent</artifactId>\r
-               <version>3.0.6-SNAPSHOT</version>\r
+               <version>3.4.0-SNAPSHOT</version>\r
        </parent>\r
-\r
        <modelVersion>4.0.0</modelVersion>\r
        <artifactId>eu.etaxonomy.taxeditor.test</artifactId>\r
        <packaging>eclipse-test-plugin</packaging>\r
-\r
        <name>UI Test Bundle</name>\r
        <description>Holds all UI tests for the Taxonomic Editor</description>\r
-\r
-       <!-- <repositories> -->\r
-       <!-- <repository> -->\r
-       <!-- <id>ganymede</id> -->\r
-       <!-- <layout>p2</layout> -->\r
-       <!-- <url>http://download.eclipse.org/releases/galileo</url> -->\r
-       <!-- </repository> -->\r
-       <!-- <repository> -->\r
-       <!-- <id>swtbot</id> -->\r
-       <!-- <layout>p2</layout> -->\r
-       <!-- <url>http://download.eclipse.org/technology/swtbot/galileo/dev-build/update-site</url> -->\r
-       <!-- </repository> -->\r
-       <!-- </repositories> -->\r
-\r
-       <build>\r
-               <plugins>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>tycho-maven-plugin</artifactId>\r
-                               <version>${tycho.version}</version>\r
-                               <extensions>true</extensions>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>target-platform-configuration</artifactId>\r
-                               <version>${tycho.version}</version>\r
-                               <configuration>\r
-                                       <resolver>p2</resolver>\r
-                               </configuration>\r
-                       </plugin>\r
-                       <plugin>\r
-                               <groupId>org.eclipse.tycho</groupId>\r
-                               <artifactId>maven-osgi-test-plugin</artifactId>\r
-                               <version>${tycho.version}</version>\r
-                               <configuration>\r
-                                       <useUIHarness>true</useUIHarness>\r
-                                       <useUIThread>false</useUIThread>\r
-                                       <product>eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product</product>\r
-                                       <!-- <application>org.eclipse.ui.ide.workbench</application> -->\r
-                                       <dependencies>\r
-                                               <dependency>\r
-                                                       <type>p2-installable-unit</type>\r
-                                                       <artifactId>eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product</artifactId>\r
-                                                       <version>0.0.0</version>\r
-                                               </dependency>\r
-                                       </dependencies>\r
-                               </configuration>\r
-                       </plugin>\r
-               </plugins>\r
-       </build>\r
+<!--   <build> -->\r
+<!--           <plugins> -->\r
+<!--                   <plugin> -->\r
+<!--                           <groupId>org.eclipse.tycho</groupId> -->\r
+<!--                           <artifactId>tycho-maven-plugin</artifactId> -->\r
+<!--                           <version>${tycho.version}</version> -->\r
+<!--                           <extensions>true</extensions> -->\r
+<!--                   </plugin> -->\r
+<!--                   <plugin> -->\r
+<!--                           <groupId>org.eclipse.tycho</groupId> -->\r
+<!--                           <artifactId>target-platform-configuration</artifactId> -->\r
+<!--                           <version>${tycho.version}</version> -->\r
+<!--                           <configuration> -->\r
+<!--                                   <resolver>p2</resolver> -->\r
+<!--                           </configuration> -->\r
+<!--                   </plugin> -->\r
+<!--                   <plugin> -->\r
+<!--                           <groupId>org.eclipse.tycho</groupId> -->\r
+<!--                           <artifactId>tycho-surefire-plugin</artifactId> -->\r
+<!--                           <version>${tycho.version}</version> -->\r
+<!--                           <configuration> -->\r
+<!--                                   <useUIHarness>true</useUIHarness> -->\r
+<!--                                   <useUIThread>false</useUIThread> -->\r
+<!--                                   <includes> -->\r
+<!--                                           <include>**/*Test.java</include> -->\r
+<!--                                   </includes> -->\r
+<!--                                   <product>eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product -->\r
+<!--                                   </product> -->\r
+<!--                                   <application>eu.etaxonomy.taxeditor.application.application -->\r
+<!--                                   </application> -->\r
+<!--                                   <dependency> <type>p2-installable-unit</type> <artifactId>eu.etaxonomy.taxeditor.product</artifactId> -->\r
+<!--                                           <version>0.0.0</version> </dependency> --> \r
+<!--                           </configuration> -->\r
+<!--                   </plugin> -->\r
+<!--           </plugins> -->\r
+<!--   </build> -->\r
+       <dependencies>\r
+               <dependency>\r
+                       <groupId>junit</groupId>\r
+                       <artifactId>junit</artifactId>\r
+                       <version>4.11</version>\r
+                       <scope>test</scope>\r
+               </dependency>\r
+       </dependencies>\r
 </project>
\ No newline at end of file