Next development version

Fixes gh-3716

.editorconfig

@@ -1,17 +0,0 @@
-# EditorConfig for Spring Security
-# see https://github.com/spring-projects/spring-security/blob/master/CONTRIBUTING.md#mind-the-whitespace
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = latin1
-
-# 4 tabs indentation
-indent_style = tab
-tab_width = 4
-
-trim_trailing_whitespace = true

.github/ISSUE_TEMPLATE.md

@@ -1,36 +0,0 @@
-### Summary
-
-<!-- 
-Please provide a high level summary of the issue you are having
--->
-
-### Actual Behavior
-
-<!-- 
-Please describe step by step the behavior you are observing
--->
-
-### Expected Behavior
-
-<!--
-Please describe step by step the behavior you expect
--->
-
-### Configuration
-
-<!--
-Please provide any configuration you have.
--->
-
-### Version
-
-<!--
-Please describe what version you are using. Does the problem occur in other versions?
--->
-
-### Sample
-
-<!--
-Providing a complete sample (i.e. link to a github repository) will give this issue higher
-priority than issues that do not have a complete sample
--->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,3 +0,0 @@
-<!--
-Thanks for contributing to Spring Security. Please provide a brief description of your pull-request and reference any related issue numbers (prefix references with #).
--->

.gitignore

@@ -18,8 +18,4 @@ build/
 *.ipr
 *.iws
 .gradle/
-atlassian-ide-plugin.xml
-!etc/eclipse/.checkstyle
-.checkstyle
-classes/
-s101plugin.state
+atlassian-ide-plugin.xml

.travis.yml

@@ -1,16 +0,0 @@
-language: java
-
-jdk:
-  - oraclejdk8
-
-os:
-  - linux
-
-before_cache:
-  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
-cache:
-  directories:
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-
-script: ./gradlew build

CODE_OF_CONDUCT.adoc

@@ -1,44 +0,0 @@
-= Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open
-and welcoming community, we pledge to respect all people who contribute through reporting
-issues, posting feature requests, updating documentation, submitting pull requests or
-patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for
-everyone, regardless of level of experience, gender, gender identity and expression,
-sexual orientation, disability, personal appearance, body size, race, ethnicity, age,
-religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses,
-  without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments,
-commits, code, wiki edits, issues, and other contributions that are not aligned to this
-Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors
-that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and
-consistently applying these principles to every aspect of managing this project. Project
-maintainers who do not follow or enforce the Code of Conduct may be permanently removed
-from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces when an
-individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by
-contacting a project maintainer at spring-code-of-conduct@pivotal.io . All complaints will
-be reviewed and investigated and will result in a response that is deemed necessary and
-appropriate to the circumstances. Maintainers are obligated to maintain confidentiality
-with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the
-http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]

CONTRIBUTING.md

@@ -2,10 +2,6 @@ _Have something you'd like to contribute to the framework? We welcome pull reque
 
 _Please refer back to this document as a checklist before issuing any pull request; this will save time for everyone!_
 
