X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/4aca539da70aa4765acdc7de8541447c4e9a576b..c63055a729959f5d1aa41ed271536d40e9160b7f:/pom.xml

diff --git a/pom.xml b/pom.xml
index 19b9ed633..3b7ab00e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,24 +1,27 @@
 <?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">
+<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.2.3-SNAPSHOT</version>
+  <version>3.4.0-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>
+  <description>The Taxonomic Editor for EDIT's platform for
+    cybertaxonomy</description>
+  <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/</url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.2.3-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.2.3-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.4.0-SNAPSHOT</taxeditor.version>
+    <update.dir>snapshot</update.dir>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -27,27 +30,27 @@
     <module>eu.etaxonomy.taxeditor.editor</module>
     <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>
     <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>
-    <url>http://dev.e-taxonomy.eu/websvn/listing.php?repname=EDIT+Taxonomic+Editor</url>
+    <url>https://dev.e-taxonomy.eu/trac/browser/trunk/taxeditor/</url>
   </scm>
   <mailingLists>
     <mailingList>
       <name>EDIT Taxonomic Editor</name>
       <subscribe>
-				edit-taxonomic-editor+subscribe@googlegroups.com
-			</subscribe>
+        edit-taxonomic-editor+subscribe@googlegroups.com
+      </subscribe>
       <unsubscribe>
-				edit-taxonomic-editor+unsubscribe@googlegroups.com
-			</unsubscribe>
+        edit-taxonomic-editor+unsubscribe@googlegroups.com
+      </unsubscribe>
       <post>edit-taxonomic-editor@googlegroups.com</post>
       <archive>http://groups.google.com/group/edit-taxonomic-editor/topics</archive>
     </mailingList>
@@ -64,37 +67,37 @@
       <!-- your SVN account id please! -->
       <id>a.kohlbecker</id>
       <name>
-			Andreas Kohlbecker
-			</name>
+        Andreas Kohlbecker
+      </name>
       <email>a.kohlbecker [at] bgbm.org</email>
       <organization>
-				Botanic Garden Botanical Museum Berlin
-			</organization>
+        Botanic Garden Botanical Museum Berlin
+      </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url/>
+      <url />
     </developer>
     <developer>
       <!-- your SVN account id please! -->
       <id>a.mueller</id>
       <name>
-				Andreas Müller
-			</name>
+        Andreas Müller
+      </name>
       <email>a.mueller [at] bgbm.org</email>
       <organization>
-				Botanic Garden Botanical Museum Berlin
-			</organization>
+        Botanic Garden Botanical Museum Berlin
+      </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url/>
+      <url />
     </developer>
   </developers>
   <issueManagement>
@@ -168,6 +171,14 @@
           <strictVersions>true</strictVersions>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-p2-repository-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <includeAllDependencies>true</includeAllDependencies>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>target-platform-configuration</artifactId>
@@ -301,35 +312,13 @@
         <configuration>
           <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
           <autoVersionSubmodules>false</autoVersionSubmodules>
-          <!--preparationGoals>clean verify install</preparationGoals-->
-          <!--goals>deploy</goals-->
+          <!--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>
     <extensions>
       <extension>
@@ -386,7 +375,8 @@
         </configuration>
       </plugin>
       <plugin>
-        <!-- this will generate an indexed and cross-referenced HTML version of your source code -->
+        <!-- this will generate an indexed and cross-referenced HTML version 
+          of your source code -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
         <version>2.2</version>
@@ -410,7 +400,7 @@
       </plugin>
     </plugins>
   </reporting>
-  <!--	 DISTRIBUTION MANAGEMENT -->
+  <!-- DISTRIBUTION MANAGEMENT -->
   <distributionManagement>
     <site>
       <id>wp5.e-taxonomy.eu</id>
@@ -424,4 +414,5 @@
       <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/</url>
     </repository>
   </distributionManagement>
+
 </project>