From 1e1814264f565674c6f8fa56b93280450421fec5 Mon Sep 17 00:00:00 2001
From: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date: Fri, 11 Mar 2016 09:17:39 +0100
Subject: [PATCH] fixing maven-jetty-plugin dependencies

---
 eu.etaxonomy.taxeditor.test/pom.xml | 105 +++++++++++++++-------------
 1 file changed, 55 insertions(+), 50 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index db84cc4af..13d32aed9 100644
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -52,6 +52,51 @@
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>9.1.3.v20140225</version><!-- do not update, since later versions are no longer compatible to java 7  -->
+        <!-- 
+            To see the detailed list of parameters that can be configured for a particular goal:
+            mvn jetty:help -Ddetail=true -Dgoal= goal-name
+         -->
+        <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}/src/test/resources/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>
             <dependency>
             <groupId>com.mchange</groupId>
@@ -59,8 +104,7 @@
             <!-- 
               IMPORTANT!!!
               this must exactly match the version as set in 
-              cdmlib-parent pom.xml otherwise the connection 
-              through jndi will not work
+              cdmlib-parent pom.xml
             -->
             <version>0.9.5.2</version>
           </dependency>
@@ -80,60 +124,21 @@
               <artifactId>commons-dbcp</artifactId>
               <version>1.4</version>
           </dependency>
+<!--           <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
+          </dependency> -->
+          <!--  
           <dependency>
-            <!-- needed to make eu.etaxonomy.cdm.database.LocalH2 available -->
             <groupId>eu.etaxonomy</groupId>
             <artifactId>cdmlib-persistence</artifactId>
             <version>${project.version}</version>
+            <exclusions>
+            </exclusions>
           </dependency>
-          <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-          </dependency>
+          -->
         </dependencies>
-        <configuration>
-          <jvmArgs>-Xmx512m -XX:MaxPermSize=512m</jvmArgs>
-          <systemProperties>
-            <force>true</force>
-            <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}/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>
-	  <!-- 
-	    ${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>
         <executions>
           <execution>
             <id>start-jetty</id>
-- 
2.34.1