-# Code of Conduct
-This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.adoc).
-By participating, you  are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
-
 # Similar but different
 
 Each Spring module is slightly different than another in terms of team size, number of issues, etc. Therefore each project is managed slightly different. You will notice that this document is very similar to the [Spring Framework Contributor guidelines](https://github.com/SpringSource/spring-framework/wiki/Contributor-guidelines). However, there are some subtle differences between the two documents, so please be sure to read this document thoroughly.
@@ -25,31 +21,39 @@ The following provides information on setting up a development environment that
 # Understand the basics 
 Not sure what a pull request is, or how to submit one? Take a look at GitHub's excellent [help documentation first](https://help.github.com/articles/using-pull-requests).
 
-# Search GitHub issues; create an issue if necessary
-Is there already an issue that addresses your concern? Do a bit of searching in our [GitHub issues ](https://github.com/spring-projects/spring-security/issues) to see if you can find something similar. If not, please create a new issue before submitting a pull request unless the change is not a user facing issue.
+# Search JIRA first; create an issue if necessary
+Is there already an issue that addresses your concern? Do a bit of searching in our [JIRA issue tracker](https://jira.springsource.org/browse/SEC) to see if you can find something similar. If not, please create a new issue before submitting a pull request unless the change is not a user facing issue.
 
 # Discuss non-trivial contribution ideas with committers
-If you're considering anything more than correcting a typo or fixing a minor bug, please discuss it on the [Spring Security Gitter](https://gitter.im/spring-projects/spring-security) before submitting a pull request. We're happy to provide guidance but please spend an hour or two researching the subject on your own including searching the forums for prior discussions.
+If you're considering anything more than correcting a typo or fixing a minor bug , please discuss it on the [Spring Security forums](http://forum.springsource.org/forumdisplay.php?33-Security) before submitting a pull request. We're happy to provide guidance but please spend an hour or two researching the subject on your own including searching the forums for prior discussions.
 
 # Sign the Contributor License Agreement
+If you have not previously done so, please fill out and submit the [SpringSource CLA form](https://support.springsource.com/spring_committer_signup). You'll receive a token when this process is complete. Keep track of this, you may be asked for it later!
 
-If you have not previously done so, please fill out and
-submit the [Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+* For **Project** select _Spring Security_
+* For **Project Lead** enter _Rob Winch_
+* Note that emailing/postal mailing a signed copy is not necessary. Submission of the web form is all that is required.
+
+When you've completed the web form, simply add the following in a comment on your pull request:
+
+> I have signed and agree to the terms of the SpringSource Individual Contributor License Agreement.
+
+You do not need to include your token/id. Please add the statement above to all future pull requests as well, simply so the Spring Security team knows immediately that this process is complete.
 
 # Create your branch from master
 Create your topic branch to be submitted as a pull request from master. The Spring team will consider your pull request for backporting on a case-by-case basis; you don't need to worry about submitting anything for backporting.
 
 # Use short branch names
-Branches used when submitting pull requests should preferably be named according to GitHub issues, e.g. 'gh-1234' or 'gh-1234-fix-npe'. Otherwise, use succinct, lower-case, dash (-) delimited names, such as 'fix-warnings', 'fix-typo', etc. This is important, because branch names show up in the merge commits that result from accepting pull requests, and should be as expressive and concise as possible.
+Branches used when submitting pull requests should preferably be named according to JIRA issues, e.g. 'SEC-1234'. Otherwise, use succinct, lower-case, dash (-) delimited names, such as 'fix-warnings', 'fix-typo', etc. This is important, because branch names show up in the merge commits that result from accepting pull requests, and should be as expressive and concise as possible.
 
 #Keep commits focused
 
-Remember each ticket should be focused on a single item of interest since the tickets are used to produce the changelog. Since each commit should be tied to a single GitHub issue, ensure that your commits are focused. For example, do not include an update to a transitive library in your commit unless the GitHub is to update the library. Reviewing your commits is essential before sending a pull request.
+Remember each JIRA should be focused on a single item of interest since the JIRA tickets are used to produce the changelog. Since each commit should be tied to a JIRA, ensure that your commits are focused. For example, do not include an update to a transitive library in your commit unless the JIRA is to update the library. Reviewing your commits is essential before sending a pull request.
 
 # Mind the whitespace
 Please carefully follow the whitespace and formatting conventions already present in the framework. 
 
-1. Tabs, not spaces
+1. Spaces, not tabs
 1. Unix (LF), not dos (CRLF) line endings
 1. Eliminate all trailing whitespace
 1. Aim to wrap code at 120 characters, but favor readability over wrapping
@@ -104,21 +108,12 @@ e.g.
  */
 </pre>
 
-# Submit JUnit test cases for all behavior changes
+#Submit JUnit test cases for all behavior changes
 Search the codebase to find related unit tests and add additional `@Test` methods within. 
 
 1. Any new tests should end in the name Tests (note this is plural). For example, a valid name would be `FilterChainProxyTests`. An invalid name would be `FilterChainProxyTest`.
 2. New test methods should not start with test. This is an old JUnit3 convention and is not necessary since the method is annotated with @Test.
 
-# Update spring-security-x.y.rnc for schema changes
-Update the [RELAX NG](http://www.relaxng.org) schema `spring-security-x.y.rnc` instead of `spring-security-x.y.xsd` if you contribute changes to supported XML configuration. The XML schema file can be generated the following Gradle task:
-
-<pre>
-./gradlew spring-security-config:rncToXsd
-</pre>
-
-Changes to the XML schema will be overwritten by the Gradle build task.
-
 # Squash commits
 Use git rebase --interactive, git add --patch and other tools to "squash" multiple commits into atomic changes. In addition to the man pages for git, there are many resources online to help you understand how these tools work. Here is one: http://book.git-scm.com/4_interactive_rebasing.html.
 
@@ -151,7 +146,7 @@ git config user.email user@mail.com
 # Format commit messages
 
 <pre>
-Short (50 chars or less) summary of changes
+SEC-1234: Short (50 chars or less) summary of changes
 
 More detailed explanatory text, if necessary.  Wrap it to about 72
 characters or so.  In some contexts, the first line is treated as the
@@ -166,15 +161,13 @@ Further paragraphs come after blank lines.
 
  - Typically a hyphen or asterisk is used for the bullet, preceded by a
    single space, with blank lines in between, but conventions vary here
-
-Fixes gh-123
 </pre>
 
 
-1. Keep the subject line to 50 characters or less if possible
-2. Do not end the subject line with a period
-3. In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now
-3. Include Fixes gh-<issue-number> at the end if this fixes a GitHub issue  
+1. The commit subject should start with the associated jira issue followed by a : as shown in the example above
+2. Keep the subject line to 50 characters or less if possible
+3. Do not end the subject line with a period
+4. In the body of the commit message, explain how things worked before this commit, what has changed, and how things work now
 
 # Run all tests prior to submission
 
@@ -191,13 +184,13 @@ Follow the same conventions for pull request subject lines as mentioned above fo
 In the body:
 
 1. Explain your use case. What led you to submit this change? Why were existing mechanisms in the framework insufficient? Make a case that this is a general-purpose problem and that yours is a general-purpose solution, etc
-2. Add any additional information and ask questions; start a conversation, or continue one from GitHub Issues
-3. Mention any GitHub Issues
+2. Add any additional information and ask questions; start a conversation, or continue one from JIRA
+3. Mention the JIRA issue ID
 4. Also mention that you have submitted the CLA as described above
 Note that for pull requests containing a single commit, GitHub will default the subject line and body of the pull request to match the subject line and body of the commit message. This is fine, but please also include the items above in the body of the request.
 
-# Mention your pull request on the associated GitHub issue
-Add a comment to the associated GitHub issue(s) linking to your new pull request.
+# Mention your pull request on the associated JIRA issue
+Add a comment to the associated JIRA issue(s) linking to your new pull request.
 
 # Expect discussion and rework
 The Spring team takes a very conservative approach to accepting contributions to the framework. This is to keep code quality and stability as high as possible, and to keep complexity at a minimum. Your changes, if accepted, may be heavily modified prior to merging. You will retain "Author:" attribution for your Git commits granted that the bulk of your changes remain intact. You may be asked to rework the submission for style (as explained above) and/or substance. Again, we strongly recommend discussing any serious submissions with the Spring Framework team prior to engaging in serious development work.

README.adoc

@@ -1,7 +1,5 @@
 image::https://badges.gitter.im/Join%20Chat.svg[Gitter,link=https://gitter.im/spring-projects/spring-security?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge]
 
-image:https://travis-ci.org/spring-projects/spring-security.svg?branch=master["Build Status", link="https://travis-ci.org/spring-security/spring-security"]
-
 = Spring Security
 
 Spring Security provides security services for the http://docs.spring.io[Spring IO Platform]. Spring Security 3.1 requires Spring 3.0.3 as
@@ -9,10 +7,6 @@ a minimum and also requires Java 5.
 
 For a detailed list of features and access to the latest release, please visit http://spring.io/projects[Spring projects].
 
-== Code of Conduct
-This project adheres to the Contributor Covenant link:CODE_OF_CONDUCT.adoc[code of conduct].
-By participating, you  are expected to uphold this code. Please report unacceptable behavior to spring-code-of-conduct@pivotal.io.
-
 == Downloading Artifacts
 See https://github.com/spring-projects/spring-framework/wiki/Downloading-Spring-artifacts[downloading Spring artifacts] for Maven repository information.
 
@@ -29,9 +23,9 @@ In the instructions below, http://vimeo.com/34436402[`./gradlew`] is invoked fro
 a cross-platform, self-contained bootstrap mechanism for the build.
 
 === Prerequisites
-http://help.github.com/set-up-git-redirect[Git] and the http://www.oracle.com/technetwork/java/javase/downloads[JDK8 build].
+http://help.github.com/set-up-git-redirect[Git] and the http://www.oracle.com/technetwork/java/javase/downloads[JDK7 build].
 
-Be sure that your `JAVA_HOME` environment variable points to the `jdk1.8.0` folder extracted from the JDK download.
+Be sure that your `JAVA_HOME` environment variable points to the `jdk1.7.0` folder extracted from the JDK download.
 
 === Check out sources
 [indent=0]

acl/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
   <artifactId>spring-security-acl</artifactId>
-  <version>4.2.7.RELEASE</version>
+  <version>4.0.4.RELEASE</version>
   <name>spring-security-acl</name>
   <description>spring-security-acl</description>
   <url>http://spring.io/spring-security</url>
@@ -30,17 +30,6 @@
     <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
     <url>https://github.com/spring-projects/spring-security</url>
   </scm>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>4.3.18.RELEASE</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>aopalliance</groupId>
@@ -51,7 +40,7 @@
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.2.7.RELEASE</version>
+      <version>4.0.4.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -95,7 +84,7 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      <version>2.10.4</version>
+      <version>2.9.0</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -108,13 +97,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>2.2.0</version>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -132,7 +121,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -151,6 +140,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>4.2.5.RELEASE</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <plugins>
       <plugin>

acl/src/main/java/org/springframework/security/acls/AclEntryVoter.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/AclPermissionCacheOptimizer.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls;
 
 import java.util.ArrayList;

acl/src/main/java/org/springframework/security/acls/AclPermissionEvaluator.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls;
 
 import java.io.Serializable;

acl/src/main/java/org/springframework/security/acls/afterinvocation/AbstractAclProvider.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,10 +15,12 @@
 
 package org.springframework.security.acls.afterinvocation;
 
+import java.util.Arrays;
 import java.util.List;
 
 import org.springframework.security.access.AfterInvocationProvider;
 import org.springframework.security.access.ConfigAttribute;
+import org.springframework.security.acls.domain.BasePermission;
 import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
 import org.springframework.security.acls.domain.SidRetrievalStrategyImpl;
 import org.springframework.security.acls.model.Acl;

acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProvider.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProvider.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/afterinvocation/ArrayFilterer.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/afterinvocation/CollectionFilterer.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/afterinvocation/Filterer.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -43,7 +42,7 @@ interface Filterer<T> extends Iterable<T> {
 	Iterator<T> iterator();
 
 	/**
-	 * Removes the given object from the resulting list.
+	 * Removes the the given object from the resulting list.
 	 *
 	 * @param object the object to be removed
 	 */

acl/src/main/java/org/springframework/security/acls/afterinvocation/package-info.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * After-invocation providers for collection and array filtering. Consider using a {@code PostFilter} annotation in
  * preference.

acl/src/main/java/org/springframework/security/acls/domain/AbstractPermission.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
 import org.springframework.security.acls.model.Permission;

acl/src/main/java/org/springframework/security/acls/domain/AccessControlEntryImpl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImpl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -16,20 +15,18 @@
 
 package org.springframework.security.acls.domain;
 
+import java.util.Arrays;
+import java.util.List;
+
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.util.Assert;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-
 /**
  * Default implementation of {@link AclAuthorizationStrategy}.
  * <p>
@@ -120,8 +117,7 @@ public class AclAuthorizationStrategyImpl implements AclAuthorizationStrategy {
 		}
 
 		// Iterate this principal's authorities to determine right
-		Set<String> authorities = AuthorityUtils.authorityListToSet(authentication.getAuthorities());
-		if (authorities.contains(requiredAuthority.getAuthority())) {
+		if (authentication.getAuthorities().contains(requiredAuthority)) {
 			return;
 		}
 

acl/src/main/java/org/springframework/security/acls/domain/AclFormattingUtils.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/AclImpl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/AuditLogger.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/BasePermission.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/ConsoleAuditLogger.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/CumulativePermission.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionFactory.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
 import java.lang.reflect.Field;

acl/src/main/java/org/springframework/security/acls/domain/DefaultPermissionGrantingStrategy.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
 import java.util.List;

acl/src/main/java/org/springframework/security/acls/domain/EhCacheBasedAclCache.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/GrantedAuthoritySid.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/IdentityUnavailableException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityImpl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImpl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/PermissionFactory.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
 import java.util.List;

acl/src/main/java/org/springframework/security/acls/domain/PrincipalSid.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/SidRetrievalStrategyImpl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/domain/package-info.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * Basic implementation of access control lists (ACLs) interfaces.
  */

acl/src/main/java/org/springframework/security/acls/jdbc/BasicLookupStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcAclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/jdbc/JdbcMutableAclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/jdbc/LookupStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/jdbc/package-info.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * JDBC-based persistence of ACL information
  */

acl/src/main/java/org/springframework/security/acls/model/AccessControlEntry.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -46,7 +45,7 @@ public interface AccessControlEntry extends Serializable {
 	Sid getSid();
 
 	/**
-	 * Indicates the permission is being granted to the relevant Sid. If false,
+	 * Indicates the a Permission is being granted to the relevant Sid. If false,
 	 * indicates the permission is being revoked/blocked.
 	 *
 	 * @return true if being granted, false otherwise

acl/src/main/java/org/springframework/security/acls/model/Acl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/AclCache.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/AclDataAccessException.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.model;
 
 /**

acl/src/main/java/org/springframework/security/acls/model/AclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/AlreadyExistsException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/AuditableAccessControlEntry.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/AuditableAcl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/ChildrenExistException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/MutableAcl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/MutableAclService.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/NotFoundException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/ObjectIdentity.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityGenerator.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.model;
 
 import java.io.Serializable;

acl/src/main/java/org/springframework/security/acls/model/ObjectIdentityRetrievalStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/OwnershipAcl.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/Permission.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/PermissionGrantingStrategy.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.model;
 
 import java.util.List;
@@ -27,7 +12,7 @@ import java.util.List;
 public interface PermissionGrantingStrategy {
 
 	/**
-	 * Returns true if the supplied strategy decides that the supplied {@code Acl}
+	 * Returns true if the the supplied strategy decides that the supplied {@code Acl}
 	 * grants access based on the supplied list of permissions and sids.
 	 */
 	boolean isGranted(Acl acl, List<Permission> permission, List<Sid> sids,

acl/src/main/java/org/springframework/security/acls/model/Sid.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/SidRetrievalStrategy.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/UnloadedSidException.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/main/java/org/springframework/security/acls/model/package-info.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * Interfaces and shared classes to manage access control lists (ACLs) for domain object instances.
  */

acl/src/main/java/org/springframework/security/acls/package-info.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 /**
  * The Spring Security ACL package which implements instance-based security for domain objects.
  * <p>

acl/src/test/java/org/springframework/security/acls/AclFormattingUtilsTests.java

@@ -1,155 +1,144 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-import org.junit.Test;
 import org.springframework.security.acls.domain.AclFormattingUtils;
 import org.springframework.security.acls.model.Permission;
 
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
 /**
  * Tests for {@link AclFormattingUtils}.
  *
  * @author Andrei Stefan
  */
-public class AclFormattingUtilsTests {
+public class AclFormattingUtilsTests extends TestCase {
 
 	// ~ Methods
 	// ========================================================================================================
-	@Test
+
 	public final void testDemergePatternsParametersConstraints() throws Exception {
 		try {
 			AclFormattingUtils.demergePatterns(null, "SOME STRING");
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.demergePatterns("SOME STRING", null);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.demergePatterns("SOME STRING", "LONGER SOME STRING");
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.demergePatterns("SOME STRING", "SAME LENGTH");
+			Assert.assertTrue(true);
 		}
 		catch (IllegalArgumentException notExpected) {
-			fail("It shouldn't have thrown IllegalArgumentException");
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
 		}
 	}
 
-	@Test
 	public final void testDemergePatterns() throws Exception {
 		String original = "...........................A...R";
 		String removeBits = "...............................R";
-		assertThat(AclFormattingUtils.demergePatterns(original, removeBits)).isEqualTo(
-				"...........................A....");
+		Assert.assertEquals("...........................A....",
+				AclFormattingUtils.demergePatterns(original, removeBits));
 
-		assertThat(AclFormattingUtils.demergePatterns("ABCDEF", "......")).isEqualTo(
-				"ABCDEF");
-		assertThat(AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL")).isEqualTo(
-				"......");
+		Assert.assertEquals("ABCDEF",
+				AclFormattingUtils.demergePatterns("ABCDEF", "......"));
+		Assert.assertEquals("......",
+				AclFormattingUtils.demergePatterns("ABCDEF", "GHIJKL"));
 	}
 
-	@Test
 	public final void testMergePatternsParametersConstraints() throws Exception {
 		try {
 			AclFormattingUtils.mergePatterns(null, "SOME STRING");
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.mergePatterns("SOME STRING", null);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.mergePatterns("SOME STRING", "LONGER SOME STRING");
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.mergePatterns("SOME STRING", "SAME LENGTH");
+			Assert.assertTrue(true);
 		}
 		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
 		}
 	}
 
-	@Test
 	public final void testMergePatterns() throws Exception {
 		String original = "...............................R";
 		String extraBits = "...........................A....";
-		assertThat(AclFormattingUtils.mergePatterns(original, extraBits)).isEqualTo(
-				"...........................A...R");
+		Assert.assertEquals("...........................A...R",
+				AclFormattingUtils.mergePatterns(original, extraBits));
 
-		assertThat(AclFormattingUtils.mergePatterns("ABCDEF", "......")).isEqualTo(
-				"ABCDEF");
-		assertThat(AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL")).isEqualTo(
-				"GHIJKL");
+		Assert.assertEquals("ABCDEF",
+				AclFormattingUtils.mergePatterns("ABCDEF", "......"));
+		Assert.assertEquals("GHIJKL",
+				AclFormattingUtils.mergePatterns("ABCDEF", "GHIJKL"));
 	}
 
-	@Test
 	public final void testBinaryPrints() throws Exception {
-		assertThat(AclFormattingUtils.printBinary(15)).isEqualTo(
-				"............................****");
+		Assert.assertEquals("............................****",
+				AclFormattingUtils.printBinary(15));
 
 		try {
 			AclFormattingUtils.printBinary(15, Permission.RESERVED_ON);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException notExpected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			AclFormattingUtils.printBinary(15, Permission.RESERVED_OFF);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException notExpected) {
+			Assert.assertTrue(true);
 		}
 
-		assertThat(AclFormattingUtils.printBinary(15, 'x')).isEqualTo(
-				"............................xxxx");
+		Assert.assertEquals("............................xxxx",
+				AclFormattingUtils.printBinary(15, 'x'));
 	}
 
-	@Test
 	public void testPrintBinaryNegative() {
-		assertThat(AclFormattingUtils.printBinary(0x80000000)).isEqualTo(
-				"*...............................");
+		Assert.assertEquals("*...............................",
+				AclFormattingUtils.printBinary(0x80000000));
 	}
 
-	@Test
 	public void testPrintBinaryMinusOne() {
-		assertThat(AclFormattingUtils.printBinary(0xffffffff)).isEqualTo(
-				"********************************");
+		Assert.assertEquals("********************************",
+				AclFormattingUtils.printBinary(0xffffffff));
 	}
 }

acl/src/test/java/org/springframework/security/acls/AclPermissionCacheOptimizerTests.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls;
 
 import static org.mockito.Mockito.*;

acl/src/test/java/org/springframework/security/acls/AclPermissionEvaluatorTests.java

@@ -1,22 +1,7 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls;
 
-import static org.assertj.core.api.Assertions.*;
-
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Locale;
@@ -26,8 +11,6 @@ import org.springframework.security.acls.model.Acl;
 import org.springframework.security.acls.model.AclService;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
-import org.springframework.security.acls.model.Permission;
-import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.core.Authentication;
 
@@ -39,6 +22,7 @@ import org.springframework.security.core.Authentication;
 public class AclPermissionEvaluatorTests {
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void hasPermissionReturnsTrueIfAclGrantsPermission() throws Exception {
 		AclService service = mock(AclService.class);
 		AclPermissionEvaluator pe = new AclPermissionEvaluator(service);
@@ -49,10 +33,10 @@ public class AclPermissionEvaluatorTests {
 		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Acl acl = mock(Acl.class);
 
-		when(service.readAclById(any(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(acl);
-		when(acl.isGranted(anyListOf(Permission.class), anyListOf(Sid.class), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
+		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
 
-		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "READ")).isTrue();
+		assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "READ"));
 	}
 
 	@Test
@@ -69,10 +53,10 @@ public class AclPermissionEvaluatorTests {
 		pe.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Acl acl = mock(Acl.class);
 
-		when(service.readAclById(any(ObjectIdentity.class), anyListOf(Sid.class))).thenReturn(acl);
-		when(acl.isGranted(anyListOf(Permission.class), anyListOf(Sid.class), eq(false))).thenReturn(true);
+		when(service.readAclById(any(ObjectIdentity.class), anyList())).thenReturn(acl);
+		when(acl.isGranted(anyList(), anyList(), eq(false))).thenReturn(true);
 
-		assertThat(pe.hasPermission(mock(Authentication.class), new Object(), "write")).isTrue();
+		assertTrue(pe.hasPermission(mock(Authentication.class), new Object(), "write"));
 
 		Locale.setDefault(systemLocale);
 	}

acl/src/test/java/org/springframework/security/acls/TargetObject.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls;
 
 /**

acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationCollectionFilteringProviderTests.java

@@ -1,30 +1,19 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.afterinvocation;
 
-
-import static org.assertj.core.api.Assertions.*;
-
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyBoolean;
 import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.when;
 
 import org.junit.Test;
 import org.springframework.security.access.ConfigAttribute;
 import org.springframework.security.access.SecurityConfig;
 import org.springframework.security.acls.model.*;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.SpringSecurityMessageSource;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,13 +42,13 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests {
 		Object returned = provider.decide(mock(Authentication.class), new Object(),
 				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), new ArrayList(
 						Arrays.asList(new Object(), new Object())));
-		assertThat(returned).isInstanceOf(List.class);
-		assertThat(((List) returned)).isEmpty();
+		assertTrue(returned instanceof List);
+		assertTrue(((List) returned).isEmpty());
 		returned = provider.decide(mock(Authentication.class), new Object(),
 				SecurityConfig.createList("UNSUPPORTED", "AFTER_ACL_COLLECTION_READ"),
 				new Object[] { new Object(), new Object() });
-		assertThat(returned instanceof Object[]).isTrue();
-		assertThat(((Object[]) returned).length == 0).isTrue();
+		assertTrue(returned instanceof Object[]);
+		assertTrue(((Object[]) returned).length == 0);
 	}
 
 	@Test
@@ -68,8 +57,8 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests {
 				mock(AclService.class), Arrays.asList(mock(Permission.class)));
 		Object returned = new Object();
 
-		assertThat(returned)
-			.isSameAs(
+		assertSame(
+				returned,
 				provider.decide(mock(Authentication.class), new Object(),
 						Collections.<ConfigAttribute> emptyList(), returned));
 	}
@@ -80,9 +69,8 @@ public class AclEntryAfterInvocationCollectionFilteringProviderTests {
 		AclEntryAfterInvocationCollectionFilteringProvider provider = new AclEntryAfterInvocationCollectionFilteringProvider(
 				service, Arrays.asList(mock(Permission.class)));
 
-		assertThat(provider.decide(mock(Authentication.class), new Object(),
-				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null))
-				.isNull();;
+		assertNull(provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null));
 		verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class));
 	}
 

acl/src/test/java/org/springframework/security/acls/afterinvocation/AclEntryAfterInvocationProviderTests.java

@@ -1,21 +1,7 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.afterinvocation;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
@@ -64,9 +50,8 @@ public class AclEntryAfterInvocationProviderTests {
 		provider.setSidRetrievalStrategy(mock(SidRetrievalStrategy.class));
 		Object returned = new Object();
 
-		assertThat(
-				returned)
-			.isSameAs(
+		assertSame(
+				returned,
 				provider.decide(mock(Authentication.class), new Object(),
 						SecurityConfig.createList("AFTER_ACL_READ"), returned));
 	}
@@ -77,9 +62,8 @@ public class AclEntryAfterInvocationProviderTests {
 				mock(AclService.class), Arrays.asList(mock(Permission.class)));
 		Object returned = new Object();
 
-		assertThat(
-				returned)
-			.isSameAs(
+		assertSame(
+				returned,
 				provider.decide(mock(Authentication.class), new Object(),
 						Collections.<ConfigAttribute> emptyList(), returned));
 	}
@@ -92,9 +76,8 @@ public class AclEntryAfterInvocationProviderTests {
 		// Not a String
 		Object returned = new Object();
 
-		assertThat(
-				returned)
-			.isSameAs(
+		assertSame(
+				returned,
 				provider.decide(mock(Authentication.class), new Object(),
 						SecurityConfig.createList("AFTER_ACL_READ"), returned));
 	}
@@ -121,7 +104,7 @@ public class AclEntryAfterInvocationProviderTests {
 			provider.decide(mock(Authentication.class), new Object(),
 					SecurityConfig.createList("UNSUPPORTED", "MY_ATTRIBUTE"),
 					new Object());
-			fail("Expected Exception");
+			fail();
 		}
 		catch (AccessDeniedException expected) {
 		}
@@ -136,9 +119,8 @@ public class AclEntryAfterInvocationProviderTests {
 		AclEntryAfterInvocationProvider provider = new AclEntryAfterInvocationProvider(
 				service, Arrays.asList(mock(Permission.class)));
 
-		assertThat(provider.decide(mock(Authentication.class), new Object(),
-				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null))
-			.isNull();;
+		assertNull(provider.decide(mock(Authentication.class), new Object(),
+				SecurityConfig.createList("AFTER_ACL_COLLECTION_READ"), null));
 		verify(service, never()).readAclById(any(ObjectIdentity.class), any(List.class));
 	}
 }

acl/src/test/java/org/springframework/security/acls/domain/AccessControlImplEntryTests.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.Test;
@@ -75,13 +60,13 @@ public class AccessControlImplEntryTests {
 				sid, BasePermission.ADMINISTRATION, true, true, true);
 
 		// and check every get() method
-		assertThat(ace.getId()).isEqualTo(new Long(1));
-		assertThat(ace.getAcl()).isEqualTo(mockAcl);
-		assertThat(ace.getSid()).isEqualTo(sid);
-		assertThat(ace.isGranting()).isTrue();
-		assertThat(ace.getPermission()).isEqualTo(BasePermission.ADMINISTRATION);
-		assertThat(((AuditableAccessControlEntry) ace).isAuditFailure()).isTrue();
-		assertThat(((AuditableAccessControlEntry) ace).isAuditSuccess()).isTrue();
+		assertEquals(new Long(1), ace.getId());
+		assertEquals(mockAcl, ace.getAcl());
+		assertEquals(sid, ace.getSid());
+		assertTrue(ace.isGranting());
+		assertEquals(BasePermission.ADMINISTRATION, ace.getPermission());
+		assertTrue(((AuditableAccessControlEntry) ace).isAuditFailure());
+		assertTrue(((AuditableAccessControlEntry) ace).isAuditSuccess());
 	}
 
 	@Test
@@ -95,23 +80,23 @@ public class AccessControlImplEntryTests {
 		AccessControlEntry ace = new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
 				sid, BasePermission.ADMINISTRATION, true, true, true);
 
-		assertThat(ace).isNotNull();
-		assertThat(ace).isNotEqualTo(Long.valueOf(100));
-		assertThat(ace).isEqualTo(ace);
-		assertThat(ace).isEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-				BasePermission.ADMINISTRATION, true, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid,
-				BasePermission.ADMINISTRATION, true, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
+		assertFalse(ace.equals(null));
+		assertFalse(ace.equals(Long.valueOf(100)));
+		assertTrue(ace.equals(ace));
+		assertTrue(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(2), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl,
 				new PrincipalSid("scott"), BasePermission.ADMINISTRATION, true, true,
-				true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-				BasePermission.WRITE, true, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-				BasePermission.ADMINISTRATION, false, true, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-				BasePermission.ADMINISTRATION, true, false, true));
-		assertThat(ace).isNotEqualTo(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
-				BasePermission.ADMINISTRATION, true, true, false));
+				true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.WRITE, true, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, false, true, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, false, true)));
+		assertFalse(ace.equals(new AccessControlEntryImpl(Long.valueOf(1), mockAcl, sid,
+				BasePermission.ADMINISTRATION, true, true, false)));
 	}
 }

acl/src/test/java/org/springframework/security/acls/domain/AclAuthorizationStrategyImplTests.java

@@ -1,72 +0,0 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.security.acls.domain;
-
-
-import java.util.Arrays;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-import org.springframework.security.acls.model.Acl;
-import org.springframework.security.authentication.TestingAuthenticationToken;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-
-/**
- *
- * @author Rob Winch
- *
- */
-@RunWith(MockitoJUnitRunner.class)
-public class AclAuthorizationStrategyImplTests {
-	@Mock
-	Acl acl;
-	GrantedAuthority authority;
-	AclAuthorizationStrategyImpl strategy;
-
-	@Before
-	public void setup() {
-		authority = new SimpleGrantedAuthority("ROLE_AUTH");
-		TestingAuthenticationToken authentication = new TestingAuthenticationToken("foo", "bar", Arrays.asList(authority));
-		authentication.setAuthenticated(true);
-		SecurityContextHolder.getContext().setAuthentication(authentication);
-	}
-
-	@After
-	public void cleanup() {
-		SecurityContextHolder.clearContext();
-	}
-
-	// gh-4085
-	@Test
-	public void securityCheckWhenCustomAuthorityThenNameIsUsed() {
-		strategy = new AclAuthorizationStrategyImpl(new CustomAuthority());
-		strategy.securityCheck(acl, AclAuthorizationStrategy.CHANGE_GENERAL);
-	}
-
-	@SuppressWarnings("serial")
-	class CustomAuthority implements GrantedAuthority {
-		@Override
-		public String getAuthority() {
-			return authority.getAuthority();
-		}
-	}
-}

acl/src/test/java/org/springframework/security/acls/domain/AclImplTests.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import org.junit.*;
@@ -132,36 +117,36 @@ public class AclImplTests {
 		acl.insertAce(0, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST1"), true);
 		service.updateAcl(acl);
 		// Check it was successfully added
-		assertThat(acl.getEntries()).hasSize(1);
-		assertThat(acl).isEqualTo(acl.getEntries().get(0).getAcl());
-		assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(0).getPermission());
-		assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(1, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(0).getAcl(), acl);
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST1"));
 
 		// Add a second permission
 		acl.insertAce(1, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST2"), true);
 		service.updateAcl(acl);
 		// Check it was added on the last position
-		assertThat(acl.getEntries()).hasSize(2);
-		assertThat(acl).isEqualTo(acl.getEntries().get(1).getAcl());
-		assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(1).getPermission());
-		assertThat(acl.getEntries().get(1).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(2, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(1).getAcl(), acl);
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST2"));
 
 		// Add a third permission, after the first one
 		acl.insertAce(1, BasePermission.WRITE, new GrantedAuthoritySid("ROLE_TEST3"),
 				false);
 		service.updateAcl(acl);
-		assertThat(acl.getEntries()).hasSize(3);
+		assertEquals(3, acl.getEntries().size());
 		// Check the third entry was added between the two existent ones
-		assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(0).getPermission());
-		assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST1"));
-		assertThat(BasePermission.WRITE).isEqualTo(acl.getEntries().get(1).getPermission());
-		assertThat(acl.getEntries().get(1).getSid()).isEqualTo( new GrantedAuthoritySid(
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE);
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST3"));
-		assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(2).getPermission());
-		assertThat(acl.getEntries().get(2).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(2).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST2"));
 	}
 
@@ -194,26 +179,26 @@ public class AclImplTests {
 		// Delete first permission and check the order of the remaining permissions is
 		// kept
 		acl.deleteAce(0);
-		assertThat(acl.getEntries()).hasSize(2);
-		assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(2, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST2"));
-		assertThat(acl.getEntries().get(1).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST3"));
 
 		// Add one more permission and remove the permission in the middle
 		acl.insertAce(2, BasePermission.READ, new GrantedAuthoritySid("ROLE_TEST4"), true);
 		service.updateAcl(acl);
 		acl.deleteAce(1);
-		assertThat(acl.getEntries()).hasSize(2);
-		assertThat(acl.getEntries().get(0).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(2, acl.getEntries().size());
+		assertEquals(acl.getEntries().get(0).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST2"));
-		assertThat(acl.getEntries().get(1).getSid()).isEqualTo(new GrantedAuthoritySid(
+		assertEquals(acl.getEntries().get(1).getSid(), new GrantedAuthoritySid(
 				"ROLE_TEST4"));
 
 		// Remove remaining permissions
 		acl.deleteAce(1);
 		acl.deleteAce(0);
-		assertThat(acl.getEntries()).isEmpty();
+		assertEquals(0, acl.getEntries().size());
 	}
 
 	@Test
@@ -274,18 +259,18 @@ public class AclImplTests {
 				BasePermission.CREATE);
 		List<Sid> sids = Arrays.asList(new PrincipalSid("ben"), new GrantedAuthoritySid(
 				"ROLE_GUEST"));
-		assertThat(rootAcl.isGranted(permissions, sids, false)).isFalse();
+		assertFalse(rootAcl.isGranted(permissions, sids, false));
 		try {
 			rootAcl.isGranted(permissions, SCOTT, false);
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
 		}
-		assertThat(rootAcl.isGranted(WRITE, SCOTT, false)).isTrue();
-		assertThat(rootAcl.isGranted(WRITE, Arrays.asList(new PrincipalSid("rod"),
-				new GrantedAuthoritySid("WRITE_ACCESS_ROLE")), false)).isFalse();
-		assertThat(rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid(
-				"WRITE_ACCESS_ROLE"), new PrincipalSid("rod")), false)).isTrue();
+		assertTrue(rootAcl.isGranted(WRITE, SCOTT, false));
+		assertFalse(rootAcl.isGranted(WRITE, Arrays.asList(new PrincipalSid("rod"),
+				new GrantedAuthoritySid("WRITE_ACCESS_ROLE")), false));
+		assertTrue(rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid(
+				"WRITE_ACCESS_ROLE"), new PrincipalSid("rod")), false));
 		try {
 			// Change the type of the Sid and check the granting process
 			rootAcl.isGranted(WRITE, Arrays.asList(new GrantedAuthoritySid("rod"),
@@ -341,40 +326,40 @@ public class AclImplTests {
 		childAcl1.insertAce(0, BasePermission.CREATE, new PrincipalSid("scott"), true);
 
 		// Check granting process for parent1
-		assertThat(parentAcl1.isGranted(READ, SCOTT, false)).isTrue();
-		assertThat(parentAcl1.isGranted(READ,
-				Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false))
-				.isTrue();
-		assertThat(parentAcl1.isGranted(WRITE, BEN, false)).isTrue();
-		assertThat(parentAcl1.isGranted(DELETE, BEN, false)).isFalse();
-		assertThat(parentAcl1.isGranted(DELETE, SCOTT, false)).isFalse();
+		assertTrue(parentAcl1.isGranted(READ, SCOTT, false));
+		assertTrue(parentAcl1.isGranted(READ,
+				Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false));
+		assertTrue(parentAcl1.isGranted(WRITE, BEN, false));
+		assertFalse(parentAcl1.isGranted(DELETE, BEN, false));
+		assertFalse(parentAcl1.isGranted(DELETE, SCOTT, false));
 
 		// Check granting process for parent2
-		assertThat(parentAcl2.isGranted(CREATE, BEN, false)).isTrue();
-		assertThat(parentAcl2.isGranted(WRITE, BEN, false)).isTrue();
-		assertThat(parentAcl2.isGranted(DELETE, BEN, false)).isFalse();
+		assertTrue(parentAcl2.isGranted(CREATE, BEN, false));
+		assertTrue(parentAcl2.isGranted(WRITE, BEN, false));
+		assertFalse(parentAcl2.isGranted(DELETE, BEN, false));
 
 		// Check granting process for child1
-		assertThat(childAcl1.isGranted(CREATE, SCOTT, false)).isTrue();
-		assertThat(childAcl1.isGranted(READ,
-				Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false))
-				.isTrue();
-		assertThat(childAcl1.isGranted(DELETE, BEN, false)).isFalse();
+		assertTrue(childAcl1.isGranted(CREATE, SCOTT, false));
+		assertTrue(childAcl1.isGranted(READ,
+				Arrays.asList((Sid) new GrantedAuthoritySid("ROLE_USER_READ")), false));
+		assertFalse(childAcl1.isGranted(DELETE, BEN, false));
 
 		// Check granting process for child2 (doesn't inherit the permissions from its
 		// parent)
 		try {
-			assertThat(childAcl2.isGranted(CREATE, SCOTT, false)).isTrue();
+			assertTrue(childAcl2.isGranted(CREATE, SCOTT, false));
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
+			assertTrue(true);
 		}
 		try {
-			childAcl2.isGranted(CREATE,
-					Arrays.asList((Sid) new PrincipalSid("joe")), false);
+			assertTrue(childAcl2.isGranted(CREATE,
+					Arrays.asList((Sid) new PrincipalSid("joe")), false));
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
+			assertTrue(true);
 		}
 	}
 
@@ -395,9 +380,9 @@ public class AclImplTests {
 		acl.insertAce(2, BasePermission.CREATE, new PrincipalSid("ben"), true);
 		service.updateAcl(acl);
 
-		assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(0).getPermission());
-		assertThat(BasePermission.WRITE).isEqualTo(acl.getEntries().get(1).getPermission());
-		assertThat(BasePermission.CREATE).isEqualTo(acl.getEntries().get(2).getPermission());
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.READ);
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.WRITE);
+		assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.CREATE);
 
 		// Change each permission
 		acl.updateAce(0, BasePermission.CREATE);
@@ -405,9 +390,9 @@ public class AclImplTests {
 		acl.updateAce(2, BasePermission.READ);
 
 		// Check the change was successfully made
-		assertThat(BasePermission.CREATE).isEqualTo(acl.getEntries().get(0).getPermission());
-		assertThat(BasePermission.DELETE).isEqualTo(acl.getEntries().get(1).getPermission());
-		assertThat(BasePermission.READ).isEqualTo(acl.getEntries().get(2).getPermission());
+		assertEquals(acl.getEntries().get(0).getPermission(), BasePermission.CREATE);
+		assertEquals(acl.getEntries().get(1).getPermission(), BasePermission.DELETE);
+		assertEquals(acl.getEntries().get(2).getPermission(), BasePermission.READ);
 	}
 
 	@Test
@@ -426,26 +411,28 @@ public class AclImplTests {
 				true);
 		service.updateAcl(acl);
 
-		assertThat(((AuditableAccessControlEntry) acl.getEntries().get(0))
-				.isAuditFailure())
-			.isFalse();
-		assertThat(((AuditableAccessControlEntry) acl.getEntries().get(1))
-				.isAuditFailure())
-			.isFalse();
-		assertThat(((AuditableAccessControlEntry) acl.getEntries().get(0))
-				.isAuditSuccess())
-			.isFalse();
-		assertThat(((AuditableAccessControlEntry) acl.getEntries().get(1))
-				.isAuditSuccess())
-			.isFalse();
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditFailure());
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditFailure());
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditSuccess());
+		assertFalse(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditSuccess());
 
 		// Change each permission
 		((AuditableAcl) acl).updateAuditing(0, true, true);
 		((AuditableAcl) acl).updateAuditing(1, true, true);
 
 		// Check the change was successfuly made
-		assertThat(acl.getEntries()).extracting("auditSuccess").containsOnly(true, true);
-		assertThat(acl.getEntries()).extracting("auditFailure").containsOnly(true, true);
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditFailure());
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditFailure());
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(0))
+				.isAuditSuccess());
+		assertTrue(((AuditableAccessControlEntry) acl.getEntries().get(1))
+				.isAuditSuccess());
 	}
 
 	@Test
@@ -467,21 +454,21 @@ public class AclImplTests {
 				true);
 		service.updateAcl(acl);
 
-		assertThat(1).isEqualTo(acl.getId());
-		assertThat(identity).isEqualTo(acl.getObjectIdentity());
-		assertThat(new PrincipalSid("joe")).isEqualTo(acl.getOwner());
-		assertThat(acl.getParentAcl()).isNull();
-		assertThat(acl.isEntriesInheriting()).isTrue();
-		assertThat(acl.getEntries()).hasSize(2);
+		assertEquals(acl.getId(), 1);
+		assertEquals(acl.getObjectIdentity(), identity);
+		assertEquals(acl.getOwner(), new PrincipalSid("joe"));
+		assertNull(acl.getParentAcl());
+		assertTrue(acl.isEntriesInheriting());
+		assertEquals(2, acl.getEntries().size());
 
 		acl.setParent(parentAcl);
-		assertThat(parentAcl).isEqualTo(acl.getParentAcl());
+		assertEquals(acl.getParentAcl(), parentAcl);
 
 		acl.setEntriesInheriting(false);
-		assertThat(acl.isEntriesInheriting()).isFalse();
+		assertFalse(acl.isEntriesInheriting());
 
 		acl.setOwner(new PrincipalSid("ben"));
-		assertThat(new PrincipalSid("ben")).isEqualTo(acl.getOwner());
+		assertEquals(acl.getOwner(), new PrincipalSid("ben"));
 	}
 
 	@Test
@@ -491,25 +478,20 @@ public class AclImplTests {
 		MutableAcl acl = new AclImpl(objectIdentity, 1, authzStrategy, pgs, null,
 				loadedSids, true, new PrincipalSid("joe"));
 
-		assertThat(acl.isSidLoaded(loadedSids)).isTrue();
-		assertThat(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid("ROLE_IGNORED"),
-				new PrincipalSid("ben"))))
-			.isTrue();
-		assertThat(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid(
-				"ROLE_IGNORED"))))
-			.isTrue();
-		assertThat(acl.isSidLoaded(BEN)).isTrue();
-		assertThat(acl.isSidLoaded(null)).isTrue();
-		assertThat(acl.isSidLoaded(new ArrayList<Sid>(0))).isTrue();
-		assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
-				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))))
-			.isTrue();
-		assertThat(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
-				"ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED"))))
-			.isFalse();
-		assertThat(acl.isSidLoaded(Arrays.asList((Sid)new GrantedAuthoritySid(
-				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL"))))
-			.isFalse();
+		assertTrue(acl.isSidLoaded(loadedSids));
+		assertTrue(acl.isSidLoaded(Arrays.asList(new GrantedAuthoritySid("ROLE_IGNORED"),
+				new PrincipalSid("ben"))));
+		assertTrue(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_IGNORED"))));
+		assertTrue(acl.isSidLoaded(BEN));
+		assertTrue(acl.isSidLoaded(null));
+		assertTrue(acl.isSidLoaded(new ArrayList<Sid>(0)));
+		assertTrue(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_IGNORED"))));
+		assertFalse(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_GENERAL"), new GrantedAuthoritySid("ROLE_IGNORED"))));
+		assertFalse(acl.isSidLoaded(Arrays.asList((Sid) new GrantedAuthoritySid(
+				"ROLE_IGNORED"), new GrantedAuthoritySid("ROLE_GENERAL"))));
 	}
 
 	@Test(expected = NotFoundException.class)
@@ -576,7 +558,7 @@ public class AclImplTests {
 		/*
 		 * Mock implementation that populates the aces list with fully initialized
 		 * AccessControlEntries
-		 *
+		 * 
 		 * @see
 		 * org.springframework.security.acls.MutableAclService#updateAcl(org.springframework
 		 * .security.acls.MutableAcl)

acl/src/test/java/org/springframework/security/acls/domain/AclImplementationSecurityCheckTests.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 
 import org.junit.*;
 import org.springframework.security.access.AccessDeniedException;
@@ -177,7 +162,7 @@ public class AclImplementationSecurityCheckTests {
 		try {
 			aclAuthorizationStrategy.securityCheck(aclFirstAllow,
 					AclAuthorizationStrategy.CHANGE_AUDITING);
-
+			assertTrue(true);
 		}
 		catch (AccessDeniedException notExpected) {
 			fail("It shouldn't have thrown AccessDeniedException");
@@ -192,13 +177,13 @@ public class AclImplementationSecurityCheckTests {
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 		// and still grant access for CHANGE_GENERAL
 		try {
 			aclAuthorizationStrategy.securityCheck(aclNoACE,
 					AclAuthorizationStrategy.CHANGE_GENERAL);
-
+			assertTrue(true);
 		}
 		catch (NotFoundException expected) {
 			fail("It shouldn't have thrown NotFoundException");
@@ -236,7 +221,7 @@ public class AclImplementationSecurityCheckTests {
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 
 		// Link the child with its parent and test again against the
@@ -246,7 +231,7 @@ public class AclImplementationSecurityCheckTests {
 		try {
 			aclAuthorizationStrategy.securityCheck(childAcl,
 					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-
+			assertTrue(true);
 		}
 		catch (NotFoundException expected) {
 			fail("It shouldn't have thrown NotFoundException");
@@ -265,7 +250,7 @@ public class AclImplementationSecurityCheckTests {
 		try {
 			aclAuthorizationStrategy.securityCheck(childAcl,
 					AclAuthorizationStrategy.CHANGE_OWNERSHIP);
-
+			assertTrue(true);
 		}
 		catch (NotFoundException expected) {
 			fail("It shouldn't have thrown NotFoundException");

acl/src/test/java/org/springframework/security/acls/domain/AuditLoggerTests.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import java.io.ByteArrayOutputStream;
@@ -61,14 +46,14 @@ public class AuditLoggerTests {
 	public void nonAuditableAceIsIgnored() {
 		AccessControlEntry ace = mock(AccessControlEntry.class);
 		logger.logIfNeeded(true, ace);
-		assertThat(bytes.size()).isZero();
+		assertEquals(0, bytes.size());
 	}
 
 	@Test
 	public void successIsNotLoggedIfAceDoesntRequireSuccessAudit() throws Exception {
 		when(ace.isAuditSuccess()).thenReturn(false);
 		logger.logIfNeeded(true, ace);
-		assertThat(bytes.size()).isZero();
+		assertEquals(0, bytes.size());
 	}
 
 	@Test
@@ -76,20 +61,20 @@ public class AuditLoggerTests {
 		when(ace.isAuditSuccess()).thenReturn(true);
 
 		logger.logIfNeeded(true, ace);
-		assertThat(bytes.toString()).startsWith("GRANTED due to ACE");
+		assertTrue(bytes.toString().startsWith("GRANTED due to ACE"));
 	}
 
 	@Test
 	public void failureIsntLoggedIfAceDoesntRequireFailureAudit() throws Exception {
 		when(ace.isAuditFailure()).thenReturn(false);
 		logger.logIfNeeded(false, ace);
-		assertThat(bytes.size()).isZero();
+		assertEquals(0, bytes.size());
 	}
 
 	@Test
 	public void failureIsLoggedIfAceRequiresFailureAudit() throws Exception {
 		when(ace.isAuditFailure()).thenReturn(true);
 		logger.logIfNeeded(false, ace);
-		assertThat(bytes.toString()).startsWith("DENIED due to ACE");
+		assertTrue(bytes.toString().startsWith("DENIED due to ACE"));
 	}
 }

acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityImplTests.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 
 import org.junit.Test;
 import org.springframework.security.acls.domain.IdentityUnavailableException;
@@ -81,8 +66,8 @@ public class ObjectIdentityImplTests {
 	@Test
 	public void gettersReturnExpectedValues() throws Exception {
 		ObjectIdentity obj = new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1));
-		assertThat(obj.getIdentifier()).isEqualTo(Long.valueOf(1));
-		assertThat(obj.getType()).isEqualTo(MockIdDomainObject.class.getName());
+		assertEquals(Long.valueOf(1), obj.getIdentifier());
+		assertEquals(MockIdDomainObject.class.getName(), obj.getType());
 	}
 
 	@Test
@@ -136,22 +121,23 @@ public class ObjectIdentityImplTests {
 		mockObj.setId(Long.valueOf(1));
 
 		String string = "SOME_STRING";
-		assertThat(string).isNotSameAs(obj);
-		assertThat(obj).isNotNull();
-		assertThat(obj).isNotEqualTo("DIFFERENT_OBJECT_TYPE");
-		assertThat(obj).isNotEqualTo(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2)));
-		assertThat(obj).isNotEqualTo(new ObjectIdentityImpl(
+		assertNotSame(obj, string);
+		assertFalse(obj.equals(null));
+		assertFalse(obj.equals("DIFFERENT_OBJECT_TYPE"));
+		assertFalse(obj.equals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(2))));
+		assertFalse(obj
+				.equals(new ObjectIdentityImpl(
 						"org.springframework.security.acls.domain.ObjectIdentityImplTests$MockOtherIdDomainObject",
-						Long.valueOf(1)));
-		assertThat(new ObjectIdentityImpl(DOMAIN_CLASS, 1L)).isEqualTo(obj);
-		assertThat(new ObjectIdentityImpl(mockObj)).isEqualTo(obj);
+						Long.valueOf(1))));
+		assertEquals(new ObjectIdentityImpl(DOMAIN_CLASS, Long.valueOf(1)), obj);
+		assertEquals(obj, new ObjectIdentityImpl(mockObj));
 	}
 
 	@Test
 	public void hashcodeIsDifferentForDifferentJavaTypes() throws Exception {
 		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, Long.valueOf(1));
 		ObjectIdentity obj2 = new ObjectIdentityImpl(String.class, Long.valueOf(1));
-		assertThat(obj.hashCode()).isNotEqualTo(obj2.hashCode());
+		assertFalse(obj.hashCode() == obj2.hashCode());
 	}
 
 	@Test
@@ -159,23 +145,23 @@ public class ObjectIdentityImplTests {
 		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, new Long(5));
 		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Integer.valueOf(5));
 
-		assertThat(obj2).isEqualTo(obj);
-		assertThat(obj2.hashCode()).isEqualTo(obj.hashCode());
+		assertEquals(obj, obj2);
+		assertEquals(obj.hashCode(), obj2.hashCode());
 	}
 
 	@Test
 	public void equalStringIdsAreEqualAndHaveSameHashcode() throws Exception {
 		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
 		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, "1000");
-		assertThat(obj2).isEqualTo(obj);
-		assertThat(obj2.hashCode()).isEqualTo(obj.hashCode());
+		assertEquals(obj, obj2);
+		assertEquals(obj.hashCode(), obj2.hashCode());
 	}
 
 	@Test
 	public void stringAndNumericIdsAreNotEqual() throws Exception {
 		ObjectIdentity obj = new ObjectIdentityImpl(Object.class, "1000");
 		ObjectIdentity obj2 = new ObjectIdentityImpl(Object.class, Long.valueOf(1000));
-		assertThat(obj).isNotEqualTo(obj2);
+		assertFalse(obj.equals(obj2));
 	}
 
 	// ~ Inner Classes

acl/src/test/java/org/springframework/security/acls/domain/ObjectIdentityRetrievalStrategyImplTests.java

@@ -1,36 +1,21 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
+import org.springframework.security.acls.domain.ObjectIdentityImpl;
+import org.springframework.security.acls.domain.ObjectIdentityRetrievalStrategyImpl;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.acls.model.ObjectIdentityRetrievalStrategy;
 
+import junit.framework.TestCase;
+
 /**
  * Tests for {@link ObjectIdentityRetrievalStrategyImpl}
  *
  * @author Andrei Stefan
  */
-public class ObjectIdentityRetrievalStrategyImplTests {
-
+public class ObjectIdentityRetrievalStrategyImplTests extends TestCase {
 	// ~ Methods
 	// ========================================================================================================
-	@Test
+
 	public void testObjectIdentityCreation() throws Exception {
 		MockIdDomainObject domain = new MockIdDomainObject();
 		domain.setId(Integer.valueOf(1));
@@ -38,15 +23,14 @@ public class ObjectIdentityRetrievalStrategyImplTests {
 		ObjectIdentityRetrievalStrategy retStrategy = new ObjectIdentityRetrievalStrategyImpl();
 		ObjectIdentity identity = retStrategy.getObjectIdentity(domain);
 
-		assertThat(identity).isNotNull();
-		assertThat(new ObjectIdentityImpl(domain)).isEqualTo(identity);
+		assertNotNull(identity);
+		assertEquals(identity, new ObjectIdentityImpl(domain));
 	}
 
 	// ~ Inner Classes
 	// ==================================================================================================
 	@SuppressWarnings("unused")
 	private class MockIdDomainObject {
-
 		private Object id;
 
 		public Object getId() {

acl/src/test/java/org/springframework/security/acls/domain/PermissionTests.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +14,7 @@
  */
 package org.springframework.security.acls.domain;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -38,60 +37,82 @@ public class PermissionTests {
 	@Test
 	public void basePermissionTest() {
 		Permission p = permissionFactory.buildFromName("WRITE");
-		assertThat(p).isNotNull();
+		assertNotNull(p);
 	}
 
 	@Test
 	public void expectedIntegerValues() {
-		assertThat(BasePermission.READ.getMask()).isEqualTo(1);
-		assertThat(BasePermission.ADMINISTRATION.getMask()).isEqualTo(16);
-		assertThat(
+		assertEquals(1, BasePermission.READ.getMask());
+		assertEquals(16, BasePermission.ADMINISTRATION.getMask());
+		assertEquals(
+				7,
 				new CumulativePermission().set(BasePermission.READ)
-						.set(BasePermission.WRITE).set(BasePermission.CREATE).getMask())
-				.isEqualTo(7);
-		assertThat(
+						.set(BasePermission.WRITE).set(BasePermission.CREATE).getMask());
+		assertEquals(
+				17,
 				new CumulativePermission().set(BasePermission.READ)
-						.set(BasePermission.ADMINISTRATION).getMask())
-			.isEqualTo(17);
+						.set(BasePermission.ADMINISTRATION).getMask());
 	}
 
 	@Test
 	public void fromInteger() {
 		Permission permission = permissionFactory.buildFromMask(7);
+		System.out.println("7 =  " + permission.toString());
 		permission = permissionFactory.buildFromMask(4);
+		System.out.println("4 =  " + permission.toString());
 	}
 
 	@Test
 	public void stringConversion() {
 		permissionFactory.registerPublicPermissions(SpecialPermission.class);
 
-		assertThat(BasePermission.READ.toString())
-			.isEqualTo("BasePermission[...............................R=1]");
+		System.out.println("R =  " + BasePermission.READ.toString());
+		assertEquals("BasePermission[...............................R=1]",
+				BasePermission.READ.toString());
 
-		assertThat(
-				BasePermission.ADMINISTRATION.toString())
-			.isEqualTo("BasePermission[...........................A....=16]");
+		System.out.println("A =  " + BasePermission.ADMINISTRATION.toString());
+		assertEquals("BasePermission[...........................A....=16]",
+				BasePermission.ADMINISTRATION.toString());
 
-		assertThat(
-				new CumulativePermission().set(BasePermission.READ).toString())
-			.isEqualTo("CumulativePermission[...............................R=1]");
+		System.out.println("R =  "
+				+ new CumulativePermission().set(BasePermission.READ).toString());
+		assertEquals("CumulativePermission[...............................R=1]",
+				new CumulativePermission().set(BasePermission.READ).toString());
 
-		assertThat(new CumulativePermission().set(SpecialPermission.ENTER)
-						.set(BasePermission.ADMINISTRATION).toString())
-			.isEqualTo("CumulativePermission[..........................EA....=48]");
+		System.out.println("A =  "
+				+ new CumulativePermission().set(SpecialPermission.ENTER)
+						.set(BasePermission.ADMINISTRATION).toString());
+		assertEquals(
+				"CumulativePermission[..........................EA....=48]",
+				new CumulativePermission().set(SpecialPermission.ENTER)
+						.set(BasePermission.ADMINISTRATION).toString());
 
-		assertThat(new CumulativePermission().set(BasePermission.ADMINISTRATION)
-						.set(BasePermission.READ).toString())
-			.isEqualTo("CumulativePermission[...........................A...R=17]");
+		System.out.println("RA = "
+				+ new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).toString());
+		assertEquals(
+				"CumulativePermission[...........................A...R=17]",
+				new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).toString());
 
-		assertThat(new CumulativePermission().set(BasePermission.ADMINISTRATION)
+		System.out.println("R =  "
+				+ new CumulativePermission().set(BasePermission.ADMINISTRATION)
 						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
-						.toString())
-			.isEqualTo("CumulativePermission[...............................R=1]");
-
-		assertThat(new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.toString());
+		assertEquals(
+				"CumulativePermission[...............................R=1]",
+				new CumulativePermission().set(BasePermission.ADMINISTRATION)
 						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
-						.clear(BasePermission.READ).toString())
-			.isEqualTo("CumulativePermission[................................=0]");
+						.toString());
+
+		System.out.println("0 =  "
+				+ new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
+						.clear(BasePermission.READ).toString());
+		assertEquals(
+				"CumulativePermission[................................=0]",
+				new CumulativePermission().set(BasePermission.ADMINISTRATION)
+						.set(BasePermission.READ).clear(BasePermission.ADMINISTRATION)
+						.clear(BasePermission.READ).toString());
 	}
 }

acl/src/test/java/org/springframework/security/acls/domain/SpecialPermission.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/test/java/org/springframework/security/acls/jdbc/BasicLookupStrategyTests.java

@@ -1,22 +1,6 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.jdbc;
 
-import static org.assertj.core.api.Assertions.*;
-
+import junit.framework.Assert;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;
@@ -61,12 +45,14 @@ public class BasicLookupStrategyTests {
 	@BeforeClass
 	public static void initCacheManaer() {
 		cacheManager = CacheManager.create();
-		cacheManager.addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30));
+		cacheManager
+				.addCache(new Cache("basiclookuptestcache", 500, false, false, 30, 30));
 	}
 
 	@BeforeClass
 	public static void createDatabase() throws Exception {
-		dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:lookupstrategytest", "sa", "", true);
+		dataSource = new SingleConnectionDataSource("jdbc:hsqldb:mem:lookupstrategytest",
+				"sa", "", true);
 		dataSource.setDriverClassName("org.hsqldb.jdbcDriver");
 		jdbcTemplate = new JdbcTemplate(dataSource);
 
@@ -89,7 +75,9 @@ public class BasicLookupStrategyTests {
 	@Before
 	public void populateDatabase() {
 		String query = "INSERT INTO acl_sid(ID,PRINCIPAL,SID) VALUES (1,1,'ben');"
-				+ "INSERT INTO acl_class(ID,CLASS) VALUES (2,'" + TARGET_CLASS + "');"
+				+ "INSERT INTO acl_class(ID,CLASS) VALUES (2,'"
+				+ TARGET_CLASS
+				+ "');"
 				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (1,2,100,null,1,1);"
 				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (2,2,101,1,1,1);"
 				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (3,2,102,2,1,1);"
@@ -114,10 +102,14 @@ public class BasicLookupStrategyTests {
 
 	@After
 	public void emptyDatabase() {
-		String query = "DELETE FROM acl_entry;" + "DELETE FROM acl_object_identity WHERE ID = 7;"
-				+ "DELETE FROM acl_object_identity WHERE ID = 6;" + "DELETE FROM acl_object_identity WHERE ID = 5;"
-				+ "DELETE FROM acl_object_identity WHERE ID = 4;" + "DELETE FROM acl_object_identity WHERE ID = 3;"
-				+ "DELETE FROM acl_object_identity WHERE ID = 2;" + "DELETE FROM acl_object_identity WHERE ID = 1;"
+		String query = "DELETE FROM acl_entry;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 7;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 6;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 5;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 4;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 3;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 2;"
+				+ "DELETE FROM acl_object_identity WHERE ID = 1;"
 				+ "DELETE FROM acl_class;" + "DELETE FROM acl_sid;";
 		jdbcTemplate.execute(query);
 	}
@@ -131,29 +123,33 @@ public class BasicLookupStrategyTests {
 	@Test
 	public void testAclsRetrievalWithDefaultBatchSize() throws Exception {
 		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101));
-		// Deliberately use an integer for the child, to reproduce bug report in
-		// SEC-819
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(102));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(
+				101));
+		// Deliberately use an integer for the child, to reproduce bug report in SEC-819
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(102));
 
-		Map<ObjectIdentity, Acl> map = this.strategy
-				.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(topParentOid, middleParentOid, childOid), null);
 		checkEntries(topParentOid, middleParentOid, childOid, map);
 	}
 
 	@Test
 	public void testAclsRetrievalFromCacheOnly() throws Exception {
-		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(100));
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(101));
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(
+				101));
 		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
 
 		// Objects were put in cache
-		strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		strategy.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid),
+				null);
 
 		// Let's empty the database to force acls retrieval from cache
 		emptyDatabase();
-		Map<ObjectIdentity, Acl> map = this.strategy
-				.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(topParentOid, middleParentOid, childOid), null);
 
 		checkEntries(topParentOid, middleParentOid, childOid, map);
 	}
@@ -161,83 +157,99 @@ public class BasicLookupStrategyTests {
 	@Test
 	public void testAclsRetrievalWithCustomBatchSize() throws Exception {
 		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(100));
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(101));
 		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(102));
 
-		// Set a batch size to allow multiple database queries in order to
-		// retrieve all
+		// Set a batch size to allow multiple database queries in order to retrieve all
 		// acls
 		this.strategy.setBatchSize(1);
-		Map<ObjectIdentity, Acl> map = this.strategy
-				.readAclsById(Arrays.asList(topParentOid, middleParentOid, childOid), null);
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(topParentOid, middleParentOid, childOid), null);
 		checkEntries(topParentOid, middleParentOid, childOid, map);
 	}
 
