mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.6.x' into 2.7.x
Closes gh-32103
This commit is contained in:
commit
3fcfcc4a3b
@ -234,7 +234,7 @@ public class AutoConfigurationImportSelector implements DeferredImportSelector,
|
|||||||
protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttributes attributes) {
|
protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttributes attributes) {
|
||||||
Set<String> excluded = new LinkedHashSet<>();
|
Set<String> excluded = new LinkedHashSet<>();
|
||||||
excluded.addAll(asList(attributes, "exclude"));
|
excluded.addAll(asList(attributes, "exclude"));
|
||||||
excluded.addAll(Arrays.asList(attributes.getStringArray("excludeName")));
|
excluded.addAll(asList(attributes, "excludeName"));
|
||||||
excluded.addAll(getExcludeAutoConfigurationsProperty());
|
excluded.addAll(getExcludeAutoConfigurationsProperty());
|
||||||
return excluded;
|
return excluded;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user