X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/64891ccb43575beeec67c8eb23ec055af0641293..333c6944bd7736d822d306aad12df0c518f4cdec:/pom.xml

diff --git a/pom.xml b/pom.xml
index 20760cb74..a969dad8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
+	<prerequisites>
+		<maven>3.0</maven>
+	</prerequisites>
 	<groupId>eu.etaxonomy</groupId>
 	<artifactId>taxeditor-parent</artifactId>
-	<version>3.0</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>
@@ -11,7 +14,9 @@
 	<packaging>pom</packaging>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<cdmlib.version>3.0.4-SNAPSHOT</cdmlib.version>
+		<cdmlib.version>3.0.9-SNAPSHOT</cdmlib.version>
+		<tycho.version>0.13.0</tycho.version>
+		<taxeditor.version>3.0.9-SNAPSHOT</taxeditor.version>
 	</properties>
 	<modules>
 		<module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -21,8 +26,12 @@
 		<module>eu.etaxonomy.taxeditor.bulkeditor</module>
 		<module>eu.etaxonomy.taxeditor.printpublisher</module>
 		<!--module>eu.etaxonomy.taxeditor.annotatedlineeditor</module-->
+		<module>eu.etaxonomy.taxeditor.help</module>
 		<module>eu.etaxonomy.taxeditor.application</module>
-  </modules>
+		<module>eu.etaxonomy.taxeditor.feature.platform</module>
+		<module>eu.etaxonomy.taxeditor.feature</module>
+		<module>eu.etaxonomy.taxeditor</module>
+	</modules>
 	<scm>
 		<connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/</connection>
 		<developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/taxeditor/</developerConnection>
@@ -73,19 +82,81 @@
 		<url>http://dev.e-taxonomy.eu/trac/</url>
 	</issueManagement>
 	<ciManagement>
-		<system>Hudson</system>
-		<url>http://160.45.63.201/jenkins</url>
+		<system>Jenkins</system>
+		<url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/</url>
 	</ciManagement>
 	<!-- **** REPOSITORIES **** -->
 	<repositories>
 		<!-- the cdm internal repository -->
 		<repository>
 			<id>EditRepository</id>
-			<url>http://wp5.e-taxonomy.eu/cdmlib/mavenrepo/</url>
+			<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>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-maven-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<extensions>true</extensions>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>tycho-packaging-plugin</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<strictVersions>true</strictVersions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<!--target>
+						<artifact>
+							<groupId>eu.etaxonomy</groupId>
+							<artifactId>eu.etaxonomy.taxeditor</artifactId>
+							<version>${taxeditor.version}</version>
+							<classifier>rcp</classifier>
+						</artifact>
+					</target-->
+					<!--ignoreTychoRepositories>true</ignoreTychoRepositories-->
+					<environments>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</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>
+							<arch>x86</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -126,7 +197,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
-				<version>3.0-beta-3</version>
+				<version>3.0</version>
 				<configuration>
 					<locales>en</locales>
 				</configuration>
@@ -177,12 +248,119 @@
 					</additionalProjectnatures>
 				</configuration>
 			</plugin>
+			<!-- ====== DEPLOY ====== -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-deploy-plugin</artifactId>
-				<version>2.5</version>
+				<artifactId>maven-release-plugin</artifactId>
+				<version>2.2.1</version>
+				<configuration>
+					<allowTimestampedSnapshots>true</allowTimestampedSnapshots>
+					<autoVersionSubmodules>false</autoVersionSubmodules>
+					<!--preparationGoals>clean verify install</preparationGoals-->
+					<!--goals>deploy</goals-->
+					<!-- skipping site-deploy by explicitly configuring the goal here -->
+					<tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>wagon-maven-plugin</artifactId>
+				<version>1.0-beta-3</version>
+				<!--
+			      	Problems with the wagon-maven-plugin have been encounterd on Windows,
+					it should work properly on linux though.
+				 -->
+				<executions>
+					<execution>
+						<phase>deploy</phase>
+						<goals>
+							<goal>upload</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<fromDir>eu.etaxonomy.taxeditor/target/products</fromDir>
+					<includes>*.zip</includes>
+					<url>scpexe://wp5.e-taxonomy.eu/var/www/download/taxeditor/${project.version}</url>
+					<serverId>wp5.e-taxonomy.eu</serverId>
+				</configuration>
 			</plugin>
 		</plugins>
+		<!--pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-jar-plugin</artifactId>
+					<version>2.3.1</version>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>wagon-maven-plugin</artifactId>
+					<version>1.0-beta-3</version>
+				</plugin-->
+		<!--plugin>
+					<groupId>org.eclipse.tycho</groupId>
+					<artifactId>tycho-packaging-plugin</artifactId>
+					<version>${tycho.version}</version-->
+		<!--executions>
+						<execution>
+							<id>timestamp</id>
+							<phase>validate</phase>
+							<goals>
+								<goal>timestamp</goal>
+							</goals>
+						</execution>
+					</executions-->
+		<!-- for some reason configuration won't work here, have to define
+	        			in each module -->
+		<!--configuration>
+						<archive>
+							<addMavenDescriptor>false</addMavenDescriptor>
+						</archive>
+						<environments>
+							<environment>
+								<os>macosx</os>
+								<ws>cocoa</ws>
+								<arch>x86</arch>
+							</environment>
+						</environments>
+					</configuration>
+				</plugin-->
+		<!--/plugins>
+		</pluginManagement-->
+		<extensions>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-scm</artifactId>
+				<version>1.0-alpha-5</version>
+			</extension>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh</artifactId>
+				<version>1.0-beta-7</version>
+			</extension>
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-ssh-external</artifactId>
+				<version>1.0-beta-6</version>
+			</extension>
+			<extension>
+				<groupId>org.apache.maven.scm</groupId>
+				<artifactId>maven-scm-manager-plexus</artifactId>
+				<version>1.0</version>
+			</extension>
+			<extension>
+				<groupId>org.apache.maven.scm</groupId>
+				<artifactId>maven-scm-provider-svnexe</artifactId>
+				<version>1.0</version>
+			</extension>
+			<!-- WebDAV plugin to upload snapshots -->
+			<extension>
+				<groupId>org.apache.maven.wagon</groupId>
+				<artifactId>wagon-webdav</artifactId>
+				<version>1.0-beta-2</version>
+			</extension>
+		</extensions>
 	</build>
 	<reporting>
 		<plugins>
