Author: bvahdat
Date: Mon Aug 20 10:33:37 2012
New Revision: 1374965

URL: http://svn.apache.org/viewvc?rev=1374965&view=rev
Log:
Merged revisions 1350031 via svnmerge from 
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x

........
  r1350031 | hadrian | 2012-06-13 23:48:15 +0200 (Mi, 13 Jun 2012) | 1 line
  
  Fix sshd version
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/components/camel-ftp/pom.xml

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1350031

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.9.x/components/camel-ftp/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-ftp/pom.xml?rev=1374965&r1=1374964&r2=1374965&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/components/camel-ftp/pom.xml (original)
+++ camel/branches/camel-2.9.x/components/camel-ftp/pom.xml Mon Aug 20 10:33:37 
2012
@@ -40,7 +40,6 @@
   </properties>
 
   <dependencies>
-
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
@@ -73,7 +72,7 @@
       <scope>test</scope>
     </dependency>
 
-      <!-- for unit testing AntPathMatcher -->
+    <!-- for unit testing AntPathMatcher -->
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-spring</artifactId>
@@ -92,22 +91,22 @@
       <scope>test</scope>
     </dependency>
 
-      <!-- for testing sftp -->
-      <dependency>
-          <groupId>org.apache.sshd</groupId>
-          <artifactId>sshd-core</artifactId>
-          <version>0.4.0</version>
-          <scope>test</scope>
-      </dependency>
-      <!-- needed for sftp server -->
-      <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.bcpg-jdk16</artifactId>
-          <version>1.46_1</version>
-          <scope>test</scope>
-      </dependency>
+    <!-- for testing sftp -->
+    <dependency>
+      <groupId>org.apache.sshd</groupId>
+      <artifactId>sshd-core</artifactId>
+      <version>${sshd-version}</version>
+      <scope>test</scope>
+    </dependency>
+    <!-- needed for sftp server -->
+    <dependency>
+      <groupId>org.bouncycastle</groupId>
+      <artifactId>bcpg-jdk16</artifactId>
+      <version>${bouncycastle-version}</version>
+      <scope>test</scope>
+    </dependency>
 
-      <!-- ftpserver using mina 2.0.0 -->
+    <!-- ftpserver using mina 2.0.0 -->
     <dependency>
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>


Reply via email to