Renamed 'name' attribute to 'scopeName' (in order to avoid common override conflicts)

Issue: SPR-13239

spring-context/src/main/java/org/springframework/context/annotation/Scope.java

@@ -58,10 +58,10 @@ import org.springframework.core.annotation.AliasFor;
 public @interface Scope {
 
 	/**
-	 * Alias for {@link #name}.
-	 * @see #name
+	 * Alias for {@link #scopeName}.
+	 * @see #scopeName
 	 */
-	@AliasFor(attribute = "name")
+	@AliasFor(attribute = "scopeName")
 	String value() default "";
 
 	/**
@@ -76,7 +76,7 @@ public @interface Scope {
 	 * @see #value
 	 */
 	@AliasFor(attribute = "value")
-	String name() default "";
+	String scopeName() default "";
 
 	/**
 	 * Specifies whether a component should be configured as a scoped proxy

spring-context/src/test/java/org/springframework/context/annotation/AnnotationScopeMetadataResolverTests.java

@@ -44,6 +44,7 @@ public class AnnotationScopeMetadataResolverTests {
 
 	private AnnotationScopeMetadataResolver scopeMetadataResolver = new AnnotationScopeMetadataResolver();
 
+
 	@Test
 	public void resolveScopeMetadataShouldNotApplyScopedProxyModeToSingleton() {
 		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnnotatedWithSingletonScope.class);
@@ -65,7 +66,6 @@ public class AnnotationScopeMetadataResolverTests {
 
 	@Test
 	public void resolveScopeMetadataShouldReadScopedProxyModeFromAnnotation() {
-		this.scopeMetadataResolver = new AnnotationScopeMetadataResolver();
 		AnnotatedBeanDefinition bd = new AnnotatedGenericBeanDefinition(AnnotatedWithScopedProxy.class);
 		ScopeMetadata scopeMetadata = this.scopeMetadataResolver.resolveScopeMetadata(bd);
 		assertNotNull("resolveScopeMetadata(..) must *never* return null.", scopeMetadata);
@@ -133,6 +133,7 @@ public class AnnotationScopeMetadataResolverTests {
 	@Retention(RetentionPolicy.RUNTIME)
 	@Scope("request")
 	@interface CustomRequestScopeWithAttributeOverride {
+
 		ScopedProxyMode proxyMode();
 	}
 
@@ -144,7 +145,7 @@ public class AnnotationScopeMetadataResolverTests {
 	private static class AnnotatedWithPrototypeScope {
 	}
 
-	@Scope(name = "request", proxyMode = TARGET_CLASS)
+	@Scope(scopeName = "request", proxyMode = TARGET_CLASS)
 	private static class AnnotatedWithScopedProxy {
 	}
 

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java

@@ -787,7 +787,7 @@ public class ConfigurationClassPostProcessorTests {
 	public static class ScopedProxyRepositoryConfiguration {
 
 		@Bean
-		@Scope(name = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
+		@Scope(scopeName = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
 		public Repository<String> stringRepo() {
 			return new Repository<String>() {
 				@Override
@@ -798,7 +798,7 @@ public class ConfigurationClassPostProcessorTests {
 		}
 
 		@Bean
-		@Scope(name = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
+		@Scope(scopeName = "prototype", proxyMode = ScopedProxyMode.TARGET_CLASS)
 		public Repository<Integer> integerRepo() {
 			return new Repository<Integer>() {
 				@Override

spring-test/src/test/java/org/springframework/test/web/servlet/samples/spr/RequestContextHolderTests.java

@@ -143,13 +143,13 @@ public class RequestContextHolderTests {
 		}
 
 		@Bean
-		@Scope(name = "request", proxyMode = ScopedProxyMode.TARGET_CLASS)
+		@Scope(scopeName = "request", proxyMode = ScopedProxyMode.TARGET_CLASS)
 		public RequestScopedController requestScopedController() {
 			return new RequestScopedController();
 		}
 
 		@Bean
-		@Scope(name = "request", proxyMode = ScopedProxyMode.TARGET_CLASS)
+		@Scope(scopeName = "request", proxyMode = ScopedProxyMode.TARGET_CLASS)
 		public RequestScopedService requestScopedService() {
 			return new RequestScopedService();
 		}
@@ -160,7 +160,7 @@ public class RequestContextHolderTests {
 		}
 
 		@Bean
-		@Scope(name = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
+		@Scope(scopeName = "session", proxyMode = ScopedProxyMode.TARGET_CLASS)
 		public SessionScopedService sessionScopedService() {
 			return new SessionScopedService();
 		}