You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2019/07/27 11:28:53 UTC
[cxf] 01/04: Updating to WSS4J 2.2.4
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit e0d0f782f42efd206df5c1dc35672795af8a2f8f
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Jul 27 11:05:16 2019 +0100
Updating to WSS4J 2.2.4
(cherry picked from commit 08c1b24ee15812c5f8d5a9ac9780a4289f07daf0)
# Conflicts:
# parent/pom.xml
---
parent/pom.xml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7673e05..2764063 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -171,7 +171,7 @@
<cxf.woodstox.core.version>5.0.3</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>2.2.3</cxf.wss4j.version>
+ <cxf.wss4j.version>2.2.4</cxf.wss4j.version>
<cxf.xbean.version>3.5</cxf.xbean.version>
<cxf.xerces.version>2.12.0</cxf.xerces.version>
<cxf.xmlschema.version>2.2.4</cxf.xmlschema.version>
@@ -211,6 +211,7 @@
<cxf.saaj-impl.bundle.version>1.3.23_2</cxf.saaj-impl.bundle.version>
<cxf.stax-ex.version>1.7.6</cxf.stax-ex.version>
<cxf.wsdl4j.bundle.version>1.6.3_1</cxf.wsdl4j.bundle.version>
+<<<<<<< HEAD
<cxf.xmlsec.bundle.version>2.1.3</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>
@@ -242,6 +243,13 @@
<cxf.reactor.version>3.1.16.RELEASE</cxf.reactor.version>
<cxf.microprofile.rest.client.version>1.0.1</cxf.microprofile.rest.client.version>
<cxf.microprofile.config.version>1.1</cxf.microprofile.config.version>
+=======
+ <cxf.xalan.bundle.version>2.7.2_3</cxf.xalan.bundle.version>
+ <cxf.xerces.bundle.version>2.12.0_1</cxf.xerces.bundle.version>
+ <cxf.xmlresolver.bundle.version>1.2_5</cxf.xmlresolver.bundle.version>
+ <cxf.xmlsec.bundle.version>2.1.4</cxf.xmlsec.bundle.version>
+ <cxf.xpp3.bundle.version>1.1.4c_6</cxf.xpp3.bundle.version>
+>>>>>>> 08c1b24ee1... Updating to WSS4J 2.2.4
</properties>
<build>
<resources>