-	private void checkEntries(ObjectIdentity topParentOid, ObjectIdentity middleParentOid, ObjectIdentity childOid,
+	private void checkEntries(ObjectIdentity topParentOid,
+			ObjectIdentity middleParentOid, ObjectIdentity childOid,
 			Map<ObjectIdentity, Acl> map) throws Exception {
-		assertThat(map).hasSize(3);
+		Assert.assertEquals(3, map.size());
 
 		MutableAcl topParent = (MutableAcl) map.get(topParentOid);
 		MutableAcl middleParent = (MutableAcl) map.get(middleParentOid);
 		MutableAcl child = (MutableAcl) map.get(childOid);
 
 		// Check the retrieved versions has IDs
-		assertThat(topParent.getId()).isNotNull();
-		assertThat(middleParent.getId()).isNotNull();
-		assertThat(child.getId()).isNotNull();
+		Assert.assertNotNull(topParent.getId());
+		Assert.assertNotNull(middleParent.getId());
+		Assert.assertNotNull(child.getId());
 
 		// Check their parents were correctly retrieved
-		assertThat(topParent.getParentAcl()).isNull();
-		assertThat(middleParent.getParentAcl().getObjectIdentity()).isEqualTo(topParentOid);
-		assertThat(child.getParentAcl().getObjectIdentity()).isEqualTo(middleParentOid);
+		Assert.assertNull(topParent.getParentAcl());
+		Assert.assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity());
+		Assert.assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity());
 
 		// Check their ACEs were correctly retrieved
