Merge branch 'SPR-10129' into cleanup-3.2.x

* SPR-10129:
  Add @OverRide annotations to test sources
  Update test source and target JDK compatibility

Author: cbeams

build.gradle

@@ -32,8 +32,14 @@ configure(allprojects) {
 
 	group = "org.springframework"
 
-	sourceCompatibility=1.5
-	targetCompatibility=1.5
+	compileJava {
+		sourceCompatibility=1.5
+		targetCompatibility=1.5
+	}
+	compileTestJava {
+		sourceCompatibility=1.7
+		targetCompatibility=1.7
+	}
 
 	[compileJava, compileTestJava]*.options*.compilerArgs = [
 		"-Xlint:serial",
@@ -333,6 +339,14 @@ project("spring-tx") {
 project("spring-oxm") {
 	description = "Spring Object/XML Marshalling"
 	apply from: "oxm.gradle"
+
+	compileTestJava {
+		// necessary to avoid java.lang.VerifyError on jibx compilation
+		// see http://jira.codehaus.org/browse/JIBX-465
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
+	}
+
 	dependencies {
 		compile(project(":spring-beans"))
 		compile(project(":spring-core"))
@@ -458,6 +472,14 @@ project("spring-web") {
 
 project("spring-orm") {
 	description = "Spring Object/Relational Mapping"
+
+	compileTestJava {
+		// necessary to avoid java.lang.VerifyError on toplink compilation
+		// TODO: remove this block when we remove toplink
+		sourceCompatibility=1.6
+		targetCompatibility=1.6
+	}
+
 	dependencies {
 		compile("aopalliance:aopalliance:1.0")
 		optional("org.hibernate:hibernate-core:3.3.2.GA")

spring-aop/src/test/java/org/springframework/aop/aspectj/AspectJExpressionPointcutTests.java

@@ -113,6 +113,7 @@ public void testTarget() throws SecurityException, NoSuchMethodException {
 
 	public static class OtherIOther implements IOther {
 
+		@Override
 		public void absquatulate() {
 			// Empty
 		}
@@ -354,6 +355,7 @@ class CallCountingInterceptor implements MethodInterceptor {
 
 	private int count;
 
+	@Override
 	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
 		count++;
 		return methodInvocation.proceed();

spring-aop/src/test/java/org/springframework/aop/aspectj/BeanNamePointcutMatchingTests.java

@@ -90,6 +90,7 @@ private void assertMisMatch(String beanName, String pcExpression) {
 	private static boolean matches(final String beanName, String pcExpression) {
 		@SuppressWarnings("serial")
 		AspectJExpressionPointcut pointcut = new AspectJExpressionPointcut() {
+			@Override
 			protected String getCurrentProxiedBeanName() {
 				return beanName;
 			}

spring-aop/src/test/java/org/springframework/aop/aspectj/MethodInvocationProceedingJoinPointTests.java

@@ -79,6 +79,7 @@ public void testCanGetMethodSignatureFromJoinPoint() {
 		pf.addAdvice(new MethodBeforeAdvice() {
 			private int depth;
 
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				JoinPoint jp = AbstractAspectJAdvice.currentJoinPoint();
 				assertTrue("Method named in toString", jp.toString().contains(method.getName()));
@@ -135,6 +136,7 @@ public void testCanGetSourceLocationFromJoinPoint() {
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				SourceLocation sloc = AbstractAspectJAdvice.currentJoinPoint().getSourceLocation();
 				assertEquals("Same source location must be returned on subsequent requests",  sloc, AbstractAspectJAdvice.currentJoinPoint().getSourceLocation());
@@ -167,6 +169,7 @@ public void testCanGetStaticPartFromJoinPoint() {
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				StaticPart staticPart = AbstractAspectJAdvice.currentJoinPoint().getStaticPart();
 				assertEquals("Same static part must be returned on subsequent requests",  staticPart, AbstractAspectJAdvice.currentJoinPoint().getStaticPart());
@@ -186,6 +189,7 @@ public void toShortAndLongStringFormedCorrectly() throws Exception {
 		ProxyFactory pf = new ProxyFactory(raw);
 		pf.addAdvisor(ExposeInvocationInterceptor.ADVISOR);
 		pf.addAdvice(new MethodBeforeAdvice() {
+			@Override
 			public void before(Method method, Object[] args, Object target) throws Throwable {
 				// makeEncSJP, although meant for computing the enclosing join point,
 				// it serves our purpose here

spring-aop/src/test/java/org/springframework/aop/aspectj/TrickyAspectJPointcutExpressionTests.java

@@ -137,6 +137,7 @@ public static interface TestService {
 
 	@Log
 	public static class TestServiceImpl implements TestService {
+		@Override
 		public String sayHello() {
 			throw new TestException("TestServiceImpl");
 		}
@@ -148,6 +149,7 @@ public class LogUserAdvice implements MethodBeforeAdvice, ThrowsAdvice {
 
 		private int countThrows = 0;
 
+		@Override
 		public void before(Method method, Object[] objects, Object o) throws Throwable {
 			countBefore++;
 		}

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AbstractAspectJAdvisorFactoryTests.java

@@ -675,19 +675,23 @@ public int getInstantiationCount() {
 			return this.count;
 		}
 
+		@Override
 		public Object getAspectInstance() {
 			++this.count;
 			return new PerTypeWithinAspect();
 		}
 
+		@Override
 		public ClassLoader getAspectClassLoader() {
 			return PerTypeWithinAspect.class.getClassLoader();
 		}
 
+		@Override
 		public AspectMetadata getAspectMetadata() {
 			return new AspectMetadata(PerTypeWithinAspect.class, "perTypeWithin");
 		}
 
+		@Override
 		public int getOrder() {
 			return Ordered.LOWEST_PRECEDENCE;
 		}
@@ -897,14 +901,17 @@ public interface MutableModifable extends Modifiable {
 	public static class ModifiableImpl implements MutableModifable {
 		private boolean modified;
 
+		@Override
 		public void acceptChanges() {
 			modified = false;
 		}
 
+		@Override
 		public boolean isModified() {
 			return modified;
 		}
 
+		@Override
 		public void markDirty() {
 			this.modified = true;
 		}
@@ -1020,17 +1027,21 @@ public void checkNotLocked(
 
 class CannotBeUnlocked implements Lockable, Comparable<Object> {
 
+	@Override
 	public void lock() {
 	}
 
+	@Override
 	public void unlock() {
 		throw new UnsupportedOperationException();
 	}
 
+	@Override
 	public boolean locked() {
 		return true;
 	}
 
+	@Override
 	public int compareTo(Object arg0) {
 		throw new UnsupportedOperationException();
 	}

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/ArgumentBindingTests.java

@@ -84,6 +84,7 @@ public interface ITransactionalBean {
 
 	public static class TransactionalBean implements ITransactionalBean {
 
+		@Override
 		@Transactional
 		public void doInTransaction() {
 		}

spring-aop/src/test/java/org/springframework/aop/aspectj/annotation/AspectProxyFactoryTests.java

@@ -111,6 +111,7 @@ public static class TestBean implements ITestBean {
 
 		private int age;
 
+		@Override
 		public int getAge() {
 			return age;
 		}

spring-aop/src/test/java/org/springframework/aop/aspectj/autoproxy/AspectJPrecedenceComparatorTests.java

@@ -194,6 +194,7 @@ private Advisor createAspectJAdvice(int advisorOrder, int adviceDeclarationOrder
 
 	private Advisor createSpringAOPAfterAdvice(int order) {
 		AfterReturningAdvice advice = new AfterReturningAdvice() {
+			@Override
 			public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable {
 			}
 		};

spring-aop/src/test/java/org/springframework/aop/framework/AopProxyUtilsTests.java

@@ -129,6 +129,7 @@ public void testProxiedUserInterfacesWithMultipleInterfaces() {
 	public void testProxiedUserInterfacesWithNoInterface() {
 		Object proxy = Proxy.newProxyInstance(getClass().getClassLoader(), new Class[0],
 				new InvocationHandler() {
+					@Override
 					public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
 						return null;
 					}