@@ -231,308 +409,7 @@
 			<uniqueVersion>false</uniqueVersion>
 			<id>wp5.e-taxonomy.eu</id>
 			<name>Edit Maven Repository</name>
-			<url>scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/cdmlib/mavenrepo/</url>
+			<url>scpexe://160.45.63.151/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
 		</repository>
 	</distributionManagement>
-	<!-- **** DEPENDENCIES **** -->
-	<dependencies>
-		<dependency>
-			<groupId>org.unitils</groupId>
-			<artifactId>unitils</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency>
-	</dependencies>
-	<dependencyManagement>
-		<dependencies>
-			<!-- ******* TAXEDITOR ******* -->
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>eu.etaxonomy.taxeditor.store</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>eu.etaxonomy.taxeditor.navigation</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>eu.etaxonomy.taxeditor.editor</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>eu.etaxonomy.taxeditor.bulkeditor</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>eu.etaxonomy.taxeditor.application</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>eu.etaxonomy.taxeditor.printpublisher</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<!-- ******* CDMLIB ******* -->
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-model</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-commons</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-services</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-io</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-ext</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-persistence</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-remote</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>eu.etaxonomy</groupId>
-				<artifactId>cdmlib-print</artifactId>
-				<version>${cdmlib.version}</version>
-			</dependency>
-			<!-- ******* ECLIPSE ******* -->
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>help</artifactId>
-				<version>3.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>ecf</artifactId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>text</artifactId>
-				<version>3.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>commands</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>filebuffers</artifactId>
-				<version>3.5.100</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>runtime</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>expressions</artifactId>
-				<version>3.4.200</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>filesystem</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>jobs</artifactId>
-				<version>3.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>contenttype</artifactId>
-				<version>3.4.100</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>databinding</artifactId>
-				<version>1.3.100</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.core</groupId>
-				<artifactId>resources</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox</groupId>
-				<artifactId>common</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox</groupId>
-				<artifactId>preferences</artifactId>
-				<version>3.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox</groupId>
-				<artifactId>app</artifactId>
-				<version>1.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox</groupId>
-				<artifactId>registry</artifactId>
-				<version>3.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox.p2</groupId>
-				<artifactId>core</artifactId>
-				<version>2.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox.p2</groupId>
-				<artifactId>operations</artifactId>
-				<version>2.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ui</groupId>
-				<artifactId>workbench</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>ui</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ui</groupId>
-				<artifactId>editors</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ui</groupId>
-				<artifactId>navigator</artifactId>
-				<version>3.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ui</groupId>
-				<artifactId>forms</artifactId>
-				<version>3.5.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ui</groupId>
-				<artifactId>ide</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ui.workbench</groupId>
-				<artifactId>texteditor</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>jface</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jface</groupId>
-				<artifactId>databinding</artifactId>
-				<version>1.4.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.jface</groupId>
-				<artifactId>text</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.equinox.p2.metadata</groupId>
-				<artifactId>repository</artifactId>
-				<version>1.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ecf</groupId>
-				<artifactId>filetransfer</artifactId>
-				<version>4.0.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ecf</groupId>
-				<artifactId>identity</artifactId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.ecf.provider</groupId>
-				<artifactId>filetransfer</artifactId>
-				<version>3.1.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>swt</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse</groupId>
-				<artifactId>osgi</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<dependency>
-				<groupId>org.eclipse.swt.cocoa</groupId>
-				<artifactId>macosx</artifactId>
-				<version>3.6.0</version>
-			</dependency>
-			<!-- ******* VARIOUS ******* -->
-			<dependency>
-				<groupId>com.google.api</groupId>
-				<artifactId>translate</artifactId>
-				<version>0.92</version>
-			</dependency>
-			<dependency>
-				<groupId>org.apache.commons</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>1.3.2</version>
-			</dependency>
-			<dependency>
-				<groupId>log4j</groupId>
-				<artifactId>log4j</artifactId>
-				<version>1.2.15</version>
-			</dependency>
-			<dependency>
-				<groupId>junit</groupId>
-				<artifactId>junit</artifactId>
-				<version>4.5</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.unitils</groupId>
-				<artifactId>unitils</artifactId>
-				<version>2.2</version>
-				<scope>test</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.dbunit</groupId>
-				<artifactId>dbunit</artifactId>
-				<version>2.4.4</version>
-				<scope>test</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-</project>
\ No newline at end of file
+</project>