Merge branch '5.3.x'

spring-context/src/test/java/org/springframework/context/support/GenericApplicationContextTests.java

@@ -262,9 +262,13 @@ class GenericApplicationContextTests {
 		resource = context.getResource(fileLocation);
 		assertThat(resource).isInstanceOf(FileUrlResource.class);
 
-		if (OS.WINDOWS.isCurrentOs()) {
-			// On Windows we expect an error similar to the following.
-			// java.nio.file.InvalidPathException: Illegal char <:> at index 4: ping:foo
+		// If we are using a FileSystemResourceLoader on Windows, we expect an error
+		// similar to the following since "ping:foo" is not a valid file name in the
+		// Windows file system and since the PingPongProtocolResolver has not yet been
+		// registered.
+		//
+		// java.nio.file.InvalidPathException: Illegal char <:> at index 4: ping:foo
+		if (resourceLoader instanceof FileSystemResourceLoader && OS.WINDOWS.isCurrentOs()) {
 			assertThatExceptionOfType(InvalidPathException.class)
 				.isThrownBy(() -> context.getResource(pingLocation))
 				.withMessageContaining(pingLocation);

spring-core/src/main/java/org/springframework/cglib/beans/BulkBean.java

@@ -15,11 +15,7 @@
  */
 package org.springframework.cglib.beans;
 
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.security.ProtectionDomain;
-import java.util.*;
 import org.springframework.cglib.core.*;
 import org.springframework.asm.ClassVisitor;
 

spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanEmitter.java

@@ -15,10 +15,8 @@
  */
 package org.springframework.cglib.beans;
 
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.util.*;
 import org.springframework.cglib.core.*;
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Type;

spring-core/src/main/java/org/springframework/cglib/beans/BulkBeanException.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.cglib.beans;
 
-import org.springframework.cglib.core.CodeGenerationException;
-
 @SuppressWarnings({"rawtypes", "unchecked", "serial"})
 public class BulkBeanException extends RuntimeException
 {

spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java

@@ -35,7 +35,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import org.springframework.asm.Attribute;
 import org.springframework.asm.Type;
 
 /**
@@ -562,10 +561,6 @@ public class ReflectUtils {
 			public Type[] getExceptionTypes() {
 				return ReflectUtils.getExceptionTypes(member);
 			}
-
-			public Attribute getAttribute() {
-				return null;
-			}
 		};
 	}
 

spring-core/src/main/java/org/springframework/cglib/proxy/Enhancer.java

@@ -1247,7 +1247,6 @@ public class Enhancer extends AbstractClassGenerator {
 		se.invoke_constructor(THREAD_LOCAL, CSTRUCT_NULL);
 		se.putfield(THREAD_CALLBACKS_FIELD);
 
-		final Object[] state = new Object[1];
 		CallbackGenerator.Context context = new CallbackGenerator.Context() {
 			public ClassLoader getClassLoader() {
 				return Enhancer.this.getClassLoader();

src/eclipse/org.eclipse.jdt.core.prefs

@@ -44,7 +44,7 @@ org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=info
 org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
 org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
 org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning