X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/b550797b7e68178838b1c8afc77b37b728b8586d..aaf589101318e3b0b6b0c8acfc14eb23d71e094c:/pom.xml

diff --git a/pom.xml b/pom.xml
index f4ee78e6a..aef3c81b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.2.0</version>
+  <version>4.6.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -16,26 +16,18 @@
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
-    <java.codelevel>1.7</java.codelevel>
+    <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>4.2.0</cdmlib.version>
+    <cdmlib.version>4.6.0-SNAPSHOT</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.2.0</taxeditor.version>
+    <taxeditor.version>4.6.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>
-    <!-- data base driver related properties -->
-    <mysql.version>5.1.38</mysql.version>
-    <h2.version>1.4.190</h2.version>
-    <!-- 
-      IMPORTANT!!!
-      c3p0.version must exactly match the version as 
-      set in cdmlib-parent pom.xml
-    -->
-    <c3p0.version>0.9.5.2</c3p0.version>
-    <!-- mchange-commons-java needs to match the version as defined in the c3p0/pom.xml -->
-    <mchange-commons-java.version>0.2.11</mchange-commons-java.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -53,6 +45,7 @@
     <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/
@@ -172,13 +165,12 @@
     <repository>
       <id>eclipse-nebula</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/technology/nebula/archives/Q32014/release/
-      </url>
+      <url>http://archive.eclipse.org/nebula/Q32014/release/</url>
     </repository>
     <repository>
       <id>eclipse-swtbot</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/releases/indigo</url>
+      <url>http://download.eclipse.org/releases/indigo/</url>
     </repository>
   </repositories>
   <build>
@@ -242,10 +234,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.6.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>${java.codelevel}</source>
+          <target>${java.codelevel}</target>
         </configuration>
       </plugin>
       <plugin>
@@ -287,7 +279,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>3.0.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>