ref #5969: add PreferenceService to applicationController

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 0149c609d60760902b25fb22d1c464189720a3a6..fcef4425221953ef2c1534ba5ded1c88cc2db180 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -35,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>
@@ -1258,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>
@@ -1474,38 +1475,38 @@
         <version>2.4.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>
+      <!-- ******* DATABASES DRIVER ******* -->
       <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
-        <version>${mysql.version}</version>
+        <version>5.1.38</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>
+        <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>
@@ -1516,14 +1517,7 @@
         <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>
-      
+    </dependency>   -->      
     </dependencies>
   </dependencyManagement>
 </project>