diff --git a/.gitignore b/.gitignore index 1c2002c1..54fd4ae7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ integration-repo ivy-cache .gradle build +target # Eclipse metadata .classpath diff --git a/build.gradle b/build.gradle index 29003089..2c2176b5 100644 --- a/build.gradle +++ b/build.gradle @@ -56,8 +56,8 @@ configure(subprojects.findAll {it.name != 'spring-js-resources'}) { subproject - } subproject.ext { - springVersion = '3.1.1.RELEASE' - springSecurityVersion = '3.0.7.RELEASE' + springVersion = '3.2.0.RELEASE' + springSecurityVersion = '3.1.3.RELEASE' slf4jVersion = '1.6.1' log4jVersion = '1.2.15' } diff --git a/spring-faces/src/main/java/org/springframework/faces/security/AbstractAuthorizeTag.java b/spring-faces/src/main/java/org/springframework/faces/security/AbstractAuthorizeTag.java index 7b18cd6f..1a1f0150 100644 --- a/spring-faces/src/main/java/org/springframework/faces/security/AbstractAuthorizeTag.java +++ b/spring-faces/src/main/java/org/springframework/faces/security/AbstractAuthorizeTag.java @@ -134,7 +134,7 @@ public abstract class AbstractAuthorizeTag { return false; } - final Collection granted = getPrincipalAuthorities(); + final Collection granted = getPrincipalAuthorities(); if (hasTextAllGranted) { if (!granted.containsAll(parseAuthoritiesString(getIfAllGranted()))) { @@ -143,7 +143,7 @@ public abstract class AbstractAuthorizeTag { } if (hasTextAnyGranted) { - Set grantedCopy = retainAll(granted, parseAuthoritiesString(getIfAnyGranted())); + Set grantedCopy = retainAll(granted, parseAuthoritiesString(getIfAnyGranted())); if (grantedCopy.isEmpty()) { return false; } @@ -258,7 +258,7 @@ public abstract class AbstractAuthorizeTag { /*------------- Private helper methods -----------------*/ - private Collection getPrincipalAuthorities() { + private Collection getPrincipalAuthorities() { Authentication currentUser = SecurityContextHolder.getContext().getAuthentication(); if (null == currentUser) { return Collections.emptyList(); @@ -272,7 +272,7 @@ public abstract class AbstractAuthorizeTag { return requiredAuthorities; } - private Set retainAll(final Collection granted, + private Set retainAll(final Collection granted, final Set required) { Set grantedRoles = authoritiesToRoles(granted); Set requiredRoles = authoritiesToRoles(required); @@ -281,7 +281,7 @@ public abstract class AbstractAuthorizeTag { return rolesToAuthorities(grantedRoles, granted); } - private Set authoritiesToRoles(Collection c) { + private Set authoritiesToRoles(Collection c) { Set target = new HashSet(); for (GrantedAuthority authority : c) { if (null == authority.getAuthority()) { @@ -294,7 +294,7 @@ public abstract class AbstractAuthorizeTag { return target; } - private Set rolesToAuthorities(Set grantedRoles, Collection granted) { + private Set rolesToAuthorities(Set grantedRoles, Collection granted) { Set target = new HashSet(); for (String role : grantedRoles) { for (GrantedAuthority authority : granted) {