X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/3a269e2ce7a14a390fb0ef0cfe62b26e5fa6c8a9..9f56742182c06f5e8270ce9804926593a6a51d87:/pom.xml

diff --git a/pom.xml b/pom.xml
index bd6ebfe6b..3f80d887f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,31 +6,33 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.6.0-SNAPSHOT</version>
+  <version>5.7.4</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   </description>
-  <url>http://cybertaxonomy.eu/taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor//taxeditor/
+  <url>https://cybertaxonomy.eu/taxeditor
   </url>
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
     <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>4.6.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>5.7.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
-    <!-- Increasing tycho above 0.22.0 will fail for the macosx build
-    because for higher version numbers tycho needs to be build against
-    Eclipse Mars or higher -->
-    <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>4.6.0-SNAPSHOT</taxeditor.version>
+    <!-- Increasing tycho above 0.22.0 will fail for the macosx build because 
+      for higher version numbers tycho needs to be build against Eclipse Mars or 
+      higher -->
+    <tycho.version>1.0.0</tycho.version>
+    <taxeditor.version>5.7.0</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>
+    <javadoc.opts>-Xdoclint:none</javadoc.opts>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
+    <module>eu.etaxonomy.taxeditor.workbench</module>
     <module>eu.etaxonomy.taxeditor.store</module>
     <module>eu.etaxonomy.taxeditor.navigation</module>
     <module>eu.etaxonomy.taxeditor.editor</module>
@@ -43,15 +45,15 @@
     <module>eu.etaxonomy.taxeditor.application</module>
     <module>eu.etaxonomy.taxeditor.feature.platform</module>
     <module>eu.etaxonomy.taxeditor.feature</module>
-    <module>eu.etaxonomy.taxeditor.feature.jre.linux64</module>
     <module>eu.etaxonomy.taxeditor</module>
+    <module>eu.etaxonomy.taxeditor.test</module>
   </modules>
   <scm>
-    <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/taxeditor/
+    <connection>scm:git:https://dev.e-taxonomy.eu/git/taxeditor.git
     </connection>
-    <developerConnection>scm:svn:https://dev.e-taxonomy.eu/svn/trunk/taxeditor/
+    <developerConnection>scm:git:ssh://git@dev.e-taxonomy.eu/var/git/taxeditor.git
     </developerConnection>
-    <url>https://dev.e-taxonomy.eu/trac/browser/trunk/taxeditor/</url>
+    <url>https://dev.e-taxonomy.eu/gitweb/taxeditor.git/tree</url>
   </scm>
   <mailingLists>
     <mailingList>
@@ -79,17 +81,35 @@
       <!-- 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>
+                Botanical Garden Botanical Museum Berlin
+            </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
-        <role>Java Developer</role>
         <role>Architect</role>
+        <role>Java Developer</role>
+        <role>Release Manager</role>
+      </roles>
+      <url/>
+    </developer>
+    <developer>
+      <!-- your SVN account id please! -->
+      <id>k.luther</id>
+      <name>
+                Katja Luther
+            </name>
+      <email>k.luther [at] bgbm.org</email>
+      <organization>
+                Botanical Garden Botanical Museum Berlin
+            </organization>
+      <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>Java Developer</role>
       </roles>
       <url/>
     </developer>
@@ -97,28 +117,46 @@
       <!-- 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>
+                Botanical Garden Botanical Museum Berlin
+            </organization>
       <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
       <timezone>+1</timezone>
       <roles>
-        <role>Java Developer</role>
         <role>Architect</role>
+        <role>Java Developer</role>
+        <role>Release Manager</role>
+      </roles>
+      <url/>
+    </developer>
+    <developer>
+      <!-- your SVN account id please! -->
+      <id>p.plitzner</id>
+      <name>
+               Patrick Plitzner
+            </name>
+      <email>p.plitzner [at] bgbm.org</email>
+      <organization>
+                Botanical Garden Botanical Museum Berlin
+            </organization>
+      <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
+      <timezone>+1</timezone>
+      <roles>
+        <role>Java Developer</role>
       </roles>
       <url/>
     </developer>
   </developers>
   <issueManagement>
-    <system>Trac</system>
-    <url>http://dev.e-taxonomy.eu/trac/</url>
+    <system>Redmine</system>
+    <url>https://dev.e-taxonomy.eu/redmine/projects/edit/</url>
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
-    <url>http://160.45.63.201/jenkins/view/EDIT%20Taxonomic%20Editor/
+    <url>http://int.e-taxonomy.eu/jenkins/view/EDIT%20Taxonomic%20Editor/
     </url>
   </ciManagement>
   <!-- **** REPOSITORIES **** -->
