X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/d637e4bab9be3f8bb6d7192555593a71e3f3a4e3..86f07c78eae3948dc3d5507b2e2c84591112776f:/pom.xml

diff --git a/pom.xml b/pom.xml
index b8308b9c2..68c5e0a31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
 <?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.8.0-SNAPSHOT</version>
+  <version>4.1.1</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -16,14 +16,26 @@
   <inceptionYear>2007</inceptionYear>
   <packaging>pom</packaging>
   <properties>
-    <java.codelevel>1.6</java.codelevel>
+    <java.codelevel>1.7</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>4.1.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>4.1.0</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>
@@ -35,9 +47,11 @@
     <module>eu.etaxonomy.taxeditor.help</module>
     <module>eu.etaxonomy.taxeditor.molecular</module>
     <module>eu.etaxonomy.taxeditor.molecular.lib</module>
+    <module>eu.etaxonomy.taxeditor.webapp</module>
     <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>
   </modules>
   <scm>
@@ -230,8 +244,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>2.3.2</version>
         <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.7</source>
+          <target>1.7</target>
         </configuration>
       </plugin>
       <plugin>
@@ -450,5 +464,4 @@
       </url>
     </repository>
   </distributionManagement>
-
 </project>