Fix merge problems

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 24956d3ef82c3ce3f172e3867759bd09740c1dcd..fcef4425221953ef2c1534ba5ded1c88cc2db180 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>4.0.0</version>
+  <version>4.3.0-SNAPSHOT</version>
   <name>CDM Library</name>
   <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
   <url>http://cybertaxonomy.eu/cdmlib/</url>
@@ -12,7 +12,8 @@
   <modules>
     <module>cdmlib-commons</module>
     <module>cdmlib-model</module>
-       <module>cdmlib-test</module>
+       <module>cdmlib-db</module>
+    <module>cdmlib-test</module>
     <module>cdmlib-persistence</module>
     <module>cdmlib-services</module>
     <module>cdmlib-ext</module>
@@ -23,7 +24,7 @@
   </modules>
   <properties>    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.codelevel>1.6</java.codelevel>
+    <java.codelevel>1.7</java.codelevel>
     <spring.version>4.2.4.RELEASE</spring.version>
     <spring-security.version>4.0.3.RELEASE</spring-security.version>
        <hibernate.version>5.0.7.Final</hibernate.version>
@@ -34,7 +35,6 @@
     <hsqldb.version>2.3.3</hsqldb.version>
        <!-- <hsqldb.version>1.8.0.10</hsqldb.version>  -->
        <!-- 1.8.0.10, 1.9.0-rc6 (manually build only for debugging) -->
-       <mysql.version>5.1.38</mysql.version>
     <httpcomponents.version>4.5.1</httpcomponents.version>
     <doxia.version>1.6</doxia.version>
     <poi.version>3.13</poi.version>
@@ -1096,7 +1096,12 @@
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <version>2.0.2</version>
+        <!-- 
+            WARNING: do not upgrade to later versions 2.0.x of xml-apis
+            since these are effectivly reloated to the early beta version
+            1.0.b2
+        -->
+        <version>1.4.01</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -1252,6 +1257,8 @@
           version in cdm-server pom.xml must be changed 
           the same otherwise db connections through jndi 
           will not work!
+                 NOTE: not so critical anymore as we use cdmlib-db
+                 now for both projects
         -->
         <version>0.9.5.2</version>
       </dependency>
@@ -1374,55 +1381,7 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>3.1.0</version>
       </dependency>
-      <!-- ******* DATABASES DRIVER ******* -->
-      <!-- 
-            IMPORTANT:
-            Any driver dependency listed here must be excluded from the 
-            cdmlib-remote depedency in cdmlib-remote-webapp
-       -->
-      <dependency>
-        <!-- SQL Server and Sybase -->
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>1.3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>mysql</groupId>
-        <artifactId>mysql-connector-java</artifactId>
-        <version>${mysql.version}</version>
-      </dependency>
-         <dependency>
-            <groupId>org.postgresql</groupId>
-            <artifactId>postgresql</artifactId>
-            <version>9.4-1206-jdbc4</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
-      </dependency>
-      <!--for sqlserver2008 and sqlserver2005 -->
-      <dependency>
-        <groupId>com.microsoft.sqlserver</groupId>
-        <artifactId>jdbc4</artifactId>
-        <version>2.0</version>
-      </dependency>
-      <dependency>
-        <groupId>oracle</groupId>
-        <artifactId>ojdbc14</artifactId>
-        <version>10.2.0.4.0</version>
-      </dependency>
-         <!--    <dependency>
-               <groupId>ojdbc</groupId>
-               <artifactId>ojdbc</artifactId>
-               <version>14</version>
-       </dependency>   -->
-      <dependency>
-        <groupId>com.h2database</groupId>
-        <artifactId>h2</artifactId>
-        <!-- <version>1.1.115</version> -->
-        <version>1.4.190</version>
-      </dependency>
+
       <!-- yourkit profiler api controller (used in ..) -->
       <dependency>
         <groupId>com.yourkit</groupId>
@@ -1515,6 +1474,50 @@
         <artifactId>springfox-swagger2</artifactId>
         <version>2.4.0</version>
       </dependency>
+      
+      <!-- ******* DATABASES DRIVER ******* -->
+      <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>5.1.38</version>
+      </dependency>
+      <dependency>
+         <groupId>org.postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+         <version>9.4-1206-jdbc4</version>
+      </dependency>
+         <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>1.4.190</version>
+      </dependency>
+      <!--for sqlserver2008 and sqlserver2005 -->
+      <dependency>
+        <groupId>com.microsoft.sqlserver</groupId>
+        <artifactId>jdbc4</artifactId>
+        <version>2.0</version>
+      </dependency>
+         <dependency>
+        <groupId>org.hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>${hsqldb.version}</version>
+      </dependency>
+      <dependency>
+        <!-- SQL Server and Sybase -->
+        <groupId>net.sourceforge.jtds</groupId>
+        <artifactId>jtds</artifactId>
+        <version>1.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>oracle</groupId>
+        <artifactId>ojdbc14</artifactId>
+        <version>10.2.0.4.0</version>
+      </dependency>
+      <!--    <dependency>
+        <groupId>ojdbc</groupId>
+        <artifactId>ojdbc</artifactId>
+        <version>14</version>
+    </dependency>   -->      
     </dependencies>
   </dependencyManagement>
 </project>