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:56 UTC
[cxf] 04/04: Fixing backmerge
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 b8342ca3e10177cce8f43d3719606b898a3ee82d
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Sat Jul 27 12:28:25 2019 +0100
Fixing backmerge
---
parent/pom.xml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d7a0b5..bcd24e0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,8 +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.xmlsec.bundle.version>2.1.4</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>
<cxf.xerces.bundle.version>2.12.0_1</cxf.xerces.bundle.version>
@@ -243,13 +242,6 @@
<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>