svn commit: r1448844 - in /archiva/trunk/archiva-modules/archiva-web: archiva-webapp-test/pom.xml pom.xml

[ol...@apache.org]

Author: olamy
Date: Thu Feb 21 22:58:43 2013
New Revision: 1448844

URL: http://svn.apache.org/r1448844
Log:
cleanup not used properties

Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
    archiva/trunk/archiva-modules/archiva-web/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1448844&r1=1448843&r2=1448844&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Thu Feb 21 22:58:43 2013
@@ -33,6 +33,10 @@
     <webappDirectory>${project.build.directory}/tomcat7x/webapps/archiva</webappDirectory>
     <container.test.port>0</container.test.port>
     <tomcat.propertiesPortFilePath>${project.build.directory}/tomcat-port.properties</tomcat.propertiesPortFilePath>
+    <maxWaitTimeInMs>10000</maxWaitTimeInMs>
+
+    <seleniumPluginVersion>2.3</seleniumPluginVersion>
+    <selenium-server.version>2.28.0</selenium-server.version>
   </properties>
 
   <dependencies>

Modified: archiva/trunk/archiva-modules/archiva-web/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/pom.xml?rev=1448844&r1=1448843&r2=1448844&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/pom.xml Thu Feb 21 22:58:43 2013
@@ -26,22 +26,6 @@
   <name>Archiva :: Web</name>
   <packaging>pom</packaging>
 
-  <properties>
-    <container.test.port>9696</container.test.port>
-    <tomcat5x.version>5.5.34</tomcat5x.version>
-    <tomcat6x.version>6.0.35</tomcat6x.version>
-    <cargo.wait>false</cargo.wait>
-    <cargo.timeout>600000</cargo.timeout>
-    <cargo.install.dir>${project.build.directory}/cargo/installs</cargo.install.dir>
-    <maxWaitTimeInMs>10000</maxWaitTimeInMs>
-    <!-- TODO: review how appropriate the memory settings are - should work with less -->
-    <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
-    <seleniumPluginVersion>2.3</seleniumPluginVersion>
-    <selenium-server.version>2.28.0</selenium-server.version>
-    <apache.mirror.url>http://archive.apache.org/dist</apache.mirror.url>
-    <apache.archive.url>http://archive.apache.org/dist</apache.archive.url>
-  </properties>
-
   <modules>
     <module>archiva-security</module>
     <module>archiva-webdav</module>