Skip to content

Commit ef1be17

Browse files
committed
Consistent ROLE_INFRASTRUCTURE declarations for configuration classes
Closes gh-24509
1 parent 2dcce8c commit ef1be17

File tree

5 files changed

+10
-5
lines changed

5 files changed

+10
-5
lines changed

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

Lines changed: 2 additions & 1 deletion
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)

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

Lines changed: 2 additions & 1 deletion
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)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2016 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.
@@ -40,6 +40,7 @@
4040
* @see ConfigurableApplicationContext#LOAD_TIME_WEAVER_BEAN_NAME
4141
*/
4242
@Configuration
43+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
4344
public class LoadTimeWeavingConfiguration implements ImportAware, BeanClassLoaderAware {
4445

4546
private AnnotationAttributes enableLTW;

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

Lines changed: 2 additions & 1 deletion
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.
@@ -47,6 +47,7 @@
4747
* @see EnableMBeanExport
4848
*/
4949
@Configuration
50+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
5051
public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, BeanFactoryAware {
5152

5253
private static final String MBEAN_EXPORTER_BEAN_NAME = "mbeanExporter";

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2015 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)