From e50db8c8c510f6f23f98a06905d93376fc4600b9 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@vmware.com>
Date: Thu, 4 Aug 2022 09:37:17 +0200
Subject: [PATCH] Make sure that ImportAwareAotBeanPostProcessor has role
 infrastructure

See gh-28915
---
 .../context/annotation/ConfigurationClassPostProcessor.java     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
index 690ea75053b..1419c1d40a2 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
@@ -568,6 +568,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
 					MAPPINGS_VARIABLE, type, from));
 			builder.addStatement("$T $L = new $T($T.class)", RootBeanDefinition.class,
 					BEAN_DEFINITION_VARIABLE, RootBeanDefinition.class, ImportAwareAotBeanPostProcessor.class);
+			builder.addStatement("$L.setRole($T.ROLE_INFRASTRUCTURE)",
+					BEAN_DEFINITION_VARIABLE, BeanDefinition.class);
 			builder.addStatement("$L.setInstanceSupplier(() -> new $T($L))",
 					BEAN_DEFINITION_VARIABLE, ImportAwareAotBeanPostProcessor.class, MAPPINGS_VARIABLE);
 			builder.addStatement("$L.registerBeanDefinition($S, $L)",