Return-Path: 
 <commits-return-20168-apmail-camel-commits-archive=camel.apache.org@camel.apache.org>
X-Original-To: apmail-camel-commits-archive@www.apache.org
Delivered-To: apmail-camel-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id CA640927E
	for <apmail-camel-commits-archive@www.apache.org>;
 Mon,  2 Apr 2012 20:56:33 +0000 (UTC)
Received: (qmail 71433 invoked by uid 500); 2 Apr 2012 20:56:33 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 71367 invoked by uid 500); 2 Apr 2012 20:56:33 -0000
Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@camel.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@camel.apache.org>
List-Post: <mailto:commits@camel.apache.org>
List-Id: <commits.camel.apache.org>
Reply-To: dev@camel.apache.org
Delivered-To: mailing list commits@camel.apache.org
Received: (qmail 71360 invoked by uid 99); 2 Apr 2012 20:56:33 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 20:56:33 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 20:56:31 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 5D8E12388860;
	Mon,  2 Apr 2012 20:56:10 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1308556 - in /camel/branches/camel-2.9.x: ./
 apache-camel/pom.xml apache-camel/src/main/descriptors/common-bin.xml
Date: Mon, 02 Apr 2012 20:56:10 -0000
To: commits@camel.apache.org
From: hadrian@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120402205610.5D8E12388860@eris.apache.org>

Author: hadrian
Date: Mon Apr  2 20:56:09 2012
New Revision: 1308556

URL: http://svn.apache.org/viewvc?rev=1308556&view=rev
Log:
Merged revisions 1307712 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1307712 | hadrian | 2012-03-30 23:44:17 -0400 (Fri, 30 Mar 2012) | 1 line
  
  CAMEL-5020. Add component to distro.
........

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    camel/branches/camel-2.9.x/apache-camel/pom.xml
    camel/branches/camel-2.9.x/apache-camel/src/main/descriptors/common-bin.xml

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

Modified: camel/branches/camel-2.9.x/apache-camel/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/apache-camel/pom.xml?rev=1308556&r1=1308555&r2=1308556&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/apache-camel/pom.xml (original)
+++ camel/branches/camel-2.9.x/apache-camel/pom.xml Mon Apr  2 20:56:09 2012
@@ -249,6 +249,10 @@
     </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jsch</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
       <artifactId>camel-juel</artifactId>
     </dependency>
     <dependency>

Modified: camel/branches/camel-2.9.x/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/apache-camel/src/main/descriptors/common-bin.xml?rev=1308556&r1=1308555&r2=1308556&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/apache-camel/src/main/descriptors/common-bin.xml (original)
+++ camel/branches/camel-2.9.x/apache-camel/src/main/descriptors/common-bin.xml Mon Apr  2 20:56:09 2012
@@ -85,6 +85,7 @@
         <include>org.apache.camel:camel-jmx</include>
         <include>org.apache.camel:camel-josql</include>
         <include>org.apache.camel:camel-jpa</include>
+        <include>org.apache.camel:camel-jsch</include>
         <include>org.apache.camel:camel-jt400</include>
         <include>org.apache.camel:camel-juel</include>
         <include>org.apache.camel:camel-jxpath</include>