Merge branch 'release/4.7.0'

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a6e4ef896908ea7b554234ec4ddfb53de9fb6b53..4307f545ff1ddd4c65080ad4c560258c7d71e0a2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </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
@@ -18,13 +18,13 @@
   <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>1.0.0</tycho.version>
-    <taxeditor.version>4.7.0-SNAPSHOT</taxeditor.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>
@@ -32,6 +32,7 @@
   </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>
@@ -44,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>
@@ -115,7 +115,7 @@
     </developer>
   </developers>
   <issueManagement>
-    <system>Trac</system>
+    <system>Redmine</system>
     <url>https://dev.e-taxonomy.eu/redmine/projects/edit/</url>
   </issueManagement>
   <ciManagement>
@@ -157,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 
@@ -166,17 +165,17 @@
     <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 --> 
+      <!-- required for the plugin dependency cdmlib-db of the jetty-maven-plugin -->
       <id>EditRepository</id>
       <url>http://cybertaxonomy.eu/mavenrepo/</url>
     </pluginRepository>
@@ -211,11 +210,11 @@
         <version>${tycho.version}</version>
         <configuration>
           <environments>
-<!--             <environment> -->
-<!--               <os>macosx</os> -->
-<!--               <ws>cocoa</ws> -->
-<!--               <arch>x86_64</arch> -->
-<!--             </environment> -->
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
+              <arch>x86_64</arch>
+            </environment>
             <environment>
               <os>win32</os>
               <ws>win32</ws>
@@ -248,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>
@@ -489,11 +488,11 @@
   </distributionManagement>
   <dependencyManagement>
     <dependencies>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.8</version>
-        </dependency>
+      <dependency>
+        <groupId>com.itextpdf</groupId>
+        <artifactId>itextpdf</artifactId>
+        <version>5.5.8</version>
+      </dependency>
     </dependencies>
- </dependencyManagement>
+  </dependencyManagement>
 </project>