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 Tue, 01 Dec 2015 14:17:30 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/bd26eadf
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bd26eadf
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bd26eadf

Branch: refs/heads/3.0.x-fixes
Commit: bd26eadf9990343dc7d37c8090ef16e5999c06c9
Parents: c890d32
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Tue Dec 1 14:17:19 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Tue Dec 1 14:17:19 2015 +0000

----------------------------------------------------------------------
 .../main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java  | 4 ----
 1 file changed, 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/bd26eadf/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
index 641fbe1..e739347 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwt/JwtUtils.java
@@ -109,7 +109,6 @@ public final class JwtUtils {
             }
         }
     }
-<<<<<<< HEAD
 
     public static void validateJwtTimeClaims(JwtClaims claims, int clockOffset,
                                              int issuedAtRange, boolean claimsRequired) {
@@ -134,8 +133,6 @@ public final class JwtUtils {
         validateJwtTimeClaims(claims, 0, 0, false);
     }
 
-=======
-    
     public static void validateTokenClaims(JwtClaims claims, int timeToLive, int clockOffset)
{
         // If we have no issued time then we need to have an expiry
         boolean expiredRequired = claims.getIssuedAt() == null;
@@ -148,5 +145,4 @@ public final class JwtUtils {
         validateJwtIssuedAt(claims, timeToLive, clockOffset, issuedAtRequired);
     }
     
->>>>>>> c66b1a1... Adding a filter to authenticate JWT Tokens for the
JWT Bearer Client Authentication case
 }


Mime
View raw message