X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/b33dd5d97928eb3baa93aa209d29520f0a32b7c9..5b852e5bab53b546a32b71de4ea5dbe5bd4c2d7f:/pom.xml

diff --git a/pom.xml b/pom.xml
index 26686ba6b..4307f545f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,31 +6,33 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.7.0-SNAPSHOT</version>
+  <version>4.7.0</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.7.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>4.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.7.0-SNAPSHOT</taxeditor.version>
+    <tycho.version>1.0.0</tycho.version>
+    <taxeditor.version>4.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,7 +45,6 @@
     <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>
@@ -114,7 +115,7 @@
     </developer>
   </developers>
   <issueManagement>
-    <system>Trac</system>
+    <system>Redmine</system>
     <url>https://dev.e-taxonomy.eu/redmine/projects/edit/</url>
   </issueManagement>
   <ciManagement>
@@ -156,8 +157,7 @@
     <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 
@@ -165,14 +165,21 @@
     <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>eclipse-neon</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/indigo/</url>
+      <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>
@@ -240,11 +247,11 @@
           <target>${java.codelevel}</target>
         </configuration>
       </plugin>
-	  <plugin>
+      <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
         <version>1.0</version>
-		<configuration>
+        <configuration>
           <url>scpexe://cybertaxonomy.eu</url>
           <serverId>cybertaxonomy.eu</serverId>
         </configuration>
@@ -321,6 +328,7 @@
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
         <executions>
           <execution>
@@ -433,6 +441,7 @@
         <version>2.7</version>
         <configuration>
           <detectLinks>true</detectLinks>
+          <additionalparam>${javadoc.opts}</additionalparam>
         </configuration>
       </plugin>
       <plugin>
@@ -477,4 +486,13 @@
       </url>
     </repository>
   </distributionManagement>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.itextpdf</groupId>
+        <artifactId>itextpdf</artifactId>
+        <version>5.5.8</version>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
 </project>