Skip to content

Commit af75c6d

Browse files
committed
Consistent ROLE_INFRASTRUCTURE declarations for configuration classes
Closes gh-24509
1 parent d12619c commit af75c6d

File tree

6 files changed

+12
-6
lines changed

6 files changed

+12
-6
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-2018 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.
@@ -37,6 +37,7 @@
3737
* @see org.springframework.scheduling.annotation.ProxyAsyncConfiguration
3838
*/
3939
@Configuration
40+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
4041
public class AspectJAsyncConfiguration extends AbstractAsyncConfiguration {
4142

4243
@Bean(name = TaskManagementConfigUtils.ASYNC_EXECUTION_ASPECT_BEAN_NAME)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2018 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 TransactionManagementConfigurationSelector
3737
*/
3838
@Configuration
39+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
3940
public class AspectJJtaTransactionManagementConfiguration extends AspectJTransactionManagementConfiguration {
4041

4142
@Bean(name = TransactionManagementConfigUtils.JTA_TRANSACTION_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-2018 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.
@@ -38,6 +38,7 @@
3838
* @see AspectJJtaTransactionManagementConfiguration
3939
*/
4040
@Configuration
41+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
4142
public class AspectJTransactionManagementConfiguration extends AbstractTransactionManagementConfiguration {
4243

4344
@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-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

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-2018 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.
@@ -50,6 +50,7 @@
5050
* @see EnableMBeanExport
5151
*/
5252
@Configuration
53+
@Role(BeanDefinition.ROLE_INFRASTRUCTURE)
5354
public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, BeanFactoryAware {
5455

5556
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-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)