Merge branch '2.7.x'

Closes gh-32104
pull/32112/head
Stephane Nicoll 2 years ago
commit 4823b8ef7b

@ -235,7 +235,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…
Cancel
Save