Adapting to cdmlib version from security branch

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index c68377472ec854ee83ae60112b6553e9b5e12eab..2897e027f53ef69fbcf43fc7b048d67b65429507 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
        <packaging>pom</packaging>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <cdmlib.version>3.0.7-SNAPSHOT</cdmlib.version>
+               <cdmlib.version>3.0.9-SNAPSHOT</cdmlib.version>
                <tycho.version>0.12.0</tycho.version>
                <taxeditor.version>3.0.6-SNAPSHOT</taxeditor.version>
        </properties>
@@ -26,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>
@@ -82,14 +83,14 @@
        </issueManagement>
        <ciManagement>
                <system>Jenkins</system>
-               <url>http://160.45.63.201/jenkins</url>
+               <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>
        </repositories>
        <build>
@@ -129,21 +130,21 @@
                                                        <ws>cocoa</ws>
                                                        <arch>x86_64</arch>
                                                </environment-->
-                                               <!--environment>
+                                               <environment>
                                                        <os>win32</os>
                                                        <ws>win32</ws>
                                                        <arch>x86</arch>
-                                               </environment-->
+                                               </environment>
                                                <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>
-                                                       <arch>x86_64</arch>
+                                                       <arch>x86</arch>
                                                </environment>
-                                               <!--environment>
+                                               <environment>
                                                        <os>linux</os>
                                                        <ws>gtk</ws>
                                                        <arch>x86_64</arch>
-                                               </environment-->
+                                               </environment>
                                        </environments>
                                </configuration>
                        </plugin>
@@ -187,7 +188,7 @@
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-site-plugin</artifactId>
-                               <version>2.2</version>
+                               <version>3.0</version>
                                <configuration>
                                        <locales>en</locales>
                                </configuration>
@@ -238,24 +239,61 @@
                                        </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>
+               <!--pluginManagement>
                        <plugins>
                                <plugin>
                                        <groupId>org.apache.maven.plugins</groupId>
                                        <artifactId>maven-jar-plugin</artifactId>
                                        <version>2.3.1</version>
                                </plugin>
-                               <!--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>
+               <!--executions>
                                                <execution>
                                                        <id>timestamp</id>
                                                        <phase>validate</phase>
@@ -264,9 +302,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>
@@ -279,8 +317,41 @@
                                                </environments>
                                        </configuration>
                                </plugin-->
-                       </plugins>
-               </pluginManagement>
+               <!--/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>
@@ -329,7 +400,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>
 </project>