Merge branch '2.6.x' into 2.7.x

Closes gh-32103
pull/32861/head
Stephane Nicoll 2 years ago
commit 3fcfcc4a3b

@ -234,7 +234,7 @@ public class AutoConfigurationImportSelector implements DeferredImportSelector,
protected Set<String> getExclusions(AnnotationMetadata metadata, AnnotationAttributes attributes) {
Set<String> excluded = new LinkedHashSet<>();
excluded.addAll(asList(attributes, "exclude"));
excluded.addAll(Arrays.asList(attributes.getStringArray("excludeName")));
excluded.addAll(asList(attributes, "excludeName"));
excluded.addAll(getExcludeAutoConfigurationsProperty());
return excluded;
}

Loading…
Cancel
Save