You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/01/29 14:51:02 UTC
[cxf] 01/01: [CXF-8206] Update to saaj-impl 1.5.1
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch saaj-impl
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 73f4d8a133beda869b484f13d8e6d6a86732cec8
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Wed Jan 29 16:15:42 2020 +0300
[CXF-8206] Update to saaj-impl 1.5.1
---
parent/pom.xml | 23 +++++++---------------
.../apache/cxf/systest/ws/x509/X509TokenTest.java | 19 +++++++-----------
2 files changed, 14 insertions(+), 28 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index fdfd257..03113a3 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2816,13 +2816,13 @@
</build>
</profile>
<profile>
- <id>java9-plus</id>
- <properties>
+ <id>java9-plus</id>
+ <properties>
<org.apache.cxf.transport.websocket.atmosphere.disabled>true</org.apache.cxf.transport.websocket.atmosphere.disabled>
<cxf.jdk.version>11</cxf.jdk.version>
- </properties>
- <activation>
- <jdk>[9,)</jdk>
+ </properties>
+ <activation>
+ <jdk>[9,)</jdk>
</activation>
<build>
<plugins>
@@ -2877,17 +2877,8 @@
<dependency>
<groupId>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
- <version>1.3.23</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.xml.soap</groupId>
- <artifactId>javax.xml.soap-api</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.5.1</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.jacorb</groupId>
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index 4538838..f68aede 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -24,9 +24,8 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.HashMap;
+import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.xml.XMLConstants;
import javax.xml.namespace.QName;
@@ -584,9 +583,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
if (nd instanceof Document) {
nd = ((Document)nd).getDocumentElement();
}
- Map<String, String> ns = new HashMap<>();
- ns.put("ns2", "http://www.example.org/schema/DoubleIt");
- XPathUtils xp = new XPathUtils(ns);
+ XPathUtils xp = new XPathUtils(Collections.singletonMap("ns2", "http://www.example.org/schema/DoubleIt"));
Object o = xp.getValue("//ns2:DoubleItResponse/doubledNumber", nd, XPathConstants.STRING);
assertEquals(StaxUtils.toString(nd), "50", o);
@@ -616,10 +613,10 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
Document xmlDocument = DOMUtils.newDocument();
- Element requestElement = xmlDocument.createElementNS("http://www.example.org/schema/DoubleIt", "tns:DoubleIt");
- requestElement.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:tns",
- "http://www.example.org/schema/DoubleIt");
- Element dataElement = xmlDocument.createElement("numberToDouble");
+ final String ns = "http://www.example.org/schema/DoubleIt";
+ Element requestElement = xmlDocument.createElementNS(ns, "tns:DoubleIt");
+ requestElement.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI, "xmlns:tns", ns);
+ Element dataElement = xmlDocument.createElementNS(null, "numberToDouble");
dataElement.appendChild(xmlDocument.createTextNode("25"));
requestElement.appendChild(dataElement);
xmlDocument.appendChild(requestElement);
@@ -642,9 +639,7 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
SOAPMessage resp = disp.invoke(request);
Node nd = resp.getSOAPBody().getFirstChild();
- Map<String, String> ns = new HashMap<>();
- ns.put("ns2", "http://www.example.org/schema/DoubleIt");
- XPathUtils xp = new XPathUtils(ns);
+ XPathUtils xp = new XPathUtils(Collections.singletonMap("ns2", ns));
Object o = xp.getValue("//ns2:DoubleItResponse/doubledNumber",
DOMUtils.getDomElement(nd), XPathConstants.STRING);
assertEquals(StaxUtils.toString(nd), "50", o);