Author: bvahdat
Date: Sat Dec 1 11:38:26 2012
New Revision: 1415980
URL: http://svn.apache.org/viewvc?rev=1415980&view=rev
Log:
Merged revisions 1415979 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1415979 | bvahdat | 2012-12-01 12:36:30 +0100 (Sa, 01 Dez 2012) | 2 lines
CAMEL-5841: Re-enable the sftp tests again being disabled. As well polished
the pom a bit.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ftp/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1415979
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-ftp/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/pom.xml?rev=1415980&r1=1415979&r2=1415980&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/pom.xml Sat Dec 1
11:38:26 2012
@@ -62,11 +62,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
@@ -123,15 +118,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <excludes>
- <!-- skip sftp tests as they can hang CI servers -->
-
<exclude>org/apache/camel/component/file/remote/sftp/**.java</exclude>
- </excludes>
+ <!-- The default timeout of 5 minutes through the parent pom is not
long enough -->
<forkedProcessTimeoutInSeconds>1800</forkedProcessTimeoutInSeconds>
- <systemPropertyVariables>
- <ftp.enable>${ftp.enable}</ftp.enable>
- <ftp.server>${ftp.url}</ftp.server>
- </systemPropertyVariables>
</configuration>
</plugin>