-		assertThat(topParent.getEntries()).hasSize(2);
-		assertThat(middleParent.getEntries()).hasSize(1);
-		assertThat(child.getEntries()).hasSize(1);
+		Assert.assertEquals(2, topParent.getEntries().size());
+		Assert.assertEquals(1, middleParent.getEntries().size());
+		Assert.assertEquals(1, child.getEntries().size());
 
 		// Check object identities were correctly retrieved
-		assertThat(topParent.getObjectIdentity()).isEqualTo(topParentOid);
-		assertThat(middleParent.getObjectIdentity()).isEqualTo(middleParentOid);
-		assertThat(child.getObjectIdentity()).isEqualTo(childOid);
+		Assert.assertEquals(topParentOid, topParent.getObjectIdentity());
+		Assert.assertEquals(middleParentOid, middleParent.getObjectIdentity());
+		Assert.assertEquals(childOid, child.getObjectIdentity());
 
 		// Check each entry
-		assertThat(topParent.isEntriesInheriting()).isTrue();
-		assertThat(Long.valueOf(1)).isEqualTo(topParent.getId());
-		assertThat(new PrincipalSid("ben")).isEqualTo(topParent.getOwner());
-		assertThat(Long.valueOf(1)).isEqualTo(topParent.getEntries().get(0).getId());
-		assertThat(topParent.getEntries().get(0).getPermission()).isEqualTo(BasePermission.READ);
-		assertThat(topParent.getEntries().get(0).getSid()).isEqualTo(new PrincipalSid("ben"));
-		assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(0)).isAuditFailure()).isFalse();
-		assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(0)).isAuditSuccess()).isFalse();
-		assertThat((topParent.getEntries().get(0)).isGranting()).isTrue();
+		Assert.assertTrue(topParent.isEntriesInheriting());
+		Assert.assertEquals(topParent.getId(), Long.valueOf(1));
+		Assert.assertEquals(topParent.getOwner(), new PrincipalSid("ben"));
+		Assert.assertEquals(topParent.getEntries().get(0).getId(), Long.valueOf(1));
+		Assert.assertEquals(topParent.getEntries().get(0).getPermission(),
+				BasePermission.READ);
+		Assert.assertEquals(topParent.getEntries().get(0).getSid(), new PrincipalSid(
+				"ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0))
+				.isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(0))
+				.isAuditSuccess());
+		Assert.assertTrue((topParent.getEntries().get(0)).isGranting());
 