@@ -150,28 +188,36 @@
     <!-- the cdm internal repository -->
     <repository>
       <id>EditRepository</id>
-      <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+      <url>http://cybertaxonomy.eu/mavenrepo/</url>
     </repository>
     <repository>
       <id>eclipse-indigo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/
-      </url>
+      <url>http://download.eclipse.org/technology/swtbot/snapshots/</url>
     </repository>
-    <!-- The nebula repository (retention period 2 years starting Q32014) 
-      set here is an archived one so as to have a stable version of the jar when 
-      building the editor . Refer to #4452 for details -->
     <repository>
       <id>eclipse-nebula</id>
       <layout>p2</layout>
-      <url>http://archive.eclipse.org/nebula/Q32014/release/</url>
+      <url>http://download.eclipse.org/nebula/releases/latest</url>
     </repository>
     <repository>
-      <id>eclipse-swtbot</id>
+      <id>nattable</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/indigo/</url>
+      <url>http://download.eclipse.org/nattable/releases/1.5.0/repository/</url>
+    </repository>
+    <repository>
+      <id>eclipse-neon</id>
+      <layout>p2</layout>
+      <url>http://download.eclipse.org/releases/neon/</url>
     </repository>
   </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <!-- required for the plugin dependency cdmlib-db of the jetty-maven-plugin -->
+      <id>EditRepository</id>
+      <url>http://cybertaxonomy.eu/mavenrepo/</url>
+    </pluginRepository>
+  </pluginRepositories>
   <build>
     <plugins>
       <plugin>
@@ -239,6 +285,24 @@
           <target>${java.codelevel}</target>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>wagon-maven-plugin</artifactId>
+        <version>1.0</version>
+        <configuration>
+          <url>scpexe://cybertaxonomy.eu</url>
+          <serverId>cybertaxonomy.eu</serverId>
+        </configuration>
+        <executions>
+          <execution>
+            <id>upload-reference-documentation</id>
+            <phase>site-deploy</phase>
+            <goals>
+              <goal>upload</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -270,9 +334,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.3</version>
         <configuration>
           <locales>en</locales>
+          <outputEncoding>UTF-8</outputEncoding>
+          <!-- chmod: not not use chmod, rather adapt the umask of the user 
+            at the server to which the site is deployed -->
+          <chmod>false</chmod>
         </configuration>
       </plugin>
       <plugin>
@@ -298,6 +366,7 @@
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <executions>
           <execution>
@@ -347,10 +416,9 @@
           <allowUntracked>true</allowUntracked>
         </configuration>
         <dependencies>
-          <!-- 
-                upgrading dependency jsch.agent.version of jgit-flow plugin to 0.1.53 
-                in order have ssl key exchange algorithms compatible with openssh 6.7 
-             -->
+          <!-- upgrading dependency jsch.agent.version of jgit-flow plugin 
+            to 0.1.53 in order have ssl key exchange algorithms compatible with openssh 
+            6.7 -->
           <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
@@ -363,17 +431,17 @@
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-scm</artifactId>
-        <version>1.0-alpha-5</version>
+        <version>1.0-beta-6</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
-        <version>1.0-beta-7</version>
+        <version>2.12</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-beta-6</version>
+        <version>2.12</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.scm</groupId>
@@ -411,6 +479,7 @@
         <version>2.7</version>
         <configuration>
           <detectLinks>true</detectLinks>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
       </plugin>
       <plugin>
@@ -442,17 +511,26 @@
   <!-- DISTRIBUTION MANAGEMENT -->
   <distributionManagement>
     <site>
-      <id>wp5.e-taxonomy.eu</id>
+      <id>cybertaxonomy.eu</id>
       <name>EDIT Taxonomic Editor</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
+      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/taxeditor/
       </url>
     </site>
     <repository>
       <uniqueVersion>false</uniqueVersion>
-      <id>wp5.e-taxonomy.eu</id>
+      <id>cybertaxonomy.eu</id>
       <name>Edit Maven Repository</name>
-      <url>scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
+      <url>scpexe://cybertaxonomy.eu/var/www/wp5.e-taxonomy.eu/mavenrepo/
       </url>
     </repository>
   </distributionManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.itextpdf</groupId>
+        <artifactId>itextpdf</artifactId>
+        <version>5.5.8</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>