Upgraded to xalan 2.7.2 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/dacbfc54 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dacbfc54 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dacbfc54 Branch: refs/heads/camel-2.13.x Commit: dacbfc5425cac236616289c40c00765d40b64a68 Parents: 66acc68 Author: Claus Ibsen <davscl...@apache.org> Authored: Mon Aug 11 11:17:11 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Aug 11 11:18:29 2014 +0200 ---------------------------------------------------------------------- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/dacbfc54/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 2ce42c4..1a7a15e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -423,8 +423,8 @@ <woodstox-version>4.2.1</woodstox-version> <ws-commons-util-bundle-version>1.0.2_2</ws-commons-util-bundle-version> <wsdl4j-bundle-version>1.6.2_6</wsdl4j-bundle-version> - <xalan-bundle-version>2.7.1_7</xalan-bundle-version> - <xalan-version>2.7.1</xalan-version> + <xalan-bundle-version>2.7.2_1</xalan-bundle-version> + <xalan-version>2.7.2</xalan-version> <xbean-spring-version>3.16</xbean-spring-version> <!-- xbean-asm4-bundle is used by openjpa --> <xbean-asm4-bundle-version>3.14</xbean-asm4-bundle-version>