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>
