BATCH-2161 ScopeConfiguration methods should be static

The scope bean factory methods in ScopeConfiguration are
BeanFactoryPostProcessors and should therefore be static.

 - Declare the scope beans in ScopeConfiguration as static

Issue: BATCH-2161

(cherry picked from commit 1e938e3)

Author: marschall

spring-batch-core/src/main/java/org/springframework/batch/core/configuration/annotation/AbstractBatchConfiguration.java

@@ -126,19 +126,18 @@ protected BatchConfigurer getConfigurer(Collection<BatchConfigurer> configurers)
 @Configuration
 class ScopeConfiguration {
 
-	private StepScope stepScope = new StepScope();
-
-	private JobScope jobScope = new JobScope();
-
 	@Bean
-	public StepScope stepScope() {
+	public static StepScope stepScope() {
+		StepScope stepScope = new StepScope();
 		stepScope.setAutoProxy(false);
 		return stepScope;
 	}
 
 	@Bean
-	public JobScope jobScope() {
+	public static JobScope jobScope() {
+		JobScope jobScope = new JobScope();
 		jobScope.setAutoProxy(false);
 		return jobScope;
 	}
+
 }