From: Olivier Lamy <olamy@apache.org>
Date: Sun, 9 Oct 2011 14:12:24 +0000 (+0000)
Subject:  add some configuration to run unit tests with embeded tomcat: jetty still default
X-Git-Tag: archiva-1.4-M1~47
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=13bc1609f4a8288707cd4e626cad987cf8f5e3eb;p=archiva.git

 add some configuration to run unit tests with embeded tomcat: jetty still default

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1180621 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 90f06a75b..c517f1c3f 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -31,7 +31,9 @@
   <properties>
     <jettyVersion>7.4.5.v20110725</jettyVersion>
     <archiva.baseRestUrl></archiva.baseRestUrl>
+    <tomcatVersion>7.0.21</tomcatVersion>
     <rest.admin.pwd></rest.admin.pwd>
+    <test.useTomcat>false</test.useTomcat>
   </properties>
 
   <dependencies>
@@ -193,6 +195,34 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-servlet-api</artifactId>
+      <version>${tomcatVersion}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-core</artifactId>
+      <version>${tomcatVersion}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>tomcat-juli</artifactId>
+      <version>${tomcatVersion}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tomcat.embed</groupId>
+      <artifactId>tomcat-embed-logging-juli</artifactId>
+      <version>${tomcatVersion}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
@@ -275,6 +305,7 @@
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
             <archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
             <rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
+            <test.useTomcat>${test.useTomcat}</test.useTomcat>
           </systemPropertyVariables>
         </configuration>
       </plugin>