From e9701a9ce3566a2d06da6db37e289fa8d67048c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deleuze?=
 <141109+sdeleuze@users.noreply.github.com>
Date: Mon, 10 Mar 2025 12:13:58 +0100
Subject: [PATCH] Remove support for Aware interfaces in BeanRegistrar

Closes gh-34562
---
 .../context/annotation/ConfigurationClassParser.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
index 54250ee20a6..f23c077e7fe 100644
--- a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
+++ b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
@@ -39,6 +39,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.BeanRegistrar;
 import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
@@ -600,9 +601,7 @@ class ConfigurationClassParser {
 					}
 					else if (candidate.isAssignable(BeanRegistrar.class)) {
 						Class<?> candidateClass = candidate.loadClass();
-						BeanRegistrar registrar =
-								ParserStrategyUtils.instantiateClass(candidateClass, BeanRegistrar.class,
-										this.environment, this.resourceLoader, this.registry);
+						BeanRegistrar registrar = (BeanRegistrar) BeanUtils.instantiateClass(candidateClass);
 						configClass.addBeanRegistrar(registrar);
 					}
 					else if (candidate.isAssignable(ImportBeanDefinitionRegistrar.class)) {