-		assertThat(Long.valueOf(2)).isEqualTo(topParent.getEntries().get(1).getId());
-		assertThat(topParent.getEntries().get(1).getPermission()).isEqualTo(BasePermission.WRITE);
-		assertThat(topParent.getEntries().get(1).getSid()).isEqualTo(new PrincipalSid("ben"));
-		assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(1)).isAuditFailure()).isFalse();
-		assertThat(((AuditableAccessControlEntry) topParent.getEntries().get(1)).isAuditSuccess()).isFalse();
-		assertThat(topParent.getEntries().get(1).isGranting()).isFalse();
+		Assert.assertEquals(topParent.getEntries().get(1).getId(), Long.valueOf(2));
+		Assert.assertEquals(topParent.getEntries().get(1).getPermission(),
+				BasePermission.WRITE);
+		Assert.assertEquals(topParent.getEntries().get(1).getSid(), new PrincipalSid(
+				"ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1))
+				.isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) topParent.getEntries().get(1))
+				.isAuditSuccess());
+		Assert.assertFalse(topParent.getEntries().get(1).isGranting());
 
-		assertThat(middleParent.isEntriesInheriting()).isTrue();
-		assertThat(Long.valueOf(2)).isEqualTo(middleParent.getId());
-		assertThat(new PrincipalSid("ben")).isEqualTo(middleParent.getOwner());
-		assertThat(Long.valueOf(3)).isEqualTo(middleParent.getEntries().get(0).getId());
-		assertThat(middleParent.getEntries().get(0).getPermission()).isEqualTo(BasePermission.DELETE);
-		assertThat(middleParent.getEntries().get(0).getSid()).isEqualTo(new PrincipalSid("ben"));
-		assertThat(((AuditableAccessControlEntry) middleParent.getEntries().get(0)).isAuditFailure()).isFalse();
-		assertThat(((AuditableAccessControlEntry) middleParent.getEntries().get(0)).isAuditSuccess()).isFalse();
-		assertThat(middleParent.getEntries().get(0).isGranting()).isTrue();
+		Assert.assertTrue(middleParent.isEntriesInheriting());
+		Assert.assertEquals(middleParent.getId(), Long.valueOf(2));
+		Assert.assertEquals(middleParent.getOwner(), new PrincipalSid("ben"));
+		Assert.assertEquals(middleParent.getEntries().get(0).getId(), Long.valueOf(3));
+		Assert.assertEquals(middleParent.getEntries().get(0).getPermission(),
+				BasePermission.DELETE);
+		Assert.assertEquals(middleParent.getEntries().get(0).getSid(), new PrincipalSid(
+				"ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries()
+				.get(0)).isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) middleParent.getEntries()
+				.get(0)).isAuditSuccess());
+		Assert.assertTrue(middleParent.getEntries().get(0).isGranting());
 
-		assertThat(child.isEntriesInheriting()).isTrue();
-		assertThat(Long.valueOf(3)).isEqualTo(child.getId());
-		assertThat(new PrincipalSid("ben")).isEqualTo(child.getOwner());
-		assertThat(Long.valueOf(4)).isEqualTo(child.getEntries().get(0).getId());
-		assertThat(child.getEntries().get(0).getPermission()).isEqualTo(BasePermission.DELETE);
-		assertThat(new PrincipalSid("ben")).isEqualTo(child.getEntries().get(0).getSid());
-		assertThat(((AuditableAccessControlEntry) child.getEntries().get(0)).isAuditFailure()).isFalse();
-		assertThat(((AuditableAccessControlEntry) child.getEntries().get(0)).isAuditSuccess()).isFalse();
-		assertThat((child.getEntries().get(0)).isGranting()).isFalse();
+		Assert.assertTrue(child.isEntriesInheriting());
+		Assert.assertEquals(child.getId(), Long.valueOf(3));
+		Assert.assertEquals(child.getOwner(), new PrincipalSid("ben"));
+		Assert.assertEquals(child.getEntries().get(0).getId(), Long.valueOf(4));
+		Assert.assertEquals(child.getEntries().get(0).getPermission(),
+				BasePermission.DELETE);
+		Assert.assertEquals(child.getEntries().get(0).getSid(), new PrincipalSid("ben"));
+		Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0))
+				.isAuditFailure());
+		Assert.assertFalse(((AuditableAccessControlEntry) child.getEntries().get(0))
+				.isAuditSuccess());
+		Assert.assertFalse((child.getEntries().get(0)).isGranting());
 	}
 
 	@Test
@@ -245,31 +257,36 @@ public class BasicLookupStrategyTests {
 		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,103,1,1,1);";
 		jdbcTemplate.execute(query);
 
-		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(100));
-		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
+		ObjectIdentity topParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(100));
+		ObjectIdentity middleParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(101));
 		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102));
-		ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(103));
+		ObjectIdentity middleParent2Oid = new ObjectIdentityImpl(TARGET_CLASS,
+				Long.valueOf(103));
 
 		// Retrieve the child
-		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(Arrays.asList(childOid), null);
+		Map<ObjectIdentity, Acl> map = this.strategy.readAclsById(
+				Arrays.asList(childOid), null);
 
 		// Check that the child and all its parents were retrieved
-		assertThat(map.get(childOid)).isNotNull();
-		assertThat(map.get(childOid).getObjectIdentity()).isEqualTo(childOid);
-		assertThat(map.get(middleParentOid)).isNotNull();
-		assertThat(map.get(middleParentOid).getObjectIdentity()).isEqualTo(middleParentOid);
-		assertThat(map.get(topParentOid)).isNotNull();
-		assertThat(map.get(topParentOid).getObjectIdentity()).isEqualTo(topParentOid);
+		Assert.assertNotNull(map.get(childOid));
+		Assert.assertEquals(childOid, map.get(childOid).getObjectIdentity());
+		Assert.assertNotNull(map.get(middleParentOid));
+		Assert.assertEquals(middleParentOid, map.get(middleParentOid).getObjectIdentity());
+		Assert.assertNotNull(map.get(topParentOid));
+		Assert.assertEquals(topParentOid, map.get(topParentOid).getObjectIdentity());
 
 		// The second parent shouldn't have been retrieved
-		assertThat(map.get(middleParent2Oid)).isNull();
+		Assert.assertNull(map.get(middleParent2Oid));
 	}
 
 	/**
 	 * Test created from SEC-590.
 	 */
 	@Test
-	public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached() throws Exception {
+	public void testReadAllObjectIdentitiesWhenLastElementIsAlreadyCached()
+			throws Exception {
 		String query = "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (4,2,104,null,1,1);"
 				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (5,2,105,4,1,1);"
 				+ "INSERT INTO acl_object_identity(ID,OBJECT_ID_CLASS,OBJECT_ID_IDENTITY,PARENT_OBJECT,OWNER_SID,ENTRIES_INHERITING) VALUES (6,2,106,4,1,1);"
@@ -277,13 +294,15 @@ public class BasicLookupStrategyTests {
 				+ "INSERT INTO acl_entry(ID,ACL_OBJECT_IDENTITY,ACE_ORDER,SID,MASK,GRANTING,AUDIT_SUCCESS,AUDIT_FAILURE) VALUES (5,4,0,1,1,1,0,0)";
 		jdbcTemplate.execute(query);
 
-		ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS, new Long(104));
+		ObjectIdentity grandParentOid = new ObjectIdentityImpl(TARGET_CLASS,
+				new Long(104));
 		ObjectIdentity parent1Oid = new ObjectIdentityImpl(TARGET_CLASS, new Long(105));
-		ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(106));
-		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(107));
+		ObjectIdentity parent2Oid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(106));
+		ObjectIdentity childOid = new ObjectIdentityImpl(TARGET_CLASS,
+				Integer.valueOf(107));
 
-		// First lookup only child, thus populating the cache with grandParent,
-		// parent1
+		// First lookup only child, thus populating the cache with grandParent, parent1
 		// and child
 		List<Permission> checkPermission = Arrays.asList(BasePermission.READ);
 		List<Sid> sids = Arrays.asList(BEN_SID);
@@ -293,25 +312,25 @@ public class BasicLookupStrategyTests {
 		Map<ObjectIdentity, Acl> foundAcls = strategy.readAclsById(childOids, sids);
 
 		Acl foundChildAcl = foundAcls.get(childOid);
-		assertThat(foundChildAcl).isNotNull();
-		assertThat(foundChildAcl.isGranted(checkPermission, sids, false)).isTrue();
+		Assert.assertNotNull(foundChildAcl);
+		Assert.assertTrue(foundChildAcl.isGranted(checkPermission, sids, false));
 
-		// Search for object identities has to be done in the following order:
-		// last
+		// Search for object identities has to be done in the following order: last
 		// element have to be one which
-		// is already in cache and the element before it must not be stored in
-		// cache
-		List<ObjectIdentity> allOids = Arrays.asList(grandParentOid, parent1Oid, parent2Oid, childOid);
+		// is already in cache and the element before it must not be stored in cache
+		List<ObjectIdentity> allOids = Arrays.asList(grandParentOid, parent1Oid,
+				parent2Oid, childOid);
 		try {
 			foundAcls = strategy.readAclsById(allOids, sids);
-
-		} catch (NotFoundException notExpected) {
-			fail("It shouldn't have thrown NotFoundException");
+			Assert.assertTrue(true);
+		}
+		catch (NotFoundException notExpected) {
+			Assert.fail("It shouldn't have thrown NotFoundException");
 		}
 
 		Acl foundParent2Acl = foundAcls.get(parent2Oid);
-		assertThat(foundParent2Acl).isNotNull();
-		assertThat(foundParent2Acl.isGranted(checkPermission, sids, false)).isTrue();
+		Assert.assertNotNull(foundParent2Acl);
+		Assert.assertTrue(foundParent2Acl.isGranted(checkPermission, sids, false));
 	}
 
 	@Test(expected = IllegalArgumentException.class)
@@ -329,16 +348,16 @@ public class BasicLookupStrategyTests {
 	public void testCreatePrincipalSid() {
 		Sid result = strategy.createSid(true, "sid");
 
-		assertThat(result.getClass()).isEqualTo(PrincipalSid.class);
-		assertThat(((PrincipalSid) result).getPrincipal()).isEqualTo("sid");
+		Assert.assertEquals(PrincipalSid.class, result.getClass());
+		Assert.assertEquals("sid", ((PrincipalSid) result).getPrincipal());
 	}
 
 	@Test
 	public void testCreateGrantedAuthority() {
 		Sid result = strategy.createSid(false, "sid");
 
-		assertThat(result.getClass()).isEqualTo(GrantedAuthoritySid.class);
-		assertThat(((GrantedAuthoritySid) result).getGrantedAuthority()).isEqualTo("sid");
+		Assert.assertEquals(GrantedAuthoritySid.class, result.getClass());
+		Assert.assertEquals("sid", ((GrantedAuthoritySid) result).getGrantedAuthority());
 	}
 
 }

acl/src/test/java/org/springframework/security/acls/jdbc/DatabaseSeeder.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,

acl/src/test/java/org/springframework/security/acls/jdbc/EhCacheBasedAclCacheTests.java

@@ -1,22 +1,9 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.jdbc;
 
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
+import static org.fest.assertions.Assertions.*;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -25,12 +12,17 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
+import net.sf.ehcache.Cache;
+import net.sf.ehcache.CacheManager;
 import net.sf.ehcache.Ehcache;
 import net.sf.ehcache.Element;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
@@ -42,10 +34,12 @@ import org.springframework.security.acls.model.MutableAcl;
 import org.springframework.security.acls.model.ObjectIdentity;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.util.FieldUtils;
 import org.springframework.test.util.ReflectionTestUtils;
+import org.springframework.util.ReflectionUtils;
 
 /**
  * Tests {@link EhCacheBasedAclCache}
@@ -100,6 +94,7 @@ public class EhCacheBasedAclCacheTests {
 			fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			assertTrue(true);
 		}
 
 		try {
@@ -108,6 +103,7 @@ public class EhCacheBasedAclCacheTests {
 			fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			assertTrue(true);
 		}
 
 		try {
@@ -116,6 +112,7 @@ public class EhCacheBasedAclCacheTests {
 			fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			assertTrue(true);
 		}
 
 		try {
@@ -124,6 +121,7 @@ public class EhCacheBasedAclCacheTests {
 			fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			assertTrue(true);
 		}
 
 		try {
@@ -132,6 +130,7 @@ public class EhCacheBasedAclCacheTests {
 			fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			assertTrue(true);
 		}
 	}
 
@@ -150,15 +149,15 @@ public class EhCacheBasedAclCacheTests {
 		MutableAcl retrieved = (MutableAcl) ois.readObject();
 		ois.close();
 
-		assertThat(retrieved).isEqualTo(acl);
+		assertEquals(acl, retrieved);
 
 		Object retrieved1 = FieldUtils.getProtectedFieldValue("aclAuthorizationStrategy",
 				retrieved);
-		assertThat(retrieved1).isEqualTo(null);
+		assertEquals(null, retrieved1);
 
 		Object retrieved2 = FieldUtils.getProtectedFieldValue(
 				"permissionGrantingStrategy", retrieved);
-		assertThat(retrieved2).isEqualTo(null);
+		assertEquals(null, retrieved2);
 	}
 
 	@Test

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcAclServiceTests.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.jdbc;
 
 import static org.mockito.Matchers.anyListOf;

acl/src/test/java/org/springframework/security/acls/jdbc/JdbcMutableAclServiceTests.java

@@ -1,11 +1,10 @@
-/*
- * Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
+/* Copyright 2004, 2005, 2006 Acegi Technology Pty Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -15,7 +14,7 @@
  */
 package org.springframework.security.acls.jdbc;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
