From fbdebc1bd6a8cdebbe599db580c6682ea9360e79 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Wed, 26 Feb 2014 14:05:26 +0100
Subject: [PATCH] Clean up warnings that show up in Gradle build

---
 .../org/springframework/cache/config/SomeKeyGenerator.java    | 4 ++--
 .../aop/framework/autoproxy/AutoProxyCreatorTests.java        | 3 +++
 .../org/springframework/cache/config/SomeKeyGenerator.java    | 4 ++--
 .../context/annotation/BeanMethodPolymorphismTests.java       | 4 ++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
index b4cc29458b..610d190e09 100644
--- a/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
+++ b/spring-aspects/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -18,6 +18,6 @@ package org.springframework.cache.config;
 
 import org.springframework.cache.interceptor.DefaultKeyGenerator;
 
+@SuppressWarnings("deprecation")
 public class SomeKeyGenerator extends DefaultKeyGenerator {
-
 }
diff --git a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
index 36dad8856b..11437b31fb 100644
--- a/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
+++ b/spring-context/src/test/java/org/springframework/aop/framework/autoproxy/AutoProxyCreatorTests.java
@@ -50,6 +50,7 @@ import static org.junit.Assert.*;
  * @author Chris Beams
  * @since 09.12.2003
  */
+@SuppressWarnings("resource")
 public final class AutoProxyCreatorTests {
 
 	@Test
@@ -352,6 +353,7 @@ public final class AutoProxyCreatorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class FallbackTestAutoProxyCreator extends TestAutoProxyCreator {
 
 		public FallbackTestAutoProxyCreator() {
@@ -381,6 +383,7 @@ public final class AutoProxyCreatorTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class ContainerCallbackInterfacesOnly  // as well as an empty marker interface
 			implements BeanFactoryAware, ApplicationContextAware, InitializingBean, DisposableBean, Serializable {
 
diff --git a/spring-context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java b/spring-context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
index 7c1571f39b..610d190e09 100644
--- a/spring-context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
+++ b/spring-context/src/test/java/org/springframework/cache/config/SomeKeyGenerator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -18,6 +18,6 @@ package org.springframework.cache.config;
 
 import org.springframework.cache.interceptor.DefaultKeyGenerator;
 
+@SuppressWarnings("deprecation")
 public class SomeKeyGenerator extends DefaultKeyGenerator {
-
 }
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
index e05dd44b0c..fa8f811146 100644
--- a/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
+++ b/spring-context/src/test/java/org/springframework/context/annotation/BeanMethodPolymorphismTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -20,7 +20,6 @@ import java.util.List;
 
 import org.junit.Test;
 
-import org.springframework.aop.Pointcut;
 import org.springframework.aop.aspectj.annotation.AnnotationAwareAspectJAutoProxyCreator;
 import org.springframework.aop.interceptor.SimpleTraceInterceptor;
 import org.springframework.aop.support.DefaultPointcutAdvisor;
@@ -255,6 +254,7 @@ public class BeanMethodPolymorphismTests {
 	}
 
 
+	@SuppressWarnings("serial")
 	public static class TestAdvisor extends DefaultPointcutAdvisor {
 
 		public TestAdvisor() {