Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 945c7272c -> abde55056
upgrade jruby 1.7.16 to 1.7.18
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/abde5505
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/abde5505
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/abde5505
Branch: refs/heads/camel-2.13.x
Commit: abde5505661b2f9cb900c7a0ab997701b353a077
Parents: 945c727
Author: Christian Mueller <cmuel...@apache.org>
Authored: Wed Dec 31 17:54:31 2014 +0100
Committer: Christian Mueller <cmuel...@apache.org>
Committed: Wed Dec 31 18:08:04 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/abde5505/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index e6bf41d..27de44e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -236,8 +236,7 @@
<jodatime2-bundle-version>2.3</jodatime2-bundle-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>
- <!-- jruby-core 1.7.14 and 1.7.15 are not valid OSGI bundles: see
https://github.com/jruby/jruby/issues/1971 -->
- <jruby-version>1.7.13</jruby-version>
+ <jruby-version>1.7.18</jruby-version>
<jsendnsca-version>1.3.1</jsendnsca-version>
<jsmpp-version>2.1.0_4</jsmpp-version>
<jsch-version>0.1.51</jsch-version>
