ref #5305 Refactored combo elements

[taxeditor.git] / eu.etaxonomy.taxeditor.test / pom.xml

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 2f09dd2d8c61eeeb6b359a21bf9abd468ee6d3ac..88d885b85f2d254e7ab774efadd310f950189b27 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -3,13 +3,36 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.3.0-SNAPSHOT</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
   <name>UI Test Bundle</name>
   <description>Holds all Tests for the Taxonomic Editor</description>
   <build>
+  <resources>
+      <resource>
+        <!-- replace the place holders like ${...} in datasources.xml -->
+        <filtering>true</filtering>
+        <directory>src/test/resources</directory>
+        <targetPath>../test-classes</targetPath>
+        <includes>
+          <include>datasources.xml</include>
+        </includes>
+      </resource>
+      <resource>
+        <!-- all other test resources without filtering -->
+        <directory>src/test/resources</directory>
+        <targetPath>../test-classes</targetPath>
+        <excludes>
+          <exclude>datasources.xml</exclude>
+        </excludes>
+      </resource>
+      <resource>
+        <!-- all main resources without filtering -->
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
     <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
@@ -98,46 +121,17 @@
           <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>0.9.5.2</version>
-          </dependency>
-          <!-- DATABASE DRIVER -->
-          <dependency>
-            <groupId>com.h2database</groupId>
-            <artifactId>h2</artifactId>
-            <version>1.4.190</version>
-          </dependency>
-          <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
-          </dependency>
+               <dependency>
+                       <groupId>eu.etaxonomy</groupId>
+                       <artifactId>cdmlib-db</artifactId>
+                       <version>${cdmlib.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>
               <version>1.4</version>
           </dependency>
-<!--           <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-          </dependency> -->
-          <!--  
-          <dependency>
-            <groupId>eu.etaxonomy</groupId>
-            <artifactId>cdmlib-persistence</artifactId>
-            <version>${project.version}</version>
-            <exclusions>
-            </exclusions>
-          </dependency>
-          -->
         </dependencies>
         <executions>
           <execution>