Merge branch 'hotfix/1.5.4'

grails · Aug 29, 2016 · 4ea4d5e · 4ea4d5e
2 parents 271f89f + 4039398
commit 4ea4d5e
Show file tree

Hide file tree

Showing 96 changed files with 139 additions and 99 deletions.
diff --git a/SpringSecurityRestGrailsPlugin.groovy b/SpringSecurityRestGrailsPlugin.groovy
@@ -34,7 +34,7 @@ import javax.servlet.http.HttpServletResponse
 
 class SpringSecurityRestGrailsPlugin {
 
-    String version = "1.5.3"
+    String version = "1.5.4"
     String grailsVersion = "2.0 > *"
     List loadAfter = ['springSecurityCore']
     List pluginExcludes = [

diff --git a/grails-app/controllers/grails/plugin/springsecurity/rest/RestOauthController.groovy b/grails-app/controllers/grails/plugin/springsecurity/rest/RestOauthController.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/grails-app/services/grails/plugin/springsecurity/rest/JwtService.groovy b/grails-app/services/grails/plugin/springsecurity/rest/JwtService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import com.nimbusds.jose.crypto.RSADecrypter
 import com.nimbusds.jwt.EncryptedJWT
 import com.nimbusds.jwt.JWT
 import com.nimbusds.jwt.JWTParser
+import com.nimbusds.jwt.PlainJWT
 import com.nimbusds.jwt.SignedJWT
 import grails.plugin.springsecurity.rest.token.generation.jwt.RSAKeyProvider
 import grails.util.Holders
@@ -66,6 +67,11 @@ class JwtService {
 
             // Decrypt
             encryptedJWT.decrypt(decrypter)
+        } else if (jwt instanceof PlainJWT) {
+            log.debug "Parsed a plain JWT"
+            if (jwtSecret || keyProvider) {
+                throw new JOSEException('Unsigned/unencrypted JWT not expected')
+            }
         }
 
         return jwt

diff --git a/grails-app/services/grails/plugin/springsecurity/rest/RestOauthService.groovy b/grails-app/services/grails/plugin/springsecurity/rest/RestOauthService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/docs/guide/introduction.gdoc b/src/docs/guide/introduction.gdoc
@@ -36,6 +36,8 @@ h4. Release History
 
 You can view all releases at https://github.com/alvarosanchez/grails-spring-security-rest/releases.
 
+* 29 August 2016
+** [1.5.4|https://github.com/alvarosanchez/grails-spring-security-rest/issues?q=milestone%3A1.5.4+is%3Aclosed]
 * 20 November 2015
 ** [1.5.3|https://github.com/alvarosanchez/grails-spring-security-rest/issues?q=milestone%3A1.5.3+is%3Aclosed]
 * 19 August 2015
@@ -111,4 +113,4 @@ You can view all releases at https://github.com/alvarosanchez/grails-spring-secu
 * 10 January 2014
 ** 1.0.0.RC2
 * 31 December 2013
-** Initial 1.0.0.RC1 release.
+** Initial 1.0.0.RC1 release.
diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationFailureHandler.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationFailureHandler.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationFilter.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationFilter.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationProvider.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationProvider.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationSuccessHandler.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestAuthenticationSuccessHandler.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestLogoutFilter.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestLogoutFilter.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestTokenCreationEvent.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestTokenCreationEvent.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/RestTokenValidationFilter.groovy b/src/groovy/grails/plugin/springsecurity/rest/RestTokenValidationFilter.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ils/plugin/springsecurity/rest/credentials/AbstractJsonPayloadCredentialsExtractor.groovy b/...ils/plugin/springsecurity/rest/credentials/AbstractJsonPayloadCredentialsExtractor.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/credentials/CredentialsExtractor.groovy b/src/groovy/grails/plugin/springsecurity/rest/credentials/CredentialsExtractor.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ails/plugin/springsecurity/rest/credentials/DefaultJsonPayloadCredentialsExtractor.groovy b/...ails/plugin/springsecurity/rest/credentials/DefaultJsonPayloadCredentialsExtractor.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...vy/grails/plugin/springsecurity/rest/credentials/RequestParamsCredentialsExtractor.groovy b/...vy/grails/plugin/springsecurity/rest/credentials/RequestParamsCredentialsExtractor.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/error/CallbackErrorHandler.groovy b/src/groovy/grails/plugin/springsecurity/rest/error/CallbackErrorHandler.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/error/DefaultCallbackErrorHandler.groovy b/src/groovy/grails/plugin/springsecurity/rest/error/DefaultCallbackErrorHandler.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/oauth/DefaultOauthUserDetailsService.groovy b/src/groovy/grails/plugin/springsecurity/rest/oauth/DefaultOauthUserDetailsService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/oauth/OauthUser.groovy b/src/groovy/grails/plugin/springsecurity/rest/oauth/OauthUser.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/oauth/OauthUserDetailsService.groovy b/src/groovy/grails/plugin/springsecurity/rest/oauth/OauthUserDetailsService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/AccessToken.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/AccessToken.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...oovy/grails/plugin/springsecurity/rest/token/bearer/BearerTokenAccessDeniedHandler.groovy b/...oovy/grails/plugin/springsecurity/rest/token/bearer/BearerTokenAccessDeniedHandler.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...grails/plugin/springsecurity/rest/token/bearer/BearerTokenAuthenticationEntryPoint.groovy b/...grails/plugin/springsecurity/rest/token/bearer/BearerTokenAuthenticationEntryPoint.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ls/plugin/springsecurity/rest/token/bearer/BearerTokenAuthenticationFailureHandler.groovy b/...ls/plugin/springsecurity/rest/token/bearer/BearerTokenAuthenticationFailureHandler.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/bearer/BearerTokenReader.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/bearer/BearerTokenReader.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...oovy/grails/plugin/springsecurity/rest/token/generation/SecureRandomTokenGenerator.groovy b/...oovy/grails/plugin/springsecurity/rest/token/generation/SecureRandomTokenGenerator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/generation/TokenGenerator.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/generation/TokenGenerator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/generation/UUIDTokenGenerator.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/generation/UUIDTokenGenerator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...y/grails/plugin/springsecurity/rest/token/generation/jwt/AbstractJwtTokenGenerator.groovy b/...y/grails/plugin/springsecurity/rest/token/generation/jwt/AbstractJwtTokenGenerator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...roovy/grails/plugin/springsecurity/rest/token/generation/jwt/DefaultRSAKeyProvider.groovy b/...roovy/grails/plugin/springsecurity/rest/token/generation/jwt/DefaultRSAKeyProvider.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../grails/plugin/springsecurity/rest/token/generation/jwt/EncryptedJwtTokenGenerator.groovy b/.../grails/plugin/springsecurity/rest/token/generation/jwt/EncryptedJwtTokenGenerator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/generation/jwt/FileRSAKeyProvider.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/generation/jwt/FileRSAKeyProvider.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/generation/jwt/RSAKeyProvider.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/generation/jwt/RSAKeyProvider.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ovy/grails/plugin/springsecurity/rest/token/generation/jwt/SignedJwtTokenGenerator.groovy b/...ovy/grails/plugin/springsecurity/rest/token/generation/jwt/SignedJwtTokenGenerator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/reader/HttpHeaderTokenReader.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/reader/HttpHeaderTokenReader.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/reader/TokenReader.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/reader/TokenReader.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/rendering/AccessTokenJsonRenderer.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/rendering/AccessTokenJsonRenderer.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...y/grails/plugin/springsecurity/rest/token/rendering/DefaultAccessTokenJsonRenderer.groovy b/...y/grails/plugin/springsecurity/rest/token/rendering/DefaultAccessTokenJsonRenderer.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/storage/GormTokenStorageService.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/storage/GormTokenStorageService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ovy/grails/plugin/springsecurity/rest/token/storage/GrailsCacheTokenStorageService.groovy b/...ovy/grails/plugin/springsecurity/rest/token/storage/GrailsCacheTokenStorageService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...roovy/grails/plugin/springsecurity/rest/token/storage/MemcachedTokenStorageService.groovy b/...roovy/grails/plugin/springsecurity/rest/token/storage/MemcachedTokenStorageService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/storage/RedisTokenStorageService.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/storage/RedisTokenStorageService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/storage/TokenNotFoundException.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/storage/TokenNotFoundException.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/storage/TokenStorageService.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/storage/TokenStorageService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/groovy/grails/plugin/springsecurity/rest/token/storage/jwt/JwtTokenStorageService.groovy b/src/groovy/grails/plugin/springsecurity/rest/token/storage/jwt/JwtTokenStorageService.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/java/grails/plugin/springsecurity/rest/CustomSerializingTranscoder.java b/src/java/grails/plugin/springsecurity/rest/CustomSerializingTranscoder.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/java/grails/plugin/springsecurity/rest/RestSecurityEventListener.java b/src/java/grails/plugin/springsecurity/rest/RestSecurityEventListener.java
@@ -1,5 +1,5 @@
 /**
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ls/plugin/springsecurity/rest/authentication/DefaultRestAuthenticationEventPublisher.java b/...ls/plugin/springsecurity/rest/authentication/DefaultRestAuthenticationEventPublisher.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+/**
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...rails/plugin/springsecurity/rest/authentication/NullRestAuthenticationEventPublisher.java b/...rails/plugin/springsecurity/rest/authentication/NullRestAuthenticationEventPublisher.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+/**
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...va/grails/plugin/springsecurity/rest/authentication/RestAuthenticationEventPublisher.java b/...va/grails/plugin/springsecurity/rest/authentication/RestAuthenticationEventPublisher.java
@@ -1,5 +1,5 @@
-/*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+/**
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/test/apps/jwt/test/functional/GebConfig.groovy b/test/apps/jwt/test/functional/GebConfig.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
+ * Copyright 2013-2016 Alvaro Sanchez-Mariscal <alvaro.sanchezmariscal@gmail.com>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.