diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java index 0c4f43660c4..340348cc014 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/ComponentScan.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2015 the original author or authors. + * Copyright 2002-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -127,10 +127,13 @@ public @interface ComponentScan { /** * Specifies which types are eligible for component scanning. - *

Further narrows the set of candidate components from everything in - * {@link #basePackages} to everything in the base packages that matches - * the given filter or filters. - * @see #resourcePattern + *

Further narrows the set of candidate components from everything in {@link #basePackages} + * to everything in the base packages that matches the given filter or filters. + *

Note that these filters will be applied in addition to the default filters, if specified. + * Any type under the specified base packages which matches a given filter will be included, + * even if it does not match the default filters (i.e. is not annotated with {@code @Component}). + * @see #resourcePattern() + * @see #useDefaultFilters() */ Filter[] includeFilters() default {}; diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd index a70b8097c14..ad9700246ef 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.2.xsd @@ -235,6 +235,9 @@ diff --git a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd index b10438f0512..0a3c1952e03 100644 --- a/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd +++ b/spring-context/src/main/resources/org/springframework/context/config/spring-context-4.3.xsd @@ -235,6 +235,9 @@