corrected merge to latest snapshot version

[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 6bf850435417960fd35e5647c76759a5fd53dfa1..eef8eb1612ecac250274595b1459d7df533f9b79 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.5.2-SNAPSHOT</version>\r
+    <version>3.6.1-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>\r
@@ -34,12 +34,13 @@
         <artifactId>tycho-surefire-plugin</artifactId>\r
         <version>${tycho.version}</version>\r
         <configuration>\r
-          <!-- currently we run only the non-ui unit tests so we don't  the harness-->\r
+          <!-- currently we run only the non-ui unit tests so we don't the \r
+            harness -->\r
           <!-- <useUIHarness>true</useUIHarness> -->\r
           <dependencies>\r
-          <!-- This will pull the feature and its dependent plugins into the classpath\r
-               for the tests. Note that this requires ALL taxeditor projects to be\r
-               installed. -->\r
+            <!-- This will pull the feature and its dependent plugins into \r
+              the classpath for the tests. Note that this requires ALL taxeditor projects \r
+              to be installed. -->\r
             <dependency>\r
               <type>eclipse-feature</type>\r
               <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>\r
@@ -49,6 +50,54 @@
           </dependencies>\r
         </configuration>\r
       </plugin>\r
+      <plugin>\r
+        <groupId>org.eclipse.jetty</groupId>\r
+        <artifactId>jetty-maven-plugin</artifactId>\r
+        <version>9.2.9.v20150224</version>\r
+        <configuration>\r
+          <systemProperties>\r
+            <systemProperty>\r
+              <name>spring.profiles.active</name>\r
+              <value>remoting</value>\r
+            </systemProperty>\r
+            <systemProperty>\r
+              <name>cdm.beanDefinitionFile</name>\r
+              <value>${basedir}/src/test/resources/datasources.xml</value>\r
+            </systemProperty>\r
+            <systemProperty>\r
+              <name>cdm.datasource</name>\r
+              <value>cdmTest</value>\r
+            </systemProperty>\r
+          </systemProperties>\r
+          <stopPort>9191</stopPort>\r
+          <stopKey>jetty-cdm-server</stopKey>\r
+          <stopWait>10</stopWait>\r
+          <httpConnector>\r
+            <port>9090</port>\r
+          </httpConnector>\r
+          <war>${project.parent.basedir}/eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war</war>\r
+          <daemon>true</daemon>\r
+        </configuration>\r
+        <executions>\r
+          <execution>\r
+            <id>start-jetty</id>\r
+            <phase>pre-integration-test</phase>\r
+            <goals>\r
+              <goal>deploy-war</goal>\r
+            </goals>\r
+            <configuration>\r
+              <scanIntervalSeconds>0</scanIntervalSeconds>              \r
+            </configuration>\r
+          </execution>\r
+          <execution>\r
+            <id>stop-jetty</id>\r
+            <phase>post-integration-test</phase>\r
+            <goals>\r
+              <goal>stop</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+      </plugin>\r
     </plugins>\r
   </build>\r
 </project>
\ No newline at end of file