cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Thu, 18 Feb 2016 10:38:25 GMT
Fixing merge


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/80b1e89d
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80b1e89d
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80b1e89d

Branch: refs/heads/3.0.x-fixes
Commit: 80b1e89db2dfdb7a907179c856c343138e39fa2d
Parents: b4b4a74
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Thu Feb 18 10:38:14 2016 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Thu Feb 18 10:38:14 2016 +0000

----------------------------------------------------------------------
 .../apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java  | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/80b1e89d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
index d8cd8a7..681cc71 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweJwtCompactConsumer.java
@@ -17,12 +17,7 @@
  * under the License.
  */
 package org.apache.cxf.rs.security.jose.jwe;
-<<<<<<< HEAD
-import java.security.interfaces.RSAPrivateKey;
-=======
-import java.nio.charset.StandardCharsets;
 import java.security.PrivateKey;
->>>>>>> 43d17e6... Switch to use PrivateKey instead
 
 import javax.crypto.SecretKey;
 


Mime
View raw message