Fixing build
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/26818515 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/26818515 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/26818515 Branch: refs/heads/3.0.x-fixes Commit: 26818515c115bc4ed9a26643eb71aeb22e1fda32 Parents: 1432937 Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Apr 30 09:18:38 2015 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Apr 30 09:18:38 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 5 ----- 1 file changed, 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/26818515/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java index bd4ec9f..79f9f51 100644 --- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java +++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java @@ -28,11 +28,6 @@ import java.util.Set; import javax.ws.rs.core.MultivaluedMap; import org.apache.cxf.common.util.StringUtils; -<<<<<<< HEAD -import org.apache.cxf.common.util.crypto.CryptoUtils; -======= -import org.apache.cxf.jaxrs.ext.MessageContext; ->>>>>>> b9e4fcf... Move CryptoUtils into rt-security import org.apache.cxf.jaxrs.impl.MetadataMap; import org.apache.cxf.jaxrs.model.URITemplate; import org.apache.cxf.rs.security.oauth2.common.Client;
