Skip to content

Commit

Permalink
Javadoc: @componentscan is subject to @conditional as well
Browse files Browse the repository at this point in the history
Issue: SPR-11579
  • Loading branch information
jhoeller committed Mar 21, 2014
1 parent 929e9ca commit 3aff973
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -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");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -38,8 +38,8 @@
* </ul>
*
* <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
* will be subject to the conditions.
* {@code @Bean} methods, {@link Import @Import} and {@link ComponentScan @ComponentScan}
* annotations associated with that class will be subject to the conditions.
*
* <p>NOTE: {@code @Conditional} annotations are not inherited; any conditions from
* superclasses or from overridden methods are not being considered.
Expand Down

0 comments on commit 3aff973

Please sign in to comment.