Author: davsclaus
Date: Fri Dec 14 08:49:01 2012
New Revision: 1421733
URL: http://svn.apache.org/viewvc?rev=1421733&view=rev
Log:
Upgraded to jruby 1.7.1 that has a security fix
Modified:
camel/branches/camel-2.9.x/ (props changed)
camel/branches/camel-2.9.x/parent/pom.xml
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1421723
Merged /camel/branches/camel-2.10.x:r1421731
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.9.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/parent/pom.xml?rev=1421733&r1=1421732&r2=1421733&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/parent/pom.xml (original)
+++ camel/branches/camel-2.9.x/parent/pom.xml Fri Dec 14 08:49:01 2012
@@ -110,7 +110,7 @@
<jettison-version>1.3.2</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
<jibx-version>1.2.4.5</jibx-version>
- <jruby-version>1.7.0</jruby-version>
+ <jruby-version>1.7.1</jruby-version>
<jsmpp-version>2.1.0_3</jsmpp-version>
<jsch-version>0.1.48</jsch-version>
<juel-version>2.1.2</juel-version>