switched to tycho 0.13 and added automated builds for mac and 64 bit windows

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 14ebef537fafad7f98eec7eb1309443235261007..e4ff007070a37c15f8aa46a513dcf16b5d05c387 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -168,8 +168,6 @@ Software distributed under the License is distributed on an "AS IS" ba
    <plugin
          id="org.eclipse.equinox.security.macosx"
          os="macosx"
-         ws="cocoa"
-         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -335,6 +333,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.core.filesystem.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
@@ -345,6 +344,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.core.net.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
@@ -355,7 +355,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.core.resources.win32.x86"
          os="win32"
-         arch="x86,x86_64"
+         arch="x86"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -365,7 +365,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.equinox.security.win32.x86"
          os="win32"
-         arch="x86,x86_64"
+         arch="x86"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -375,6 +375,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.swt.win32.win32.x86"
          os="win32"
+         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
@@ -518,27 +519,6 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.swt.motif.linux.x86"
-         os="linux"
-         ws="motif"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher.motif.linux.x86"
-         os="linux"
-         ws="motif"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"/>
-
    <plugin
          id="org.apache.commons.logging"
          download-size="0"
@@ -668,16 +648,6 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.swt.cocoa.macosx"
-         os="macosx"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.equinox.p2.core"
          download-size="0"
@@ -807,6 +777,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.core.filesystem.win32.x86_64"
          os="win32"
+         ws="win32"
          arch="x86_64"
          download-size="0"
          install-size="0"
@@ -817,6 +788,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.core.net.win32.x86_64"
          os="win32"
+         ws="win32"
          arch="x86_64"
          download-size="0"
          install-size="0"
@@ -837,6 +809,7 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.swt.win32.win32.x86_64"
          os="win32"
+         ws="win32"
          arch="x86_64"
          download-size="0"
          install-size="0"
@@ -867,8 +840,6 @@ Software distributed under the License is distributed on an &quot;AS IS&quot; ba
    <plugin
          id="org.eclipse.core.filesystem.macosx"
          os="macosx"
-         ws="cocoa"
-         arch="x86,x86_64"
          download-size="0"
          install-size="0"
          version="0.0.0"

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 15bcf0edd6cea9d4672fa9a5ec24fb0e111239a2..149ddba5fa20611edb3f9bfaa96a9b3a453b280a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -51,7 +51,7 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.pde.runtime,
- org.eclipse.ui.forms;bundle-version="3.5.0",
+ org.eclipse.ui.forms,
  eu.etaxonomy.taxeditor.cdmlib
 Import-Package: org.eclipse.core.commands,
  org.eclipse.core.commands.operations,

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index a2274f91f7fabb707359e34110536199c9ebb116..9fcf21a641d9e0f2a52c2abb0a61db207263a72c 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -8,7 +8,6 @@
 
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor</artifactId>
-       <!-- packaging>eclipse-application</packaging -->
        <packaging>eclipse-repository</packaging>
 
        <name>EDIT Taxonomic Editor</name>
@@ -17,12 +16,6 @@
 
        <build>
                <plugins>
-                       <!-- plugin> <groupId>org.sonatype.tycho</groupId> <artifactId>maven-osgi-packaging-plugin</artifactId> 
-                               <version>${tycho.version}</version> <configuration> <environments> <environment> 
-                               <os>macosx</os> <ws>cocoa</ws> <arch>x86</arch> </environment> <environment> 
-                               <os>linux</os> <ws>gtk</ws> <arch>x86</arch> </environment> <environment> 
-                               <os>win32</os> <ws>win32</ws> <arch>x86</arch> </environment> </environments> 
-                               </configuration> </plugin -->
                        <plugin>
                                <groupId>org.eclipse.tycho</groupId>
                                <artifactId>tycho-p2-director-plugin</artifactId>

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index a147ddd741ae6ee2d6007da6447458ee0aa43ece..f58b4690f4dbcf516e506211fc20d93f13cad4bd 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
 
-<target name="Eclipse Helios Target" sequenceNumber="0">
+<target name="Eclipse Indigo Target" sequenceNumber="4">
 <locations>
-<location includeAllPlatforms="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.4.2.R36x_v20110125-7N7K7bF8zk1BAKMh0iz0t94miBLY"/>
-<unit id="org.eclipse.platform.source.feature.group" version="3.6.2.r362_v20110210-9gF78Gs1FrIGnHDHWkEcopoN8AmxeZflGDGKQi"/>
-<unit id="org.eclipse.platform.sdk" version="3.6.2.M20110210-1200"/>
-<unit id="org.eclipse.pde.feature.group" version="3.6.2.r362_v20110203-7b7mFL2FET3dhHalh1iNZtL"/>
-<unit id="org.eclipse.zest.feature.group" version="1.2.0.v20100519-2050-67818yE6F-AA7P4B8I52322"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.6.2.r362_v20101117-0800-7z8XFW6FLFlmjJcvz03jyeFBLS_F"/>
-<repository location="http://download.eclipse.org/releases/helios"/>
-</location>
-<location includeAllPlatforms="true" includeMode="slicer" includeSource="false" type="InstallableUnit">
+<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
 <unit id="org.eclipse.swtbot.eclipse.gef.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
 <unit id="org.eclipse.swtbot.ide.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
 <unit id="org.eclipse.swtbot.eclipse.test.junit4.feature.group" version="2.0.5.20111003_1754-3676ac8-dev-e36"/>
 <repository location="http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site"/>
 </location>
+<location includeAllPlatforms="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.jdt.feature.group" version="3.7.1.r371_v20110810-0800-7z8gFcoFMLfTabvKsR5Qm9rBGEBK"/>
+<unit id="org.eclipse.pde.source.feature.group" version="3.7.1.r37x_v20110810-0800-7b7qFVtFEx2XnmZ4jlM5mjM"/>
+<unit id="org.eclipse.platform.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20110530-7P7NFUFFLWUl76mart"/>
+<unit id="org.eclipse.platform.source.feature.group" version="3.7.1.r37x_v20110729-9gF7UHOxFtniV7mI3T556iZN9AU8bEZ1lHMcVK"/>
+<unit id="org.eclipse.platform.sdk" version="3.7.1.M20110909-1335"/>
+<unit id="org.eclipse.rcp.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
+<unit id="org.eclipse.rcp.source.feature.group" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A"/>
+<unit id="org.eclipse.rcp.sdk.id" version="3.7.1.M20110909-1335"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.7.1.R37x_v20110907-7M7W8h8eNV4Vrz-hz01A7SL_MhZP"/>
+<unit id="org.eclipse.zest.sdk.feature.group" version="1.3.0.v20110425-2050-67C08COMOGAKRUKGP_ULXbePP8ZT"/>
+<repository location="http://download.eclipse.org/releases/indigo"/>
+</location>
 </locations>
 </target>

diff --git a/pom.xml b/pom.xml
index e138779d65279eb526bec3df49704cc0a0b07929..a969dad8b0b2f12d5581ea68b0a1f9345481dda8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cdmlib.version>3.0.9-SNAPSHOT</cdmlib.version>
-               <tycho.version>0.12.0</tycho.version>
+               <tycho.version>0.13.0</tycho.version>
                <taxeditor.version>3.0.9-SNAPSHOT</taxeditor.version>
        </properties>
        <modules>
@@ -92,6 +92,11 @@
                        <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/releases/indigo</url>
+    </repository>
        </repositories>
        <build>
                <plugins>
@@ -114,27 +119,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>