From: Olivier Lamy <olamy@apache.org>
Date: Wed, 15 Jun 2011 21:38:13 +0000 (+0000)
Subject: upgrade cargo plugin to 1.1.1
X-Git-Tag: archiva-1.4-M1~619
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=3875bf1f0fc67a4f517b943bc629cf2e8ed85578;p=archiva.git

upgrade cargo plugin to 1.1.1

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

diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
index 3e56f8ebe..c1739afcf 100644
--- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
@@ -31,6 +31,12 @@
 
   <properties>
     <container.test.port>9696</container.test.port>
+    <tomcat5x.version>5.5.27</tomcat5x.version>
+    <cargo.wait>false</cargo.wait>
+    <cargo.install.dir>cargo-installs</cargo.install.dir>
+    <maxWaitTimeInMs>60000</maxWaitTimeInMs>
+    <!-- TODO: review how appropriate the memory settings are - should work with less -->
+    <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
   </properties>
 
   <dependencies>
@@ -334,7 +340,7 @@
           <plugin>
             <groupId>org.codehaus.cargo</groupId>
             <artifactId>cargo-maven2-plugin</artifactId>
-            <version>1.0</version>
+            <version>1.1.1</version>
             <executions>
               <execution>
                 <id>start-container</id>
@@ -542,12 +548,5 @@
       </properties>
     </profile>
   </profiles>
-  <properties>
-    <tomcat5x.version>5.5.27</tomcat5x.version>
-    <cargo.wait>false</cargo.wait>
-    <cargo.install.dir>cargo-installs</cargo.install.dir>
-    <maxWaitTimeInMs>60000</maxWaitTimeInMs>
-    <!-- TODO: review how appropriate the memory settings are - should work with less -->
-    <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
-  </properties>
+
 </project>