X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/405248eb93df4ee4222324e8ac4311aac9c3cd58..bc00fbdf52d78e36f3bc4c4b32714a0d0493ac01:/eu.etaxonomy.taxeditor.test/pom.xml

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index cf7350be2..405f29e7c 100644
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -1,104 +1,150 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project>
-
-  <parent>
-    <groupId>eu.etaxonomy</groupId>
-    <artifactId>taxeditor-parent</artifactId>
-    <version>3.11.0-SNAPSHOT</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>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <filters>
-            <!-- Work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045 -->
-            <!-- taken from https://wiki.eclipse.org/index.php?title=Tycho/Target_Platform#Filtering -->
-            <filter>
-              <type>p2-installable-unit</type>
-              <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
-              <removeAll />
-            </filter>
-          </filters>
-        </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>
-        <configuration>
-          <jvmArgs>-Xmx512m -XX:MaxPermSize=512m</jvmArgs>
-          <systemProperties>
-            <systemProperty>
-              <name>spring.profiles.active</name>
-              <value>remoting</value>
-            </systemProperty>
-            <systemProperty>
-              <name>cdm.beanDefinitionFile</name>
-              <value>${basedir}/src/test/resources/datasources.xml</value>
-            </systemProperty>
-            <systemProperty>
-              <name>cdm.datasource</name>
-              <value>cdmTest</value>
-            </systemProperty>
-          </systemProperties>
-          <stopPort>9191</stopPort>
-          <stopKey>jetty-cdm-server</stopKey>
-          <stopWait>10</stopWait>
-          <httpConnector>
-            <port>9090</port>
-          </httpConnector>
-          <war>${project.parent.basedir}/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war</war>
-          <daemon>true</daemon>
-        </configuration>
-        <executions>
-          <execution>
-            <id>start-jetty</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>deploy-war</goal>
-            </goals>
-            <configuration>
-              <scanIntervalSeconds>0</scanIntervalSeconds>
-            </configuration>
-          </execution>
-          <execution>
-            <id>stop-jetty</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
+<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>4.8.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>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <filters>
+            <!-- Work around for https://bugs.eclipse.org/bugs/show_bug.cgi?id=348045 -->
+            <!-- taken from https://wiki.eclipse.org/index.php?title=Tycho/Target_Platform#Filtering -->
+            <filter>
+              <type>p2-installable-unit</type>
+              <id>org.eclipse.equinox.servletbridge.extensionbundle</id>
+              <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>
+        
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-maven-plugin</artifactId>
+        <version>9.4.1.v20170120</version>
+        <configuration>
+          <systemProperties>
+            <force>true</force>
+            <systemProperty>
+              <name>cdm.datasource</name>
+              <value>cdmTest</value>
+            </systemProperty>
+            <systemProperty>
+              <!-- 
+                The lucene index should be placed into the target folder,
+                so user.home needs to be set to this folder.
+                user.home needs to be overridden since it already 
+                exists, thus the force option is turned on above 
+              -->
+              <name>user.home</name>
+              <value>${basedir}/target/</value>
+            </systemProperty> 
+            <systemProperty>
+              <name>spring.profiles.active</name>
+              <value>remoting</value>
+            </systemProperty>
+            <systemProperty>
+              <name>cdm.beanDefinitionFile</name>
+              <value>${basedir}/target/test-classes/datasources.xml</value>
+            </systemProperty>
+          </systemProperties>
+          <stopPort>9191</stopPort>
+          <stopKey>jetty-cdm-server</stopKey>
+          <stopWait>10</stopWait>
+          <httpConnector>
+            <port>9090</port>
+          </httpConnector>
+      <!-- 
+        ${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>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>deploy-war</goal>
+            </goals>
+            <configuration>
+              <scanIntervalSeconds>0</scanIntervalSeconds>
+            </configuration>
+          </execution>
+          <execution>
+            <id>stop-jetty</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file