Skip to content

Commit f90acdf

Browse files
committed
Consistent ROLE_INFRASTRUCTURE declarations for configuration classes
Closes gh-24509
1 parent 844619c commit f90acdf

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

Diff for: spring-aspects/src/main/java/org/springframework/scheduling/aspectj/AspectJAsyncConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -36,6 +36,7 @@
3636
* @see org.springframework.scheduling.annotation.ProxyAsyncConfiguration
3737
*/
3838
@Configuration
39+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
3940
public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {
4041

4142
@Bean(name = TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)

Diff for: spring-aspects/src/main/java/org/springframework/transaction/aspectj/AspectJTransactionManagementConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2014 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
3535
* @see TransactionManagementConfigurationSelector
3636
*/
3737
@Configuration
38+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
3839
public class AspectJTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
3940

4041
@Bean(name = TransactionManagementConfigUtils.TRANSACTION_ASPECT_BEAN_NAME)

Diff for: spring-context/src/main/java/org/springframework/context/annotation/LoadTimeWeavingConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@
4242
* @see ConfigurableApplicationContext#LOAD_TIME_WEAVER_BEAN_NAME
4343
*/
4444
@Configuration
45+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
4546
public class LoadTimeWeavingConfiguration implements ImportAware, BeanClassLoaderAware {
4647

4748
@Nullable

Diff for: spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@
4949
* @see EnableMBeanExport
5050
*/
5151
@Configuration
52+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
5253
public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, BeanFactoryAware {
5354

5455
private static final String MBEAN_EXPORTER_BEAN_NAME = "mbeanExporter";

Diff for: spring-tx/src/main/java/org/springframework/transaction/annotation/ProxyTransactionManagementConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@
3535
* @see TransactionManagementConfigurationSelector
3636
*/
3737
@Configuration
38+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
3839
public class ProxyTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
3940

4041
@Bean(name = TransactionManagementConfigUtils.TRANSACTION_ADVISOR_BEAN_NAME)

0 commit comments

Comments
 (0)