X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/b86cb27af63367d43ca9f19bd67b3cbc752d9bbb..80f2639043ad717997ac4fb7ac64beea8d696074:/eu.etaxonomy.taxeditor.test/pom.xml

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index ad86d6ceb..24f4cf961 100644
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -1,17 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.13.0-SNAPSHOT</version>
+    <version>4.9.0</version>
   </parent>
-  <modelVersion>4.0.0</modelVersion>
   <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>
@@ -27,61 +48,34 @@
               <removeAll />
             </filter>
           </filters>
+          <dependency-resolution>
+           <extraRequirements>
+              <requirement>
+                 <type>eclipse-feature</type>
+                 <id>eu.etaxonomy.taxeditor.feature</id>
+                 <versionRange>1.0.0</versionRange>
+              </requirement>
+           </extraRequirements>
+        </dependency-resolution>
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-surefire-plugin</artifactId>
         <version>${tycho.version}</version>
-        <configuration>
-          <!-- currently we run only the non-ui unit tests so we don't the 
-            harness -->
-          <!-- <useUIHarness>true</useUIHarness> -->
-          <dependencies>
-            <!-- This will pull the feature and its dependent plugins into 
-              the classpath for the tests. Note that this requires ALL taxeditor projects 
-              to be installed. -->
-            <dependency>
-              <type>eclipse-feature</type>
-              <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
-              <!-- This is the minimum required version -->
-              <version>1.0.0</version>
-            </dependency>
-          </dependencies>
-        </configuration>
+        
       </plugin>
       <plugin>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
-        <version>9.2.9.v20150224</version>
-        <dependencies>
-            <dependency>
-            <groupId>com.mchange</groupId>
-            <artifactId>c3p0</artifactId>
-            <!-- 
-              IMPORTANT!!!
-              this must exactly match the version as set in 
-              cdmlib-parent pom.xml otherwise the connection 
-              through jndi will not work
-            -->
-            <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>
-        </dependencies>
+        <version>9.4.1.v20170120</version>
         <configuration>
-          <jvmArgs>-Xmx512m -XX:MaxPermSize=512m</jvmArgs>
           <systemProperties>
             <force>true</force>
+            <systemProperty>
+              <name>cdm.datasource</name>
+              <value>cdmTest</value>
+            </systemProperty>
             <systemProperty>
               <!-- 
                 The lucene index should be placed into the target folder,
@@ -98,11 +92,7 @@
             </systemProperty>
             <systemProperty>
               <name>cdm.beanDefinitionFile</name>
-              <value>${basedir}/src/test/resources/datasources.xml</value>
-            </systemProperty>
-            <systemProperty>
-              <name>cdm.datasource</name>
-              <value>cdmTest</value>
+              <value>${basedir}/target/test-classes/datasources.xml</value>
             </systemProperty>
           </systemProperties>
           <stopPort>9191</stopPort>
@@ -111,9 +101,30 @@
           <httpConnector>
             <port>9090</port>
           </httpConnector>
-          <war>${project.parent.basedir}/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war</war>
+      <!-- 
+        ${project.parent.basedir} can not be used due to the bug
+        https://issues.apache.org/jira/browse/MNG-5522 
+        as long as this is unfixed we replace it by 
+        ${basedir}/../
+      -->
+          <war>${basedir}/../eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war</war>
           <daemon>true</daemon>
         </configuration>
+        <dependencies>
+            <!-- NOTE: This dependency requires that the  
+                EditRepository is configured as pluginRepository -->
+        	<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>
+        </dependencies>
         <executions>
           <execution>
             <id>start-jetty</id>