Skip to content

S
spring-boot
Commit cf7f59fe authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '2.4.x' 

Closes gh-25762
parents 5dee68c9 5ff7d3bc
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 13 deletions
src/checkstyle/import-control.xml
View file @ cf7f59fe
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd"> <!DOCTYPE import-control PUBLIC "-//Checkstyle//DTD ImportControl Configuration 1.4//EN" "https://checkstyle.org/dtds/import_control_1_4.dtd">
<import-control pkg="org.springframework.boot"> <import-control pkg="org.springframework.boot">
<disallow pkg="io.micrometer" />
<allow pkg=".*" regex="true" /> <allow pkg=".*" regex="true" />
<subpackage name="autoconfigure"> <subpackage name="autoconfigure">
<disallow class="org.springframework.boot.autoconfigure.jdbc.DataSourceProperties"/> <disallow class="org.springframework.boot.autoconfigure.jdbc.DataSourceProperties"/>
<subpackage name="web"> <subpackage name="web">
...@@ -39,22 +39,29 @@ ...@@ -39,22 +39,29 @@
</subpackage> </subpackage>
</subpackage> </subpackage>
<!-- Endpoint infrastructure --> <subpackage name="actuate">
<subpackage name="actuate.endpoint"> <allow pkg="io.micrometer" />
<disallow pkg="org.springframework.http" /> <!-- Endpoint infrastructure -->
<disallow pkg="org.springframework.web" /> <subpackage name="endpoint">
<subpackage name="web"> <disallow pkg="org.springframework.http" />
<allow pkg="org.springframework.http" /> <disallow pkg="org.springframework.web" />
<allow pkg="org.springframework.web" /> <subpackage name="web">
<subpackage name="servlet"> <allow pkg="org.springframework.http" />
<disallow pkg="org.springframework.web.reactive" /> <allow pkg="org.springframework.web" />
</subpackage> <subpackage name="servlet">
<subpackage name="reactive"> <disallow pkg="org.springframework.web.reactive" />
<disallow pkg="org.springframework.web.servlet" /> </subpackage>
<subpackage name="reactive">
<disallow pkg="org.springframework.web.servlet" />
</subpackage>
</subpackage> </subpackage>
</subpackage> </subpackage>
</subpackage> </subpackage>
<subpackage name="docs.actuate">
<allow pkg="io.micrometer" />
</subpackage>
<!-- Logging --> <!-- Logging -->
<subpackage name="logging"> <subpackage name="logging">
<disallow pkg="org.springframework.context" /> <disallow pkg="org.springframework.context" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment