Return-Path: 
 <commits-return-17610-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 45CE17422
	for <apmail-camel-commits-archive@www.apache.org>;
 Fri, 28 Oct 2011 14:55:10 +0000 (UTC)
Received: (qmail 87517 invoked by uid 500); 28 Oct 2011 14:55:10 -0000
Delivered-To: apmail-camel-commits-archive@camel.apache.org
Received: (qmail 87485 invoked by uid 500); 28 Oct 2011 14:55:10 -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 87477 invoked by uid 99); 28 Oct 2011 14:55:10 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Oct 2011 14:55:10 +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; Fri, 28 Oct 2011 14:55:07 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CDD6F238890A
	for <commits@camel.apache.org>; Fri, 28 Oct 2011 14:54:46 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1190378 - in /camel/trunk: parent/pom.xml
 platforms/karaf/features/pom.xml
 platforms/karaf/features/src/main/resources/features.xml
Date: Fri, 28 Oct 2011 14:54:46 -0000
To: commits@camel.apache.org
From: davsclaus@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20111028145446.CDD6F238890A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: davsclaus
Date: Fri Oct 28 14:54:46 2011
New Revision: 1190378

URL: http://svn.apache.org/viewvc?rev=1190378&view=rev
Log:
Upgraded to JRuby 1.6.5

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/features.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1190378&r1=1190377&r2=1190378&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Oct 28 14:54:46 2011
@@ -108,7 +108,7 @@
     <jettison-version>1.3</jettison-version>
     <jexcelapi-version>2.4.2</jexcelapi-version>
     <jibx-version>1.2.2</jibx-version>
-    <jruby-version>1.5.6</jruby-version>
+    <jruby-version>1.6.5</jruby-version>
     <jsmpp-version>2.1.0_3</jsmpp-version>
     <jsch-version>0.1.44-1</jsch-version>
     <juel-version>2.1.2</juel-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1190378&r1=1190377&r2=1190378&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Oct 28 14:54:46 2011
@@ -92,7 +92,6 @@
       <jibx-bundle-version>1.2.2_1</jibx-bundle-version>
       <jodatime-bundle-version>1.5.2_2</jodatime-bundle-version>
       <josql-bundle-version>1.5_3</josql-bundle-version>
-      <jruby-bundle-version>1.5.6_1</jruby-bundle-version>
       <jsch-bundle-version>0.1.44_1</jsch-bundle-version>
       <jsendnsca-bundle-version>1.3.1_1</jsendnsca-bundle-version>
       <jsp-api-2.1-version>1.0.1</jsp-api-2.1-version>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1190378&r1=1190377&r2=1190378&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri Oct 28 14:54:46 2011
@@ -523,7 +523,7 @@
   </feature>
   <feature name='camel-ruby' version='${pom.version}' start-level='50'>
     <feature version='${pom.version}'>camel-script</feature>
-    <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jruby/${jruby-bundle-version}</bundle>
+    <bundle>mvn:org.jruby/jruby/${jruby-version}</bundle>
   </feature>
   <feature name='camel-rss' version='${pom.version}' resolver='(obr)' start-level='50'>
     <feature version='${pom.version}'>camel-atom</feature>