diff --git a/build.gradle b/build.gradle
index a605529c44..07deaed1b5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,6 +46,7 @@ apply plugin: 'idea'
 
 configure(javaProjects) {
     apply plugin: 'idea'
+    apply plugin: 'eclipse'
     ideaModule {
         downloadJavadoc=false
         excludeDirs.add(buildDir)
diff --git a/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java
index a6380329ba..0d774b6266 100755
--- a/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java
+++ b/core/src/main/java/org/springframework/security/authentication/AuthenticationDetailsSourceImpl.java
@@ -18,7 +18,7 @@ import java.lang.reflect.Constructor;
  * @deprecated Write an implementation of AuthenticationDetailsSource which returns the desired type directly.
  */
 @Deprecated
-public class AuthenticationDetailsSourceImpl implements AuthenticationDetailsSource {
+public class AuthenticationDetailsSourceImpl implements AuthenticationDetailsSource<Object, Object> {
     //~ Instance fields ================================================================================================
 
     private Class<?> clazz = AuthenticationDetails.class;
diff --git a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java
index 11a9e5e04d..9b5f296c33 100644
--- a/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java
+++ b/itest/context/src/main/java/org/springframework/security/integration/python/PythonInterpreterPreInvocationAdvice.java
@@ -21,7 +21,6 @@ import org.springframework.util.ClassUtils;
 public class PythonInterpreterPreInvocationAdvice implements PreInvocationAuthorizationAdvice{
     private final ParameterNameDiscoverer parameterNameDiscoverer = new LocalVariableTableParameterNameDiscoverer();
 
-    @SuppressWarnings("deprecation")
     public boolean before(Authentication authentication, MethodInvocation mi, PreInvocationAttribute preAttr) {
         PythonInterpreterPreInvocationAttribute pythonAttr = (PythonInterpreterPreInvocationAttribute) preAttr;
         String script = pythonAttr.getScript();
diff --git a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java
index 049f29de8c..a94cddd9c7 100755
--- a/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/preauth/websphere/WebSphere2SpringSecurityPropagationInterceptor.java
@@ -78,7 +78,7 @@ public class WebSphere2SpringSecurityPropagationInterceptor implements MethodInt
     /**
      * @param authenticationDetailsSource The authenticationDetailsSource to set.
      */
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource authenticationDetailsSource) {
+    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<?,?> authenticationDetailsSource) {
         this.authenticationDetailsSource = authenticationDetailsSource;
     }
 }
diff --git a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
index 4ea541fede..0e952ac273 100644
--- a/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
+++ b/web/src/main/java/org/springframework/security/web/authentication/switchuser/SwitchUserFilter.java
@@ -372,7 +372,7 @@ public class SwitchUserFilter extends GenericFilterBean implements ApplicationEv
         this.eventPublisher = eventPublisher;
     }
 
-    public void setAuthenticationDetailsSource(AuthenticationDetailsSource authenticationDetailsSource) {
+    public void setAuthenticationDetailsSource(AuthenticationDetailsSource<HttpServletRequest,?> authenticationDetailsSource) {
         Assert.notNull(authenticationDetailsSource, "AuthenticationDetailsSource required");
         this.authenticationDetailsSource = authenticationDetailsSource;
     }
diff --git a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
index 79cbba3afb..147247c71b 100644
--- a/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
+++ b/web/src/test/java/org/springframework/security/web/authentication/rememberme/AbstractRememberMeServicesTests.java
@@ -27,6 +27,7 @@ import org.springframework.util.StringUtils;
 /**
  * @author Luke Taylor
  */
+@SuppressWarnings("unchecked")
 public class AbstractRememberMeServicesTests {
     static User joe = new User("joe", "password", true, true,true,true, AuthorityUtils.createAuthorityList("ROLE_A"));
 
@@ -35,7 +36,7 @@ public class AbstractRememberMeServicesTests {
         new MockRememberMeServices().decodeCookie("nonBase64CookieValue%");
     }
 
-    @Test
+	@Test
     public void setAndGetAreConsistent() throws Exception {
         MockRememberMeServices services = new MockRememberMeServices();
         assertNotNull(services.getCookieName());