From 3477738bed64f0cda2952eee787a267e89b0569d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Wed, 28 Feb 2024 15:49:05 +0100
Subject: [PATCH] Consistently pick lowest superclass level to replace

See gh-28676
---
 .../context/annotation/ConfigurationClassParser.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 95388cc6b5..30ce91b1d8 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
@@ -478,7 +478,7 @@ class ConfigurationClassParser {
 				if (entry.getValue().isEmpty()) {
 					it.remove();
 				}
-				else if (replace) {
+				else if (replace && replacingClass == null) {
 					replacedSuperclass = entry.getKey();
 					replacingClass = entry.getValue().get(0);
 				}