Updating develop poms back to pre merge state

[cdmlib.git] / cdmlib-test / pom.xml

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 93327fd90d814bccf516b47ec56afaf941a9b41c..3e7b95d92a1ca14bae28acaaa5e396e1e13a8dd9 100644 (file)
--- a/cdmlib-test/pom.xml
+++ b/cdmlib-test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>3.12.0-SNAPSHOT</version>
+    <version>4.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -38,9 +38,9 @@
         </configuration>
         <dependencies>
           <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>${hsqldb.version}</version>
+            <groupId>eu.etaxonomy</groupId>
+            <artifactId>cdmlib-db</artifactId>
+            <version>${project.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
@@ -70,9 +70,9 @@
         </configuration>
          <dependencies>
           <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>${hsqldb.version}</version>
+            <groupId>eu.etaxonomy</groupId>
+            <artifactId>cdmlib-db</artifactId>
+            <version>${project.version}</version>
           </dependency>
           <dependency>
             <groupId>org.hibernate</groupId>
@@ -189,32 +189,33 @@
     </dependency>
 
     <!-- ******* DATABASES DRIVER ******* -->
-
+    <!-- not really in use anymore -->
     <dependency>
       <groupId>org.hsqldb</groupId>
       <artifactId>hsqldb</artifactId>
       <scope>compile</scope>
     </dependency>
-    <!-- SQL Server and Sybase -->
 
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-    </dependency>
-
-    <!--  SQL Debugging  -->
-    <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
-        <scope>compile</scope>
+      <scope>compile</scope>
     </dependency>
     
+    <!-- still creates problems in cdmlib-remote-webapp testing with MySQL connector -->
+<!--     <dependency> -->
+<!--       <groupId>eu.etaxonomy</groupId> -->
+<!--       <artifactId>cdmlib-db</artifactId> -->
+<!--       <version>${project.version}</version> -->
+<!--       <scope>compile</scope> -->
+<!--     </dependency> -->
+
   
        <!-- Profiling -->
        <dependency>
                <groupId>com.yourkit</groupId>
                <artifactId>yjp-controller-api-redist</artifactId>
-    <scope>compile</scope>
+        <scope>compile</scope>
        </dependency>
 
     <!-- required by Xerces 2.11.0 -->