Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1e199678 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1e199678 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1e199678 Branch: refs/heads/3.1.x-fixes Commit: 1e1996785799ffa627765d564237955bb29eaa1d Parents: deeba62 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Aug 16 17:47:27 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Aug 16 17:47:27 2017 +0100 ---------------------------------------------------------------------- .../apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1e199678/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java index 9b25f16..ecac135 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java @@ -30,7 +30,6 @@ import java.util.concurrent.Executor; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import javax.xml.soap.Node; import javax.xml.soap.SOAPMessage; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathConstants;
