git commit: CAMEL-7895: Upgrade BouncyCastle dependencies Thanks to Colm O hEigeartaigh for the patch

2014-10-21 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/camel-2.14.x 13e613332 - bd35c1efe


CAMEL-7895: Upgrade BouncyCastle dependencies
Thanks to Colm O hEigeartaigh for the patch


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd35c1ef
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd35c1ef
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd35c1ef

Branch: refs/heads/camel-2.14.x
Commit: bd35c1efe9147cc8ed43966e68b37c0fae284dbf
Parents: 13e6133
Author: Christian Mueller cmuel...@apache.org
Authored: Tue Oct 21 21:51:39 2014 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Tue Oct 21 21:51:39 2014 +0200

--
 parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd35c1ef/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 88f0967..5b513d5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,8 +69,7 @@
 bcel-bundle-version5.2_4/bcel-bundle-version
 beanio-version2.0.7/beanio-version
 bsh-version2.0b5/bsh-version
-!-- bouncycastle 1.50 does not work in OSGi - 
http://www.bouncycastle.org/jira/browse/BJA-476 --
-bouncycastle-version1.49/bouncycastle-version
+bouncycastle-version1.51/bouncycastle-version
 boxjavalibv2.version3.0.9/boxjavalibv2.version
 build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version
 c3p0-version0.9.1.2/c3p0-version



git commit: CAMEL-7895: Upgrade BouncyCastle dependencies Thanks to Colm O hEigeartaigh for the patch

2014-10-21 Thread cmueller
Repository: camel
Updated Branches:
  refs/heads/camel-2.13.x 5ded80e80 - 4fff625f5


CAMEL-7895: Upgrade BouncyCastle dependencies
Thanks to Colm O hEigeartaigh for the patch

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/4fff625f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4fff625f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4fff625f

Branch: refs/heads/camel-2.13.x
Commit: 4fff625f5cb1fbc4c549967aee09bec601c319e4
Parents: 5ded80e
Author: Christian Mueller cmuel...@apache.org
Authored: Tue Oct 21 21:51:39 2014 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Tue Oct 21 21:54:19 2014 +0200

--
 parent/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4fff625f/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 3ae7cbc..b861d50 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -66,8 +66,7 @@
 bcel-bundle-version5.2_4/bcel-bundle-version
 beanio-version2.0.7/beanio-version
 bsh-version2.0b5/bsh-version
-!-- bouncycastle 1.50 does not work in OSGi - 
http://www.bouncycastle.org/jira/browse/BJA-476 --
-bouncycastle-version1.49/bouncycastle-version
+bouncycastle-version1.51/bouncycastle-version
 build-helper-maven-plugin-version1.8/build-helper-maven-plugin-version
 c3p0-version0.9.1.2/c3p0-version
 castor-bundle-version1.3.2_2/castor-bundle-version