@@ -148,7 +147,7 @@ public class JdbcMutableAclServiceTests extends
 		// Let's check if we can read them back correctly
 		Map<ObjectIdentity, Acl> map = jdbcMutableAclService.readAclsById(Arrays.asList(
 				topParentOid, middleParentOid, childOid));
-		assertThat(map).hasSize(3);
+		assertEquals(3, map.size());
 
 		// Replace our current objects with their retrieved versions
 		topParent = (MutableAcl) map.get(topParentOid);
@@ -156,19 +155,19 @@ public class JdbcMutableAclServiceTests extends
 		child = (MutableAcl) map.get(childOid);
 
 		// Check the retrieved versions has IDs
-		assertThat(topParent.getId()).isNotNull();
-		assertThat(middleParent.getId()).isNotNull();
-		assertThat(child.getId()).isNotNull();
+		assertNotNull(topParent.getId());
+		assertNotNull(middleParent.getId());
+		assertNotNull(child.getId());
 
 		// Check their parents were correctly persisted
-		assertThat(topParent.getParentAcl()).isNull();
-		assertThat(middleParent.getParentAcl().getObjectIdentity()).isEqualTo(topParentOid);
-		assertThat(child.getParentAcl().getObjectIdentity()).isEqualTo(middleParentOid);
+		assertNull(topParent.getParentAcl());
+		assertEquals(topParentOid, middleParent.getParentAcl().getObjectIdentity());
+		assertEquals(middleParentOid, child.getParentAcl().getObjectIdentity());
 
 		// Check their ACEs were correctly persisted
-		assertThat(topParent.getEntries()).hasSize(2);
-		assertThat(middleParent.getEntries()).hasSize(1);
-		assertThat(child.getEntries()).hasSize(1);
+		assertEquals(2, topParent.getEntries().size());
+		assertEquals(1, middleParent.getEntries().size());
+		assertEquals(1, child.getEntries().size());
 
 		// Check the retrieved rights are correct
 		List<Permission> read = Arrays.asList(BasePermission.READ);
@@ -176,39 +175,39 @@ public class JdbcMutableAclServiceTests extends
 		List<Permission> delete = Arrays.asList(BasePermission.DELETE);
 		List<Sid> pSid = Arrays.asList((Sid) new PrincipalSid(auth));
 
