[1/2] camel git commit: upgrade jruby 1.7.16 to 1.7.18
Repository: camel Updated Branches: refs/heads/master 7bde7d010 - b1552656f upgrade jruby 1.7.16 to 1.7.18 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c02a759a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c02a759a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c02a759a Branch: refs/heads/master Commit: c02a759acba28bd012502feedac51e52f1d9f40d Parents: 7bde7d0 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:04:40 2014 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/c02a759a/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ee79596..39e4faf 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -268,7 +268,7 @@ jolokia-version1.2.3/jolokia-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.5/josql-version -jruby-version1.7.16/jruby-version +jruby-version1.7.18/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_5/jsmpp-version jsch-version0.1.51/jsch-version
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 cmuel...@apache.org Authored: Wed Dec 31 17:54:31 2014 +0100 Committer: Christian Mueller cmuel...@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-version2.5/jodatime2-bundle-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.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-version1.7.13/jruby-version +jruby-version1.7.18/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_4/jsmpp-version jsch-version0.1.51/jsch-version
camel git commit: upgrade jruby 1.7.16 to 1.7.18
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-version2.3/jodatime2-bundle-version josql-bundle-version1.5_5/josql-bundle-version josql-version1.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-version1.7.13/jruby-version +jruby-version1.7.18/jruby-version jsendnsca-version1.3.1/jsendnsca-version jsmpp-version2.1.0_4/jsmpp-version jsch-version0.1.51/jsch-version
