Update a couple deps
Conflicts:
parent/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f1972f0e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f1972f0e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f1972f0e
Branch: refs/heads/2.6.x-fixes
Commit: f1972f0e14c0b838e03ff85c77eec127c1865c67
Parents: f5673dd
Author: Daniel Kulp <[email protected]>
Authored: Thu May 29 11:34:24 2014 -0400
Committer: Daniel Kulp <[email protected]>
Committed: Wed Jun 4 14:48:50 2014 -0400
----------------------------------------------------------------------
parent/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f1972f0e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 74af1e9..e0ed56b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -146,7 +146,7 @@
<cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
<cxf.spring.mock>spring-test</cxf.spring.mock>
<cxf.velocity.version>1.7</cxf.velocity.version>
- <cxf.woodstox.core.version>4.3.0</cxf.woodstox.core.version>
+ <cxf.woodstox.core.version>4.4.0</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>
<cxf.wsdl4j.version>1.6.3</cxf.wsdl4j.version>
<cxf.wss4j.version>1.6.15</cxf.wss4j.version>
@@ -168,8 +168,8 @@
<cxf.servicemix.specs.version>2.2.0</cxf.servicemix.specs.version>
<cxf.javax.mail.version>1.4.4</cxf.javax.mail.version>
<cxf.jaxb.bundle.version>2.2.1.1_2</cxf.jaxb.bundle.version>
- <cxf.saaj-impl.bundle.version>1.3.20_1</cxf.saaj-impl.bundle.version>
- <cxf.wsdl4j.bundle.version>1.6.2_6</cxf.wsdl4j.bundle.version>
+ <cxf.saaj-impl.bundle.version>1.3.23_1</cxf.saaj-impl.bundle.version>
+ <cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
<cxf.xmlsec.bundle.version>1.5.6</cxf.xmlsec.bundle.version>
<cxf.rhino.bundle.version>1.7R2_3</cxf.rhino.bundle.version>
<cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>