Author: davsclaus
Date: Thu Nov 6 12:31:01 2008
New Revision: 711966
URL: http://svn.apache.org/viewvc?rev=711966&view=rev
Log:
Merged revisions 711962 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r711962 | davsclaus | 2008-11-06 21:24:44 +0100 (to, 06 nov 2008) | 1 line
Upgraded to jruby 1.1.5
........
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-ruby/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 6 12:31:01 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 6 12:31:01 2008
@@ -1 +1 @@
-/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874
+/activemq/camel/trunk:1-708421,708553-709447,709449-709612,709614-709634,709636-710013,711200,711206,711219-711220,711523,711531,711599,711655-711656,711756,711784,711859,711874,711962
Modified: activemq/camel/branches/camel-1.x/components/camel-ruby/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-ruby/pom.xml?rev=711966&r1=711965&r2=711966&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-ruby/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-ruby/pom.xml Thu Nov 6
12:31:01 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.1.4</version>
+ <version>1.1.5</version>
</dependency>
<!-- testing -->
