#5751 Remove explicit dependencies to DB drivers by cdmlib-db in poms

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index f67047a0caca857d4ab47a25a3fc9329b5656f98..200e91bcee49fdb1e64b06911cf2aa368c0be27e 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -121,27 +121,33 @@
           <daemon>true</daemon>
         </configuration>
         <dependencies>
           <daemon>true</daemon>
         </configuration>
         <dependencies>

-            <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
-            <!-- 
-              IMPORTANT!!!
-              this must exactly match the version as set in 
-              cdmlib-parent pom.xml
-            -->
-            <version>${c3p0.version}</version>
-          </dependency>
-          <!-- DATABASE DRIVER -->
-          <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>${mysql.version}</version>
-          </dependency>
+               <dependency>
+               <groupId>eu.etaxonomy</groupId>
+               <artifactId>cdmlib-db</artifactId>
+               <version>${cdmlib.version}</version>
+       </dependency>
+<!--             <dependency> -->
+<!--             <groupId>com.mchange</groupId> -->
+<!--             <artifactId>c3p0</artifactId> -->
+<!--             
+<!--               IMPORTANT!!! -->
+<!--               this must exactly match the version as set in  -->
+<!--               cdmlib-parent pom.xml -->
+<!--             --> -->
+<!--             <version>${c3p0.version}</version> -->
+<!--           </dependency> -->
+<!--           DATABASE DRIVER -->
+<!--           <dependency> -->
+<!--             <groupId>com.h2database</groupId> -->
+<!--             <artifactId>h2</artifactId> -->
+<!--             <version>${h2.version}</version> -->
+<!--           </dependency> -->
+<!--           <dependency> -->
+<!--             <groupId>mysql</groupId> -->
+<!--             <artifactId>mysql-connector-java</artifactId> -->
+<!--             <version>${mysql.version}</version> -->
+<!--           </dependency> -->
+                 <!-- Do we still need this? If yes, should we move it to cdmlib-db? -->

           <dependency>
               <groupId>commons-dbcp</groupId>
               <artifactId>commons-dbcp</artifactId>
           <dependency>
               <groupId>commons-dbcp</groupId>
               <artifactId>commons-dbcp</artifactId>

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 7167552cb0031ba4e6ec9a5b219c23230b8040ba..dc67cc892f8e6f6e0f354da6714a329111415d13 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -123,25 +123,10 @@
       <type>war</type>
     </dependency>
     <dependency>
       <type>war</type>
     </dependency>
     <dependency>

-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
-    </dependency>
-    <dependency>
-        <groupId>mysql</groupId>
-        <artifactId>mysql-connector-java</artifactId>
-        <version>5.1.24</version>
+      <groupId>eu.etaxonomy</groupId>
+      <artifactId>cdmlib-db</artifactId>
+      <version>${cdmlib.version}</version>

     </dependency>
     </dependency>

-     <dependency>
-      <groupId>com.mchange</groupId>
-      <artifactId>c3p0</artifactId>
-      <version>${c3p0.version}</version>
-     </dependency>
-     <dependency>
-        <groupId>com.mchange</groupId>
-        <artifactId>mchange-commons-java</artifactId>
-        <version>${mchange-commons-java.version}</version>
-     </dependency>

      <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
      <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>

diff --git a/pom.xml b/pom.xml
index ff8151e551ad755190f4f6e2b1523452b55e6737..b57c6c6282a6b0fbe558367c4bab8901df540f74 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,17 +25,6 @@
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.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>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>