Merge from 1.2.x

git-svn-id: https://svn.apache.org/repos/asf/shiro/trunk@1365192 13f79535-47bb-0310-9956-ffa450edef68
cohorte · Jul 24, 2012 · f91ddd7 · f91ddd7
1 parent fa34a92
commit f91ddd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,5 @@
 Apache Shiro
-Copyright 2008-2011 The Apache Software Foundation
+Copyright 2008-2012 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

diff --git a/core/src/test/java/org/apache/shiro/authz/aop/RoleAnnotationHandlerTest.java b/core/src/test/java/org/apache/shiro/authz/aop/RoleAnnotationHandlerTest.java
@@ -18,10 +18,6 @@
  */
 package org.apache.shiro.authz.aop;
 
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
 import org.apache.shiro.authz.UnauthenticatedException;
 import org.apache.shiro.authz.annotation.Logical;
 import org.apache.shiro.authz.annotation.RequiresRoles;
@@ -31,6 +27,8 @@
 
 import java.lang.annotation.Annotation;
 
+import static org.easymock.EasyMock.*;
+
 /**
  * Test cases for the {@link RoleAnnotationHandler} class.
  */