diff options
| author | Brett Porter <brett@apache.org> | 2011-10-01 15:19:31 +0000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2011-10-01 15:19:31 +0000 |
| commit | 027e72163413b863b84f28ea875b9c362c349c59 (patch) | |
| tree | c4b1fc1562215a6d5f53a81eda7768d2a042edb4 /archiva-modules/archiva-web/archiva-webapp-test/pom.xml | |
| parent | e2ee507bff5dbbe3406416f407ac087590186c5e (diff) | |
| download | archiva-027e72163413b863b84f28ea875b9c362c349c59.tar.gz archiva-027e72163413b863b84f28ea875b9c362c349c59.zip | |
upgrade TestNG and resolve some issues with test ordering
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1178013 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web/archiva-webapp-test/pom.xml')
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp-test/pom.xml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml index b69c5cb09..79ce3b79a 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml @@ -36,7 +36,7 @@ <cargo.wait>false</cargo.wait> <cargo.timeout>600000</cargo.timeout> <cargo.install.dir>${project.build.directory}/cargo/installs</cargo.install.dir> - <maxWaitTimeInMs>30000</maxWaitTimeInMs> + <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.0</seleniumPluginVersion> @@ -49,9 +49,8 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.9</version> + <version>6.2.1</version> <scope>test</scope> - <classifier>jdk15</classifier> </dependency> <dependency> <groupId>commons-io</groupId> |