You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2014/12/31 18:07:31 UTC
camel git commit: upgrade jruby 1.7.16 to 1.7.18
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x c1d61bc62 -> fb4cb5c10
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/fb4cb5c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb4cb5c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb4cb5c1
Branch: refs/heads/camel-2.14.x
Commit: fb4cb5c1075c2c92a1314ddd69fb6084cd7b186a
Parents: c1d61bc
Author: Christian Mueller <cm...@apache.org>
Authored: Wed Dec 31 17:54:31 2014 +0100
Committer: Christian Mueller <cm...@apache.org>
Committed: Wed Dec 31 18:07:06 2014 +0100
----------------------------------------------------------------------
parent/pom.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fb4cb5c1/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index a8267b8d..711fe6f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -253,8 +253,7 @@
<jodatime2-bundle-version>2.5</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>