fixing dependency problems within tycho configuration

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 2897e027f53ef69fbcf43fc7b048d67b65429507..15f22ce9c0d519921f0069302a6226f00319f3a3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
        </prerequisites>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.0.6-SNAPSHOT</version>
+       <version>3.0.9-SNAPSHOT</version>
        <name>EDIT Taxonomic Editor</name>
        <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
        <url>http://wp5.e-taxonomy.eu</url>
@@ -15,8 +15,8 @@
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cdmlib.version>3.0.9-SNAPSHOT</cdmlib.version>
-               <tycho.version>0.12.0</tycho.version>
-               <taxeditor.version>3.0.6-SNAPSHOT</taxeditor.version>
+               <tycho.version>0.13.0</tycho.version>
+               <taxeditor.version>3.0.9-SNAPSHOT</taxeditor.version>
        </properties>
        <modules>
                <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -92,6 +92,16 @@
                        <id>EditRepository</id>
                        <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
                </repository>
+               <repository>
+      <id>eclipse-indigo</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/</url>
+    </repository>
+    <repository>
+      <id>eclipse-swtbot</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/releases/indigo</url>
+    </repository>
        </repositories>
        <build>
                <plugins>
@@ -114,27 +124,31 @@
                                <artifactId>target-platform-configuration</artifactId>
                                <version>${tycho.version}</version>
                                <configuration>
-                                       <resolver>p2</resolver>
-                                       <target>
+                                       <!--target>
                                                <artifact>
                                                        <groupId>eu.etaxonomy</groupId>
                                                        <artifactId>eu.etaxonomy.taxeditor</artifactId>
                                                        <version>${taxeditor.version}</version>
                                                        <classifier>rcp</classifier>
                                                </artifact>
-                                       </target>
-                                       <ignoreTychoRepositories>true</ignoreTychoRepositories>
+                                       </target-->
+                                       <!--ignoreTychoRepositories>true</ignoreTychoRepositories-->
                                        <environments>
-                                               <!--environment>
+                                               <environment>
                                                        <os>macosx</os>
                                                        <ws>cocoa</ws>
                                                        <arch>x86_64</arch>
-                                               </environment-->
+                                               </environment>
                                                <environment>
                                                        <os>win32</os>
                                                        <ws>win32</ws>
                                                        <arch>x86</arch>
                                                </environment>
+                                               <environment>
+                                                       <os>win32</os>
+                                                       <ws>win32</ws>
+                                                       <arch>x86_64</arch>
+                                               </environment>
                                                <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>