root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Javadoc: @ComponentScan is subject to @Conditional as well 

Issue: SPR-11579
This commit is contained in:
Juergen Hoeller 2014-03-21 14:32:57 +01:00
parent 929e9ca401
commit 3aff973d13
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/context/annotation/Conditional.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -38,8 +38,8 @@ import java.lang.annotation.Target;
* </ul> * </ul>
* *
* <p>If a {@code @Configuration} class is marked with {@code @Conditional}, all of the * <p>If a {@code @Configuration} class is marked with {@code @Conditional}, all of the
* {@code @Bean} methods and {@link Import @Import} annotations associated with that class * {@code @Bean} methods, {@link Import @Import} and {@link ComponentScan @ComponentScan}
* will be subject to the conditions. * annotations associated with that class will be subject to the conditions.
* *
* <p>NOTE: {@code @Conditional} annotations are not inherited; any conditions from * <p>NOTE: {@code @Conditional} annotations are not inherited; any conditions from
* superclasses or from overridden methods are not being considered. * superclasses or from overridden methods are not being considered.