CI Build Failure (duracloud#183)

* Bump easy mock

* Reset context between tests

Author: mikejritter

durastore/src/test/java/org/duracloud/durastore/util/ACLStorageProviderTest.java

@@ -64,14 +64,13 @@ public class ACLStorageProviderTest {
 
     @Before
     public void setUp() throws Exception {
-
+        SecurityContextHolder.clearContext();
         requestContextUtil = createMock("DuraCloudRequestContextUtil", DuraCloudRequestContextUtil.class);
         notifier = createMock("AccountChangeNotifier", AccountChangeNotifier.class);
         context = createMock("SecurityContext", SecurityContext.class);
 
-        authorities = new GrantedAuthority[] {new SimpleGrantedAuthority(
-            "ROLE_USER")};
-        groups = new ArrayList<String>();
+        authorities = new GrantedAuthority[] {new SimpleGrantedAuthority("ROLE_USER")};
+        groups = new ArrayList<>();
         groups.add(groupA);
     }
 

pom.xml

@@ -653,7 +653,7 @@
       <dependency>
         <groupId>org.easymock</groupId>
         <artifactId>easymock</artifactId>
-        <version>4.0.2</version>
+        <version>5.1.0</version>
       </dependency>
 
       <dependency>