Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67ce51ec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67ce51ec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67ce51ec Branch: refs/heads/3.0.x-fixes Commit: 67ce51ecc913d773a617fd2d90fcadcb633e8abd Parents: baaf266 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Jun 22 12:40:48 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Mon Jun 22 12:40:48 2015 +0100 ---------------------------------------------------------------------- .../apache/cxf/ws/security/policy/interceptors/STSInvoker.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/67ce51ec/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java index d607df9..832d2ae 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/interceptors/STSInvoker.java @@ -44,11 +44,7 @@ import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.tokenstore.SecurityToken; import org.apache.cxf.ws.security.tokenstore.TokenStore; import org.apache.cxf.ws.security.trust.STSUtils; -<<<<<<< HEAD -======= -import org.apache.wss4j.common.bsp.BSPEnforcer; import org.apache.wss4j.common.derivedKey.ConversationConstants; ->>>>>>> 05383ff... [CXF-6468] - Secure Conversation Renew is missing Instance creation. Thanks to Freddy Exposito for the patch. import org.apache.wss4j.common.derivedKey.P_SHA1; import org.apache.wss4j.common.ext.WSSecurityException; import org.apache.wss4j.dom.WSConstants;