-		assertThat(topParent.isGranted(read, pSid, false)).isTrue();
-		assertThat(topParent.isGranted(write, pSid, false)).isFalse();
-		assertThat(middleParent.isGranted(delete, pSid, false)).isTrue();
-		assertThat(child.isGranted(delete, pSid, false)).isFalse();
+		assertTrue(topParent.isGranted(read, pSid, false));
+		assertFalse(topParent.isGranted(write, pSid, false));
+		assertTrue(middleParent.isGranted(delete, pSid, false));
+		assertFalse(child.isGranted(delete, pSid, false));
 
 		try {
 			child.isGranted(Arrays.asList(BasePermission.ADMINISTRATION), pSid, false);
 			fail("Should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 
 		// Now check the inherited rights (when not explicitly overridden) also look OK
-		assertThat(child.isGranted(read, pSid, false)).isTrue();
-		assertThat(child.isGranted(write, pSid, false)).isFalse();
-		assertThat(child.isGranted(delete, pSid, false)).isFalse();
+		assertTrue(child.isGranted(read, pSid, false));
+		assertFalse(child.isGranted(write, pSid, false));
+		assertFalse(child.isGranted(delete, pSid, false));
 
 		// Next change the child so it doesn't inherit permissions from above
 		child.setEntriesInheriting(false);
 		jdbcMutableAclService.updateAcl(child);
 		child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
-		assertThat(child.isEntriesInheriting()).isFalse();
+		assertFalse(child.isEntriesInheriting());
 
 		// Check the child permissions no longer inherit
-		assertThat(child.isGranted(delete, pSid, true)).isFalse();
+		assertFalse(child.isGranted(delete, pSid, true));
 
 		try {
 			child.isGranted(read, pSid, true);
 			fail("Should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 
 		try {
@@ -216,7 +215,7 @@ public class JdbcMutableAclServiceTests extends
 			fail("Should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 
 		// Let's add an identical permission to the child, but it'll appear AFTER the
@@ -229,7 +228,7 @@ public class JdbcMutableAclServiceTests extends
 		// Save the changed child
 		jdbcMutableAclService.updateAcl(child);
 		child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
-		assertThat(child.getEntries()).hasSize(3);
+		assertEquals(3, child.getEntries().size());
 
 		// Output permissions
 		for (int i = 0; i < child.getEntries().size(); i++) {
@@ -237,25 +236,25 @@ public class JdbcMutableAclServiceTests extends
 		}
 
 		// Check the permissions are as they should be
-		assertThat(child.isGranted(delete, pSid, true)).isFalse(); // as earlier permission
+		assertFalse(child.isGranted(delete, pSid, true)); // as earlier permission
 															// overrode
-		assertThat(child.isGranted(Arrays.asList(BasePermission.CREATE), pSid, true)).isTrue();
+		assertTrue(child.isGranted(Arrays.asList(BasePermission.CREATE), pSid, true));
 
 		// Now check the first ACE (index 0) really is DELETE for our Sid and is
 		// non-granting
 		AccessControlEntry entry = child.getEntries().get(0);
-		assertThat(entry.getPermission().getMask()).isEqualTo(BasePermission.DELETE.getMask());
-		assertThat(entry.getSid()).isEqualTo(new PrincipalSid(auth));
-		assertThat(entry.isGranting()).isFalse();
-		assertThat(entry.getId()).isNotNull();
+		assertEquals(BasePermission.DELETE.getMask(), entry.getPermission().getMask());
+		assertEquals(new PrincipalSid(auth), entry.getSid());
+		assertFalse(entry.isGranting());
+		assertNotNull(entry.getId());
 
 		// Now delete that first ACE
 		child.deleteAce(0);
 
 		// Save and check it worked
 		child = jdbcMutableAclService.updateAcl(child);
-		assertThat(child.getEntries()).hasSize(2);
-		assertThat(child.isGranted(delete, pSid, false)).isTrue();
+		assertEquals(2, child.getEntries().size());
+		assertTrue(child.isGranted(delete, pSid, false));
 
 		SecurityContextHolder.clearContext();
 	}
@@ -277,7 +276,7 @@ public class JdbcMutableAclServiceTests extends
 		// Check the childOid really is a child of middleParentOid
 		Acl childAcl = jdbcMutableAclService.readAclById(childOid);
 
-		assertThat(childAcl.getParentAcl().getObjectIdentity()).isEqualTo(middleParentOid);
+		assertEquals(middleParentOid, childAcl.getParentAcl().getObjectIdentity());
 
 		// Delete the mid-parent and test if the child was deleted, as well
 		jdbcMutableAclService.deleteAcl(middleParentOid, true);
@@ -287,19 +286,19 @@ public class JdbcMutableAclServiceTests extends
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 		try {
 			jdbcMutableAclService.readAclById(childOid);
 			fail("It should have thrown NotFoundException");
 		}
 		catch (NotFoundException expected) {
-
+			assertTrue(true);
 		}
 
 		Acl acl = jdbcMutableAclService.readAclById(topParentOid);
-		assertThat(acl).isNotNull();
-		assertThat(topParentOid).isEqualTo(((MutableAcl) acl).getObjectIdentity());
+		assertNotNull(acl);
+		assertEquals(((MutableAcl) acl).getObjectIdentity(), topParentOid);
 	}
 
 	@Test
@@ -399,16 +398,17 @@ public class JdbcMutableAclServiceTests extends
 
 		// Remove the child and check all related database rows were removed accordingly
 		jdbcMutableAclService.deleteAcl(childOid, false);
-		assertThat(
+		assertEquals(
+				1,
 				jdbcTemplate.queryForList(SELECT_ALL_CLASSES,
-						new Object[] { TARGET_CLASS })).hasSize(1);
-		assertThat(jdbcTemplate.queryForList("select * from acl_object_identity")
-				).isEmpty();
-		assertThat(jdbcTemplate.queryForList("select * from acl_entry")).isEmpty();
+						new Object[] { TARGET_CLASS }).size());
+		assertEquals(0, jdbcTemplate.queryForList("select * from acl_object_identity")
+				.size());
+		assertEquals(0, jdbcTemplate.queryForList("select * from acl_entry").size());
 
 		// Check the cache
-		assertThat(aclCache.getFromCache(childOid)).isNull();
-		assertThat(aclCache.getFromCache(Long.valueOf(102))).isNull();
+		assertNull(aclCache.getFromCache(childOid));
+		assertNull(aclCache.getFromCache(Long.valueOf(102)));
 	}
 
 	/** SEC-1107 */
@@ -419,8 +419,8 @@ public class JdbcMutableAclServiceTests extends
 		ObjectIdentity oid = new ObjectIdentityImpl(TARGET_CLASS, Integer.valueOf(101));
 		jdbcMutableAclService.createAcl(oid);
 
-		assertThat(jdbcMutableAclService.readAclById(new ObjectIdentityImpl(
-				TARGET_CLASS, Long.valueOf(101)))).isNotNull();
+		assertNotNull(jdbcMutableAclService.readAclById(new ObjectIdentityImpl(
+				TARGET_CLASS, Long.valueOf(101))));
 	}
 
 	/**
@@ -454,11 +454,12 @@ public class JdbcMutableAclServiceTests extends
 		child = (MutableAcl) jdbcMutableAclService.readAclById(childOid);
 		parent = (MutableAcl) child.getParentAcl();
 
-		assertThat(parent.getEntries()).hasSize(2).withFailMessage("Fails because child has a stale reference to its parent");
-		assertThat(parent.getEntries().get(0).getPermission().getMask()).isEqualTo(1);
-		assertThat(parent.getEntries().get(0).getSid()).isEqualTo(new PrincipalSid("ben"));
-		assertThat(parent.getEntries().get(1).getPermission().getMask()).isEqualTo(1);
-		assertThat(parent.getEntries().get(1).getSid()).isEqualTo(new PrincipalSid("scott"));
+		assertEquals("Fails because child has a stale reference to its parent", 2, parent
+				.getEntries().size());
+		assertEquals(1, parent.getEntries().get(0).getPermission().getMask());
+		assertEquals(new PrincipalSid("ben"), parent.getEntries().get(0).getSid());
+		assertEquals(1, parent.getEntries().get(1).getPermission().getMask());
+		assertEquals(new PrincipalSid("scott"), parent.getEntries().get(1).getSid());
 	}
 
 	/**
@@ -491,12 +492,12 @@ public class JdbcMutableAclServiceTests extends
 
 		parent = (MutableAcl) child.getParentAcl();
 
-		assertThat(parent.getEntries()).hasSize(2);
-		assertThat(parent.getEntries().get(0).getPermission().getMask()).isEqualTo(16);
-		assertThat(parent.getEntries()
-				.get(0).getSid()).isEqualTo(new GrantedAuthoritySid("ROLE_ADMINISTRATOR"));
-		assertThat(parent.getEntries().get(1).getPermission().getMask()).isEqualTo(8);
-		assertThat(parent.getEntries().get(1).getSid()).isEqualTo(new PrincipalSid("terry"));
+		assertEquals(2, parent.getEntries().size());
+		assertEquals(16, parent.getEntries().get(0).getPermission().getMask());
+		assertEquals(new GrantedAuthoritySid("ROLE_ADMINISTRATOR"), parent.getEntries()
+				.get(0).getSid());
+		assertEquals(8, parent.getEntries().get(1).getPermission().getMask());
+		assertEquals(new PrincipalSid("terry"), parent.getEntries().get(1).getSid());
 	}
 
 	@Test
@@ -514,17 +515,17 @@ public class JdbcMutableAclServiceTests extends
 		// Add an ACE permission entry
 		Permission cm = new CumulativePermission().set(BasePermission.READ).set(
 				BasePermission.ADMINISTRATION);
-		assertThat(cm.getMask()).isEqualTo(17);
+		assertEquals(17, cm.getMask());
 		Sid benSid = new PrincipalSid(auth);
 		topParent.insertAce(0, cm, benSid, true);
-		assertThat(topParent.getEntries()).hasSize(1);
+		assertEquals(1, topParent.getEntries().size());
 
 		// Explicitly save the changed ACL
 		topParent = jdbcMutableAclService.updateAcl(topParent);
 
 		// Check the mask was retrieved correctly
-		assertThat(topParent.getEntries().get(0).getPermission().getMask()).isEqualTo(17);
-		assertThat(topParent.isGranted(Arrays.asList(cm), Arrays.asList(benSid), true)).isTrue();
+		assertEquals(17, topParent.getEntries().get(0).getPermission().getMask());
+		assertTrue(topParent.isGranted(Arrays.asList(cm), Arrays.asList(benSid), true));
 
 		SecurityContextHolder.clearContext();
 	}
@@ -541,7 +542,7 @@ public class JdbcMutableAclServiceTests extends
 		Long result = customJdbcMutableAclService.createOrRetrieveSidPrimaryKey(
 				customSid, false);
 
-		assertThat(new Long(1L)).isEqualTo(result);
+		assertEquals(result, new Long(1L));
 	}
 
 	/**

acl/src/test/java/org/springframework/security/acls/jdbc/SpringCacheBasedAclCacheTests.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2017 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.jdbc;
 
 import org.junit.After;
@@ -33,7 +18,7 @@ import org.springframework.security.util.FieldUtils;
 
 import java.util.Map;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 
 /**
  * Tests {@link org.springframework.security.acls.domain.SpringCacheBasedAclCache}
@@ -87,12 +72,12 @@ public class SpringCacheBasedAclCacheTests {
 		MutableAcl acl = new AclImpl(identity, Long.valueOf(1), aclAuthorizationStrategy,
 				auditLogger);
 
-		assertThat(realCache).isEmpty();
+		assertEquals(0, realCache.size());
 		myCache.putInCache(acl);
 
 		// Check we can get from cache the same objects we put in
-		assertThat(acl).isEqualTo(myCache.getFromCache(Long.valueOf(1)));
-		assertThat(acl).isEqualTo(myCache.getFromCache(identity));
+		assertEquals(myCache.getFromCache(Long.valueOf(1)), acl);
+		assertEquals(myCache.getFromCache(identity), acl);
 
 		// Put another object in cache
 		ObjectIdentity identity2 = new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(101));
@@ -104,17 +89,17 @@ public class SpringCacheBasedAclCacheTests {
 		// Try to evict an entry that doesn't exist
 		myCache.evictFromCache(Long.valueOf(3));
 		myCache.evictFromCache(new ObjectIdentityImpl(TARGET_CLASS, Long.valueOf(102)));
-		assertThat(realCache).hasSize(4);
+		assertEquals(realCache.size(), 4);
 
 		myCache.evictFromCache(Long.valueOf(1));
-		assertThat(realCache).hasSize(2);
+		assertEquals(realCache.size(), 2);
 
 		// Check the second object inserted
-		assertThat(acl2).isEqualTo(myCache.getFromCache(Long.valueOf(2)));
-		assertThat(acl2).isEqualTo(myCache.getFromCache(identity2));
+		assertEquals(myCache.getFromCache(Long.valueOf(2)), acl2);
+		assertEquals(myCache.getFromCache(identity2), acl2);
 
 		myCache.evictFromCache(identity2);
-		assertThat(realCache).isEmpty();
+		assertEquals(realCache.size(), 0);
 	}
 
 	@SuppressWarnings("rawtypes")
@@ -148,24 +133,24 @@ public class SpringCacheBasedAclCacheTests {
 
 		acl.setParent(parentAcl);
 
-		assertThat(realCache).isEmpty();
+		assertEquals(0, realCache.size());
 		myCache.putInCache(acl);
-		assertThat(4).isEqualTo(realCache.size());
+		assertEquals(realCache.size(), 4);
 
 		// Check we can get from cache the same objects we put in
 		AclImpl aclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(1));
-		assertThat(aclFromCache).isEqualTo(acl);
+		assertEquals(acl, aclFromCache);
 		// SEC-951 check transient fields are set on parent
-		assertThat(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
-				"aclAuthorizationStrategy")).isNotNull();
-		assertThat(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
-				"permissionGrantingStrategy")).isNotNull();
-		assertThat(myCache.getFromCache(identity)).isEqualTo(acl);
-		assertThat(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy")).isNotNull();
+		assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
+				"aclAuthorizationStrategy"));
+		assertNotNull(FieldUtils.getFieldValue(aclFromCache.getParentAcl(),
+				"permissionGrantingStrategy"));
+		assertEquals(acl, myCache.getFromCache(identity));
+		assertNotNull(FieldUtils.getFieldValue(aclFromCache, "aclAuthorizationStrategy"));
 		AclImpl parentAclFromCache = (AclImpl) myCache.getFromCache(Long.valueOf(2));
-		assertThat(parentAclFromCache).isEqualTo(parentAcl);
-		assertThat(FieldUtils.getFieldValue(parentAclFromCache,
-				"aclAuthorizationStrategy")).isNotNull();
-		assertThat(myCache.getFromCache(identityParent)).isEqualTo(parentAcl);
+		assertEquals(parentAcl, parentAclFromCache);
+		assertNotNull(FieldUtils.getFieldValue(parentAclFromCache,
+				"aclAuthorizationStrategy"));
+		assertEquals(parentAcl, myCache.getFromCache(identityParent));
 	}
 }

acl/src/test/java/org/springframework/security/acls/sid/CustomSid.java

@@ -1,18 +1,3 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.sid;
 
 import org.springframework.security.acls.model.Sid;

acl/src/test/java/org/springframework/security/acls/sid/SidRetrievalStrategyTests.java

@@ -1,23 +1,10 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.sid;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;
 
+import java.util.Collection;
 import java.util.List;
 
 import org.junit.Test;
@@ -29,6 +16,7 @@ import org.springframework.security.acls.model.Sid;
 import org.springframework.security.acls.model.SidRetrievalStrategy;
 import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.AuthorityUtils;
 
 /**
@@ -50,19 +38,19 @@ public class SidRetrievalStrategyTests {
 		SidRetrievalStrategy retrStrategy = new SidRetrievalStrategyImpl();
 		List<Sid> sids = retrStrategy.getSids(authentication);
 
-		assertThat(sids).isNotNull();
-		assertThat(sids).hasSize(4);
-		assertThat(sids.get(0)).isNotNull();
-		assertThat(sids.get(0) instanceof PrincipalSid).isTrue();
+		assertNotNull(sids);
+		assertEquals(4, sids.size());
+		assertNotNull(sids.get(0));
+		assertTrue(sids.get(0) instanceof PrincipalSid);
 
 		for (int i = 1; i < sids.size(); i++) {
-			assertThat(sids.get(i) instanceof GrantedAuthoritySid).isTrue();
+			assertTrue(sids.get(i) instanceof GrantedAuthoritySid);
 		}
 
-		assertThat(((PrincipalSid) sids.get(0)).getPrincipal()).isEqualTo("scott");
-		assertThat(((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority()).isEqualTo("A");
-		assertThat(((GrantedAuthoritySid) sids.get(2)).getGrantedAuthority()).isEqualTo("B");
-		assertThat(((GrantedAuthoritySid) sids.get(3)).getGrantedAuthority()).isEqualTo("C");
+		assertEquals("scott", ((PrincipalSid) sids.get(0)).getPrincipal());
+		assertEquals("A", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority());
+		assertEquals("B", ((GrantedAuthoritySid) sids.get(2)).getGrantedAuthority());
+		assertEquals("C", ((GrantedAuthoritySid) sids.get(3)).getGrantedAuthority());
 	}
 
 	@Test
@@ -74,9 +62,9 @@ public class SidRetrievalStrategyTests {
 		SidRetrievalStrategy strat = new SidRetrievalStrategyImpl(rh);
 
 		List<Sid> sids = strat.getSids(authentication);
-		assertThat(sids).hasSize(2);
-		assertThat(sids.get(0)).isNotNull();
-		assertThat(sids.get(0) instanceof PrincipalSid).isTrue();
-		assertThat(((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority()).isEqualTo("D");
+		assertEquals(2, sids.size());
+		assertNotNull(sids.get(0));
+		assertTrue(sids.get(0) instanceof PrincipalSid);
+		assertEquals("D", ((GrantedAuthoritySid) sids.get(1)).getGrantedAuthority());
 	}
 }

acl/src/test/java/org/springframework/security/acls/sid/SidTests.java

@@ -1,24 +1,7 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.acls.sid;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-
-import org.junit.Test;
+import junit.framework.Assert;
+import junit.framework.TestCase;
 import org.springframework.security.acls.domain.GrantedAuthoritySid;
 import org.springframework.security.acls.domain.PrincipalSid;
 import org.springframework.security.acls.model.Sid;
@@ -27,177 +10,184 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 
-public class SidTests {
+public class SidTests extends TestCase {
 
 	// ~ Methods
 	// ========================================================================================================
-	@Test
+
 	public void testPrincipalSidConstructorsRequiredFields() throws Exception {
 		// Check one String-argument constructor
 		try {
 			String string = null;
 			new PrincipalSid(string);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			new PrincipalSid("");
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
-		new PrincipalSid("johndoe");
-		// throws no exception
+		try {
+			new PrincipalSid("johndoe");
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
 
 		// Check one Authentication-argument constructor
 		try {
 			Authentication authentication = null;
 			new PrincipalSid(authentication);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
 		try {
 			Authentication authentication = new TestingAuthenticationToken(null,
 					"password");
 			new PrincipalSid(authentication);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
+			Assert.assertTrue(true);
 		}
 
-		Authentication authentication = new TestingAuthenticationToken("johndoe",
-				"password");
-		new PrincipalSid(authentication);
-		// throws no exception
+		try {
+			Authentication authentication = new TestingAuthenticationToken("johndoe",
+					"password");
+			new PrincipalSid(authentication);
+			Assert.assertTrue(true);
+		}
+		catch (IllegalArgumentException notExpected) {
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
+		}
 	}
 
-	@Test
 	public void testGrantedAuthoritySidConstructorsRequiredFields() throws Exception {
 		// Check one String-argument constructor
 		try {
 			String string = null;
 			new GrantedAuthoritySid(string);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
-
+			Assert.assertTrue(true);
 		}
 
 		try {
 			new GrantedAuthoritySid("");
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
-
+			Assert.assertTrue(true);
 		}
 
 		try {
 			new GrantedAuthoritySid("ROLE_TEST");
-
+			Assert.assertTrue(true);
 		}
 		catch (IllegalArgumentException notExpected) {
-			fail("It shouldn't have thrown IllegalArgumentException");
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
 		}
 
 		// Check one GrantedAuthority-argument constructor
 		try {
 			GrantedAuthority ga = null;
 			new GrantedAuthoritySid(ga);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
-
+			Assert.assertTrue(true);
 		}
 
 		try {
 			GrantedAuthority ga = new SimpleGrantedAuthority(null);
 			new GrantedAuthoritySid(ga);
-			fail("It should have thrown IllegalArgumentException");
+			Assert.fail("It should have thrown IllegalArgumentException");
 		}
 		catch (IllegalArgumentException expected) {
-
+			Assert.assertTrue(true);
 		}
 
 		try {
 			GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
 			new GrantedAuthoritySid(ga);
-
+			Assert.assertTrue(true);
 		}
 		catch (IllegalArgumentException notExpected) {
-			fail("It shouldn't have thrown IllegalArgumentException");
+			Assert.fail("It shouldn't have thrown IllegalArgumentException");
 		}
 	}
 
-	@Test
 	public void testPrincipalSidEquals() throws Exception {
 		Authentication authentication = new TestingAuthenticationToken("johndoe",
 				"password");
 		Sid principalSid = new PrincipalSid(authentication);
 
-		assertThat(principalSid.equals(null)).isFalse();
-		assertThat(principalSid.equals("DIFFERENT_TYPE_OBJECT")).isFalse();
-		assertThat(principalSid.equals(principalSid)).isTrue();
-		assertThat(principalSid.equals(new PrincipalSid(authentication))).isTrue();
-		assertThat(principalSid.equals(new PrincipalSid(
-				new TestingAuthenticationToken("johndoe", null)))).isTrue();
-		assertThat(principalSid.equals(new PrincipalSid(
-				new TestingAuthenticationToken("scott", null)))).isFalse();
-		assertThat(principalSid.equals(new PrincipalSid("johndoe"))).isTrue();
-		assertThat(principalSid.equals(new PrincipalSid("scott"))).isFalse();
+		Assert.assertFalse(principalSid.equals(null));
+		Assert.assertFalse(principalSid.equals("DIFFERENT_TYPE_OBJECT"));
+		Assert.assertTrue(principalSid.equals(principalSid));
+		Assert.assertTrue(principalSid.equals(new PrincipalSid(authentication)));
+		Assert.assertTrue(principalSid.equals(new PrincipalSid(
+				new TestingAuthenticationToken("johndoe", null))));
+		Assert.assertFalse(principalSid.equals(new PrincipalSid(
+				new TestingAuthenticationToken("scott", null))));
+		Assert.assertTrue(principalSid.equals(new PrincipalSid("johndoe")));
+		Assert.assertFalse(principalSid.equals(new PrincipalSid("scott")));
 	}
 
-	@Test
 	public void testGrantedAuthoritySidEquals() throws Exception {
 		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
 		Sid gaSid = new GrantedAuthoritySid(ga);
 
-		assertThat(gaSid.equals(null)).isFalse();
-		assertThat(gaSid.equals("DIFFERENT_TYPE_OBJECT")).isFalse();
-		assertThat(gaSid.equals(gaSid)).isTrue();
-		assertThat(gaSid.equals(new GrantedAuthoritySid(ga))).isTrue();
-		assertThat(gaSid.equals(new GrantedAuthoritySid(
-				new SimpleGrantedAuthority("ROLE_TEST")))).isTrue();
-		assertThat(gaSid.equals(new GrantedAuthoritySid(
-				new SimpleGrantedAuthority("ROLE_NOT_EQUAL")))).isFalse();
-		assertThat(gaSid.equals(new GrantedAuthoritySid("ROLE_TEST"))).isTrue();
-		assertThat(gaSid.equals(new GrantedAuthoritySid("ROLE_NOT_EQUAL"))).isFalse();
+		Assert.assertFalse(gaSid.equals(null));
+		Assert.assertFalse(gaSid.equals("DIFFERENT_TYPE_OBJECT"));
+		Assert.assertTrue(gaSid.equals(gaSid));
+		Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(ga)));
+		Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid(
+				new SimpleGrantedAuthority("ROLE_TEST"))));
+		Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid(
+				new SimpleGrantedAuthority("ROLE_NOT_EQUAL"))));
+		Assert.assertTrue(gaSid.equals(new GrantedAuthoritySid("ROLE_TEST")));
+		Assert.assertFalse(gaSid.equals(new GrantedAuthoritySid("ROLE_NOT_EQUAL")));
 	}
 
-	@Test
 	public void testPrincipalSidHashCode() throws Exception {
 		Authentication authentication = new TestingAuthenticationToken("johndoe",
 				"password");
 		Sid principalSid = new PrincipalSid(authentication);
 
-		assertThat(principalSid.hashCode()).isEqualTo("johndoe".hashCode());
-		assertThat(principalSid.hashCode()).isEqualTo(
-				new PrincipalSid("johndoe").hashCode());
-		assertThat(principalSid.hashCode()).isNotEqualTo(
-				new PrincipalSid("scott").hashCode());
-		assertThat(principalSid.hashCode()).isNotEqualTo(new PrincipalSid(
+		Assert.assertTrue(principalSid.hashCode() == "johndoe".hashCode());
+		Assert.assertTrue(principalSid.hashCode() == new PrincipalSid("johndoe")
+				.hashCode());
+		Assert.assertTrue(principalSid.hashCode() != new PrincipalSid("scott").hashCode());
+		Assert.assertTrue(principalSid.hashCode() != new PrincipalSid(
 				new TestingAuthenticationToken("scott", "password")).hashCode());
 	}
 
-	@Test
 	public void testGrantedAuthoritySidHashCode() throws Exception {
 		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
 		Sid gaSid = new GrantedAuthoritySid(ga);
 
-		assertThat(gaSid.hashCode()).isEqualTo("ROLE_TEST".hashCode());
-		assertThat(gaSid.hashCode()).isEqualTo(
-				new GrantedAuthoritySid("ROLE_TEST").hashCode());
-		assertThat(gaSid.hashCode()).isNotEqualTo(
-				new GrantedAuthoritySid("ROLE_TEST_2").hashCode());
-		assertThat(gaSid.hashCode()).isNotEqualTo(new GrantedAuthoritySid(
+		Assert.assertTrue(gaSid.hashCode() == "ROLE_TEST".hashCode());
+		Assert.assertTrue(gaSid.hashCode() == new GrantedAuthoritySid("ROLE_TEST")
+				.hashCode());
+		Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid("ROLE_TEST_2")
+				.hashCode());
+		Assert.assertTrue(gaSid.hashCode() != new GrantedAuthoritySid(
 				new SimpleGrantedAuthority("ROLE_TEST_2")).hashCode());
 	}
 
-	@Test
 	public void testGetters() throws Exception {
 		Authentication authentication = new TestingAuthenticationToken("johndoe",
 				"password");
@@ -205,10 +195,10 @@ public class SidTests {
 		GrantedAuthority ga = new SimpleGrantedAuthority("ROLE_TEST");
 		GrantedAuthoritySid gaSid = new GrantedAuthoritySid(ga);
 
-		assertThat("johndoe".equals(principalSid.getPrincipal())).isTrue();
-		assertThat("scott".equals(principalSid.getPrincipal())).isFalse();
+		Assert.assertTrue("johndoe".equals(principalSid.getPrincipal()));
+		Assert.assertFalse("scott".equals(principalSid.getPrincipal()));
 
-		assertThat("ROLE_TEST".equals(gaSid.getGrantedAuthority())).isTrue();
-		assertThat("ROLE_TEST2".equals(gaSid.getGrantedAuthority())).isFalse();
+		Assert.assertTrue("ROLE_TEST".equals(gaSid.getGrantedAuthority()));
+		Assert.assertFalse("ROLE_TEST2".equals(gaSid.getGrantedAuthority()));
 	}
 }

aspects/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
   <artifactId>spring-security-aspects</artifactId>
-  <version>4.2.7.RELEASE</version>
+  <version>4.0.4.RELEASE</version>
   <name>spring-security-aspects</name>
   <description>spring-security-aspects</description>
   <url>http://spring.io/spring-security</url>
@@ -30,22 +30,11 @@
     <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
     <url>https://github.com/spring-projects/spring-security</url>
   </scm>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>4.3.18.RELEASE</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.2.7.RELEASE</version>
+      <version>4.0.4.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -79,7 +68,7 @@
     <dependency>
       <groupId>org.aspectj</groupId>
       <artifactId>aspectjrt</artifactId>
-      <version>1.8.12</version>
+      <version>1.8.4</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
@@ -98,13 +87,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>2.2.0</version>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -116,7 +105,7 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -130,6 +119,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>4.2.5.RELEASE</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <plugins>
       <plugin>

aspects/src/main/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspect.aj

@@ -1,28 +1,10 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.access.intercept.aspectj.aspect;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.security.access.annotation.Secured;
+import org.springframework.security.access.prepost.*;
 import org.springframework.security.access.intercept.aspectj.AspectJCallback;
 import org.springframework.security.access.intercept.aspectj.AspectJMethodSecurityInterceptor;
-import org.springframework.security.access.prepost.PostAuthorize;
-import org.springframework.security.access.prepost.PostFilter;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.security.access.prepost.PreFilter;
 
 /**
  * Concrete AspectJ aspect using Spring Security @Secured annotation
@@ -40,55 +22,55 @@ import org.springframework.security.access.prepost.PreFilter;
  */
 public aspect AnnotationSecurityAspect implements InitializingBean {
 
-		/**
-		 * Matches the execution of any public method in a type with the Secured
-		 * annotation, or any subtype of a type with the Secured annotation.
-		 */
-		private pointcut executionOfAnyPublicMethodInAtSecuredType() :
-				execution(public * ((@Secured *)+).*(..)) && @this(Secured);
+    /**
+     * Matches the execution of any public method in a type with the Secured
+     * annotation, or any subtype of a type with the Secured annotation.
+     */
+    private pointcut executionOfAnyPublicMethodInAtSecuredType() :
+        execution(public * ((@Secured *)+).*(..)) && @this(Secured);
 
-		/**
-		 * Matches the execution of any method with the Secured annotation.
-		 */
-		private pointcut executionOfSecuredMethod() :
-				execution(* *(..)) && @annotation(Secured);
+    /**
+     * Matches the execution of any method with the Secured annotation.
+     */
+    private pointcut executionOfSecuredMethod() :
+        execution(* *(..)) && @annotation(Secured);
 
-		/**
-		 * Matches the execution of any method with Pre/Post annotations.
-		 */
-		private pointcut executionOfPrePostAnnotatedMethod() :
-				execution(* *(..)) && (@annotation(PreAuthorize) || @annotation(PreFilter)
-								|| @annotation(PostAuthorize) || @annotation(PostFilter));
+    /**
+     * Matches the execution of any method with Pre/Post annotations.
+     */
+    private pointcut executionOfPrePostAnnotatedMethod() :
+        execution(* *(..)) && (@annotation(PreAuthorize) || @annotation(PreFilter)
+                || @annotation(PostAuthorize) || @annotation(PostFilter));
 
-		private pointcut securedMethodExecution() :
-				executionOfAnyPublicMethodInAtSecuredType() ||
-				executionOfSecuredMethod() ||
-				executionOfPrePostAnnotatedMethod();
+    private pointcut securedMethodExecution() :
+        executionOfAnyPublicMethodInAtSecuredType() ||
+        executionOfSecuredMethod() ||
+        executionOfPrePostAnnotatedMethod();
 
-		private AspectJMethodSecurityInterceptor securityInterceptor;
+    private AspectJMethodSecurityInterceptor securityInterceptor;
 
-		Object around(): securedMethodExecution() {
-				if (this.securityInterceptor == null) {
-						return proceed();
-				}
+    Object around(): securedMethodExecution() {
+        if (this.securityInterceptor == null) {
+            return proceed();
+        }
 
-				AspectJCallback callback = new AspectJCallback() {
-						public Object proceedWithObject() {
-								return proceed();
-						}
-				};
+        AspectJCallback callback = new AspectJCallback() {
+            public Object proceedWithObject() {
+                return proceed();
+            }
+        };
 
-				return this.securityInterceptor.invoke(thisJoinPoint, callback);
-		}
+        return this.securityInterceptor.invoke(thisJoinPoint, callback);
+    }
 
-		public void setSecurityInterceptor(AspectJMethodSecurityInterceptor securityInterceptor) {
-				this.securityInterceptor = securityInterceptor;
-		}
+    public void setSecurityInterceptor(AspectJMethodSecurityInterceptor securityInterceptor) {
+        this.securityInterceptor = securityInterceptor;
+    }
 
-		public void afterPropertiesSet() throws Exception {
-				if (this.securityInterceptor == null) {
-						throw new IllegalArgumentException("securityInterceptor required");
-				}
-		}
+    public void afterPropertiesSet() throws Exception {
+        if (this.securityInterceptor == null) {
+            throw new IllegalArgumentException("securityInterceptor required");
+        }
+    }
 
 }

aspects/src/test/java/org/springframework/security/access/intercept/aspectj/aspect/AnnotationSecurityAspectTests.java

@@ -1,21 +1,6 @@
-/*
- * Copyright 2002-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.springframework.security.access.intercept.aspectj.aspect;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -26,7 +11,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-
+import org.springframework.security.access.AccessDecisionManager;
 import org.springframework.security.access.AccessDecisionVoter;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.access.annotation.Secured;
@@ -144,9 +129,9 @@ public class AnnotationSecurityAspectTests {
 		configureForElAnnotations();
 		SecurityContextHolder.getContext().setAuthentication(anne);
 		List<String> objects = prePostSecured.postFilterMethod();
-		assertThat(objects).hasSize(2);
-		assertThat(objects.contains("apple")).isTrue();
-		assertThat(objects.contains("aubergine")).isTrue();
+		assertEquals(2, objects.size());
+		assertTrue(objects.contains("apple"));
+		assertTrue(objects.contains("aubergine"));
 	}
 
 	private void configureForElAnnotations() {

bom/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'maven-bom'
 apply from: "$rootDir/gradle/maven-deployment.gradle"
 
 generatePom.enabled = false
-sonarqube.skipProject = true
+sonarRunner.skipProject = true
 
 mavenBom {
 	projects = coreModuleProjects

build.gradle

@@ -1,24 +1,20 @@
+import groovy.text.SimpleTemplateEngine
+
 buildscript {
 	repositories {
 		maven { url "https://repo.spring.io/plugins-release" }
-		maven { url "https://repo.spring.io/plugins-snapshot" }
 	}
 	dependencies {
-		classpath "com.github.ben-manes:gradle-versions-plugin:0.17.0"
 		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
-		classpath("io.spring.gradle:spring-io-plugin:0.0.6.RELEASE")
-		classpath("com.bmuschko:gradle-tomcat-plugin:2.2.4")
+		classpath("io.spring.gradle:spring-io-plugin:0.0.4.RELEASE")
+		classpath("org.gradle.api.plugins:gradle-tomcat-plugin:1.2.5")
 		classpath('me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1')
 		classpath('org.asciidoctor:asciidoctor-gradle-plugin:1.5.1')
 		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
-		classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.2.RELEASE")
 	}
 }
 
-plugins {
-	id "org.sonarqube" version "2.1-rc1"
-}
-
+apply plugin: 'sonar-runner'
 apply plugin: 'base'
 
 description = 'Spring Security'
@@ -26,12 +22,11 @@ description = 'Spring Security'
 allprojects {
 	apply plugin: 'idea'
 	apply plugin: 'eclipse'
-	apply plugin: "com.github.ben-manes.versions"
 
 	ext.releaseBuild = version.endsWith('RELEASE')
 	ext.snapshotBuild = version.endsWith('SNAPSHOT')
-	ext.springVersion = '4.3.18.RELEASE'
-	ext.springLdapVersion = '2.3.2.RELEASE'
+	ext.springVersion = '4.2.5.RELEASE'
+	ext.springLdapVersion = '2.0.2.RELEASE'
 
 	group = 'org.springframework.security'
 
@@ -42,10 +37,11 @@ allprojects {
 	maven { url "http://repo.terracotta.org/maven2/" }
 	}
 
+	eclipse.project.name = "${project.name}-4.0.x"
 }
 
-sonarqube {
-	properties {
+sonarRunner {
+	sonarProperties {
 		property "sonar.java.coveragePlugin", "jacoco"
 		property "sonar.projectName", "Spring Security"
 		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
@@ -63,7 +59,7 @@ ext.javaProjects = subprojects.findAll { project -> project.name != 'docs' && pr
 ext.sampleProjects = subprojects.findAll { project -> project.name.startsWith('spring-security-samples') }
 ext.itestProjects = subprojects.findAll { project -> project.name.startsWith('itest') }
 ext.coreModuleProjects = javaProjects - sampleProjects - itestProjects
-ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-xml-aspectj'), project(':spring-security-samples-javaconfig-aspectj')]
+ext.aspectjProjects = [project(':spring-security-aspects'), project(':spring-security-samples-aspectj-xml'), project(':spring-security-samples-aspectj-jc')]
 
 configure(allprojects - javaProjects) {
 	task afterEclipseImport {
@@ -84,9 +80,9 @@ configure(allprojects - javaProjects) {
 	}
 }
 
-configure(subprojects - coreModuleProjects - project(':spring-security-samples-javaconfig-messages') - project(':spring-security-bom')) {
+configure(subprojects - coreModuleProjects - project(':spring-security-samples-messages-jc') - project(':spring-security-bom')) {
 	tasks.findByPath("artifactoryPublish")?.enabled = false
-	sonarqube {
+	sonarRunner {
 		skipProject = true
 	}
 }
@@ -94,12 +90,7 @@ configure(subprojects - coreModuleProjects - project(':spring-security-samples-j
 configure(javaProjects) {
 	ext.TOMCAT_GRADLE = "$rootDir/gradle/tomcat.gradle"
 	ext.WAR_SAMPLE_GRADLE = "$rootDir/gradle/war-sample.gradle"
-	ext.BOOT_SAMPLE_GRADLE = "$rootDir/gradle/boot-sample.gradle"
 	apply from: "$rootDir/gradle/javaprojects.gradle"
-	if(!project.name.contains('gae')) {
-		apply from: "$rootDir/gradle/checkstyle.gradle"
-	}
-	apply from: "$rootDir/gradle/ide.gradle"
 	apply from: "$rootDir/gradle/release-checks.gradle"
 	apply from: "$rootDir/gradle/maven-deployment.gradle"
 }
@@ -108,7 +99,7 @@ configure(coreModuleProjects) {
 	apply plugin: 'emma'
 	apply plugin: 'spring-io'
 
-	ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : 'Brussels-SR9'
+	ext.springIoVersion = project.hasProperty('platformVersion') ? platformVersion : '2.0.1.RELEASE'
 
 	configurations {
 		jacoco //Configuration Group used by Sonar to provide Code Coverage using JaCoCo
@@ -117,12 +108,7 @@ configure(coreModuleProjects) {
 	dependencyManagement {
 		springIoTestRuntime {
 			imports {
-				mavenBom("io.spring.platform:platform-bom:${springIoVersion}") {
-					bomProperties([
-						'assertj.version': '2.2.0',
-						'mockito.version': '1.10.19'
-					])
-				}
+				mavenBom "io.spring.platform:platform-bom:${springIoVersion}"
 			}
 		}
 	}
@@ -146,10 +132,6 @@ task coreBuild {
 	dependsOn coreModuleProjects*.tasks*.matching { task -> task.name == 'build' }
 }
 
-task coreInstall {
-	dependsOn coreModuleProjects*.tasks*.matching { task -> task.name == 'install' }
-}
-
 // Task for creating the distro zip
 
 task dist(type: Zip) {

buildSrc/src/main/groovy/aspectj/AspectJPlugin.groovy

@@ -4,13 +4,12 @@ import org.gradle.api.Project
 import org.gradle.api.Plugin
 import org.gradle.api.tasks.TaskAction
 import org.gradle.api.logging.LogLevel
-import org.gradle.api.file.*
+import org.gradle.api.file.FileCollection
 import org.gradle.api.tasks.SourceSet
 import org.gradle.api.DefaultTask
 import org.gradle.api.GradleException
 
 import org.gradle.api.plugins.JavaPlugin
-import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.plugins.ide.eclipse.GenerateEclipseProject
 import org.gradle.plugins.ide.eclipse.GenerateEclipseClasspath
 import org.gradle.plugins.ide.eclipse.EclipsePlugin
@@ -42,25 +41,28 @@ class AspectJPlugin implements Plugin<Project> {
 			project.configurations.create('aspectpath')
 		}
 
-		project.tasks.withType(JavaCompile) { javaCompileTask ->
-			def javaCompileTaskName = javaCompileTask.name
-			def ajCompileTask = project.tasks.create(name: javaCompileTaskName + 'Aspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
-				inputs.files(javaCompileTask.inputs.files)
-				inputs.properties(javaCompileTask.inputs.properties)
-
-				sourceRoots.addAll(project.sourceSets.main.java.srcDirs)
-				if(javaCompileTaskName.contains("Test")) {
-					sourceRoots.addAll(project.sourceSets.test.java.srcDirs)
-				}
-				compileClasspath = javaCompileTask.classpath
-				destinationDir = javaCompileTask.destinationDir
-				aspectPath = project.configurations.aspectpath
-			}
-
-			javaCompileTask.deleteAllActions()
-			javaCompileTask.dependsOn ajCompileTask
+		project.tasks.create(name: 'compileAspect', overwrite: true, description: 'Compiles AspectJ Source', type: Ajc) {
+			dependsOn project.configurations*.getTaskDependencyFromProjectDependency(true, "compileJava")
 
+			dependsOn project.processResources
+			sourceSet = project.sourceSets.main
+			inputs.files(sourceSet.allSource)
+			outputs.dir(sourceSet.output.classesDir)
+			aspectPath = project.configurations.aspectpath
 		}
+		project.tasks.compileJava.deleteAllActions()
+		project.tasks.compileJava.dependsOn project.tasks.compileAspect
+
+
+		project.tasks.create(name: 'compileTestAspect', overwrite: true, description: 'Compiles AspectJ Test Source', type: Ajc) {
+			dependsOn project.processTestResources, project.compileJava, project.jar
+			sourceSet = project.sourceSets.test
+			inputs.files(sourceSet.allSource)
+			outputs.dir(sourceSet.output.classesDir)
+			aspectPath = project.files(project.configurations.aspectpath, project.jar.archivePath)
+		}
+		project.tasks.compileTestJava.deleteAllActions()
+		project.tasks.compileTestJava.dependsOn project.tasks.compileTestAspect
 
 		project.tasks.withType(GenerateEclipseProject) {
 			project.eclipse.project.file.whenMerged { p ->
@@ -89,9 +91,7 @@ class AspectJPlugin implements Plugin<Project> {
 }
 
 class Ajc extends DefaultTask {
-	Set<File> sourceRoots = []
-	FileCollection compileClasspath
-	File destinationDir
+	SourceSet sourceSet
 	FileCollection aspectPath
 
 	Ajc() {
@@ -103,18 +103,15 @@ class Ajc extends DefaultTask {
 		logger.info("="*30)
 		logger.info("="*30)
 		logger.info("Running ajc ...")
-		logger.info("classpath: ${compileClasspath?.files}")
-		logger.info("srcDirs ${sourceRoots}")
+		logger.info("classpath: ${sourceSet.compileClasspath.asPath}")
+		logger.info("srcDirs $sourceSet.java.srcDirs")
 		ant.taskdef(resource: "org/aspectj/tools/ant/taskdefs/aspectjTaskdefs.properties", classpath: project.configurations.ajtools.asPath)
-		if(sourceRoots.empty) {
-			return
-		}
-		ant.iajc(classpath: compileClasspath.asPath, fork: 'true', destDir: destinationDir.absolutePath,
+		ant.iajc(classpath: sourceSet.compileClasspath.asPath, fork: 'true', destDir: sourceSet.output.classesDir.absolutePath,
 				source: project.convention.plugins.java.sourceCompatibility,
 				target: project.convention.plugins.java.targetCompatibility,
 				aspectPath: aspectPath.asPath, sourceRootCopyFilter: '**/*.java', showWeaveInfo: 'true') {
 			sourceroots {
-				sourceRoots.each {
+				sourceSet.java.srcDirs.each {
 					logger.info("	sourceRoot $it")
 					pathelement(location: it.absolutePath)
 				}

cas/cas.gradle

@@ -8,10 +8,7 @@ dependencies {
 			"org.springframework:spring-web:$springVersion",
 			"org.jasig.cas.client:cas-client-core:$casClientVersion"
 
-	optional "net.sf.ehcache:ehcache:$ehcacheVersion",
-			"com.fasterxml.jackson.core:jackson-databind:$jacksonDatabindVersion"
-
-	testCompile "org.skyscreamer:jsonassert:$jsonassertVersion"
+	optional "net.sf.ehcache:ehcache:$ehcacheVersion"
 
 	provided "javax.servlet:javax.servlet-api:$servletApiVersion"
 }

cas/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.springframework.security</groupId>
   <artifactId>spring-security-cas</artifactId>
-  <version>4.2.7.RELEASE</version>
+  <version>4.0.4.RELEASE</version>
   <name>spring-security-cas</name>
   <description>spring-security-cas</description>
   <url>http://spring.io/spring-security</url>
@@ -30,34 +30,23 @@
     <developerConnection>scm:git:git://github.com/spring-projects/spring-security</developerConnection>
     <url>https://github.com/spring-projects/spring-security</url>
   </scm>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>org.springframework</groupId>
-        <artifactId>spring-framework-bom</artifactId>
-        <version>4.3.18.RELEASE</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
   <dependencies>
     <dependency>
       <groupId>org.jasig.cas.client</groupId>
       <artifactId>cas-client-core</artifactId>
-      <version>3.4.1</version>
+      <version>3.3.3</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-core</artifactId>
-      <version>4.2.7.RELEASE</version>
+      <version>4.0.4.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
       <artifactId>spring-security-web</artifactId>
-      <version>4.2.7.RELEASE</version>
+      <version>4.0.4.RELEASE</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
@@ -86,13 +75,6 @@
       <artifactId>spring-web</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-      <version>2.8.11.1</version>
-      <scope>compile</scope>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
@@ -103,14 +85,14 @@
     <dependency>
       <groupId>net.sf.ehcache</groupId>
       <artifactId>ehcache</artifactId>
-      <version>2.10.4</version>
+      <version>2.9.0</version>
       <scope>compile</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
-      <version>3.1.0</version>
+      <version>3.0.1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -122,13 +104,13 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.12</version>
+      <version>4.11</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.assertj</groupId>
-      <artifactId>assertj-core</artifactId>
-      <version>2.2.0</version>
+      <groupId>org.easytesting</groupId>
+      <artifactId>fest-assert</artifactId>
+      <version>1.4</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -137,16 +119,10 @@
       <version>1.10.19</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.skyscreamer</groupId>
-      <artifactId>jsonassert</artifactId>
-      <version>1.4.0</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
-      <version>1.7.25</version>
+      <version>1.7.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -155,6 +131,17 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-framework-bom</artifactId>
+        <version>4.2.5.RELEASE</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
   <build>
     <plugins>
       <plugin>