Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4c8e65ba Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4c8e65ba Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4c8e65ba Branch: refs/heads/3.0.x-fixes Commit: 4c8e65baaee667a2e72cec44ceee00471d90e88b Parents: 864b895 Author: Colm O hEigeartaigh <[email protected]> Authored: Tue May 17 16:23:38 2016 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue May 17 16:23:38 2016 +0100 ---------------------------------------------------------------------- .../apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/4c8e65ba/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java index 3789956..b78a940 100644 --- a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java +++ b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/SecurityActionTokenTest.java @@ -59,11 +59,7 @@ public class SecurityActionTokenTest extends AbstractSecurityTest { outProperties.put(WSHandlerConstants.HANDLER_ACTIONS, actions); outProperties.put(WSHandlerConstants.PW_CALLBACK_REF, new TestPwdCallback()); -<<<<<<< HEAD - Map<String, String> inProperties = new HashMap<String, String>(); -======= - Map<String, Object> inProperties = new HashMap<>(); ->>>>>>> c4c48d0... Security test refactor + Map<String, Object> inProperties = new HashMap<String, Object>(); inProperties.put(WSHandlerConstants.ACTION, WSHandlerConstants.SIGNATURE); inProperties.put(WSHandlerConstants.SIG_VER_PROP_FILE, "insecurity.properties");
