From 9ccd1f07268a913fbf620758802edde72f75f40c Mon Sep 17 00:00:00 2001
From: Yanming Zhou <zhouyanming@gmail.com>
Date: Wed, 21 May 2025 09:35:01 +0800
Subject: [PATCH 1/2] Prevent that only org.springframework.core.ResolvableType
 is used

See gh-45635

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
---
 src/checkstyle/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index 6ec9f685df0..ffed3f357e4 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -16,7 +16,7 @@
 			<property name="illegalPkgs"
 				value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.core\.lang.*, ^io\.micrometer\.shaded.*, ^org\.jetbrains\.annotations.*, ^org\.testcontainers\.shaded.*" />
 			<property name="illegalClasses"
-				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert, ^(?!org\.springframework\.util\.).*ReflectionUtils"/>
+				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert, ^(?!org\.springframework\.util\.).*ReflectionUtils, ^(?!org\.springframework\.core\.).*ResolvableType"/>
 		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">

From 43e040e5b4020fd58daa968443529936b5e17ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= <stephane.nicoll@broadcom.com>
Date: Mon, 2 Jun 2025 16:22:15 +0200
Subject: [PATCH 2/2] Fix order of illegal classes

See gh-45635
---
 src/checkstyle/checkstyle.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/checkstyle/checkstyle.xml b/src/checkstyle/checkstyle.xml
index ffed3f357e4..60c8a4d6e5d 100644
--- a/src/checkstyle/checkstyle.xml
+++ b/src/checkstyle/checkstyle.xml
@@ -16,7 +16,7 @@
 			<property name="illegalPkgs"
 				value="^sun.*, ^org\.apache\.commons\.(?!compress|dbcp2|logging|pool2).*, ^com\.datastax\.oss\.driver\.shaded.*, ^com\.google\.common.*, ^io\.micrometer\.core\.lang.*, ^io\.micrometer\.shaded.*, ^org\.jetbrains\.annotations.*, ^org\.testcontainers\.shaded.*" />
 			<property name="illegalClasses"
-				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, ^reactor\.core\.support\.Assert, ^(?!org\.springframework\.util\.).*ReflectionUtils, ^(?!org\.springframework\.core\.).*ResolvableType"/>
+				value="^com\.hazelcast\.util\.Base64, ^org\.junit\.rules\.ExpectedException, ^org\.mockito\.InjectMocks, ^org\.slf4j\.LoggerFactory, ^org.springframework.context.annotation.ScannedGenericBeanDefinition, , ^(?!org\.springframework\.core\.).*ResolvableType, ^(?!org\.springframework\.util\.).*ReflectionUtils, ^reactor\.core\.support\.Assert"/>
 		</module>
 		<module
 			name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck">