X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/f6acf2aa77a7222cd8c9d7761637efd1cdf0cedc..5d1860a1346ba4ef9c25ad2fddd0c918e79d90d1:/pom.xml?ds=sidebyside

diff --git a/pom.xml b/pom.xml
index ebf79512d..c65a5bd4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,9 @@
 <?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.6-SNAPSHOT</version>
@@ -13,6 +16,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<cdmlib.version>3.0.7-SNAPSHOT</cdmlib.version>
 		<tycho.version>0.12.0</tycho.version>
+		<taxeditor.version>3.0.6-SNAPSHOT</taxeditor.version>
 	</properties>
 	<modules>
 		<module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -22,6 +26,7 @@
 		<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>
 		<module>eu.etaxonomy.taxeditor.feature.platform</module>
 		<module>eu.etaxonomy.taxeditor.feature</module>
@@ -96,6 +101,14 @@
 				<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>
@@ -106,18 +119,18 @@
 						<artifact>
 							<groupId>eu.etaxonomy</groupId>
 							<artifactId>eu.etaxonomy.taxeditor</artifactId>
-							<version>3.0.6-SNAPSHOT</version>
+							<version>${taxeditor.version}</version>
 							<classifier>rcp</classifier>
 						</artifact>
 					</target>
 					<ignoreTychoRepositories>true</ignoreTychoRepositories>
 					<environments>
-						<environment>
+						<!--environment>
 							<os>macosx</os>
 							<ws>cocoa</ws>
 							<arch>x86_64</arch>
-						</environment>
-						<!--environment>
+						</environment-->
+						<environment>
 							<os>win32</os>
 							<ws>win32</ws>
 							<arch>x86</arch>
@@ -131,7 +144,7 @@
 							<os>linux</os>
 							<ws>gtk</ws>
 							<arch>x86_64</arch>
-						</environment-->
+						</environment>
 					</environments>
 				</configuration>
 			</plugin>
@@ -226,10 +239,41 @@
 					</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>
+			    <!--
+			      	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>
@@ -240,10 +284,15 @@
 					<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>
+					<version>${tycho.version}</version-->
+				<!--executions>
 						<execution>
 							<id>timestamp</id>
 							<phase>validate</phase>
@@ -252,9 +301,9 @@
 							</goals>
 						</execution>
 					</executions-->
-					<!-- for some reason configuration won't work here, have to define
+				<!-- for some reason configuration won't work here, have to define
 	        			in each module -->
-					<configuration>
+				<!--configuration>
 						<archive>
 							<addMavenDescriptor>false</addMavenDescriptor>
 						</archive>
@@ -266,9 +315,37 @@
 							</environment>
 						</environments>
 					</configuration>
-				</plugin>
+				</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.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>