Merge branch 'gh-30358'

src/checkstyle/import-control.xml

@@ -93,6 +93,9 @@
 		</subpackage>
 		<subpackage name="server">
 			<disallow pkg="org.springframework.context" />
+			<subpackage name="context">
+				<allow pkg="org.springframework.context" />
+			</subpackage>
 		</subpackage>
 		<subpackage name="context">
 			<allow pkg="org.springframework.boot.web.server" />