Repository: camel Updated Branches: refs/heads/master 0c7239d45 -> 1c4dc30cd
CAMEL-7895: Upgrade XML Security + 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/1c4dc30c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1c4dc30c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1c4dc30c Branch: refs/heads/master Commit: 1c4dc30cd4967fc7920e28f471827cd9cbc73d68 Parents: 0c7239d Author: Christian Mueller <cmuel...@apache.org> Authored: Tue Oct 21 21:49:11 2014 +0200 Committer: Christian Mueller <cmuel...@apache.org> Committed: Tue Oct 21 21:49:11 2014 +0200 ---------------------------------------------------------------------- .../component/xmlsecurity/processor/XmlSignerProcessor.java | 1 + parent/pom.xml | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/1c4dc30c/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java index 6d774e2..6737976 100644 --- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java +++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignerProcessor.java @@ -387,6 +387,7 @@ public class XmlSignerProcessor extends XmlSignatureProcessor { && !getConfiguration().getPrefixForXmlSignatureNamespace().isEmpty()) { dsc.putNamespacePrefix("http://www.w3.org/2000/09/xmldsig#", getConfiguration().getPrefixForXmlSignatureNamespace()); } + dsc.putNamespacePrefix("http://www.w3.org/2001/10/xml-exc-c14n#", "ec"); setCryptoContextProperties(dsc); setUriDereferencerAndBaseUri(dsc); return dsc; http://git-wip-us.apache.org/repos/asf/camel/blob/1c4dc30c/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index f9c9701..b42e377 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -70,8 +70,7 @@ <beanio-version>2.0.7</beanio-version> <beanstalkd-client-version>1.4.6</beanstalkd-client-version> <bsh-version>2.0b5</bsh-version> - <!-- bouncycastle 1.50 does not work in OSGi - http://www.bouncycastle.org/jira/browse/BJA-476 --> - <bouncycastle-version>1.49</bouncycastle-version> + <bouncycastle-version>1.51</bouncycastle-version> <boxjavalibv2.version>3.0.9</boxjavalibv2.version> <build-helper-maven-plugin-version>1.8</build-helper-maven-plugin-version> <c3p0-version>0.9.1.2</c3p0-version> @@ -464,7 +463,7 @@ <xmlrpc-version>3.1.3</xmlrpc-version> <xmlrpc-client-bundle-version>3.1.3_1</xmlrpc-client-bundle-version> <xmlschema-version>2.0</xmlschema-version> - <xmlsec-version>1.5.6</xmlsec-version> + <xmlsec-version>2.0.2</xmlsec-version> <xmlunit-version>1.5</xmlunit-version> <xpp3-bundle-version>1.1.4c_7</xpp3-bundle-version> <xpp3-version>1.1.4c</xpp3-version>