Update JavaDoc for @BootstrapWith regarding local override

sbrannen · sbrannen · commit 50dc8c2358b5 · 2018-08-15T17:17:24.000+02:00
Issue: SPR-17006
diff --git a/spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java b/spring-test/src/main/java/org/springframework/test/context/BootstrapWith.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2018 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.
@@ -28,7 +28,10 @@
  * how to bootstrap the <em>Spring TestContext Framework</em>.
  *
  * <p>This annotation may also be used as a <em>meta-annotation</em> to create
- * custom <em>composed annotations</em>.
+ * custom <em>composed annotations</em>. As of Spring Framework 5.1, a locally
+ * declared {@code @BootstrapWith} annotation (i.e., one that is <em>directly
+ * present</em> on the current test class) will override any meta-present
+ * declarations of {@code @BootstrapWith}.
  *
  * @author Sam Brannen
  * @since 4.1

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright 2002-2016 the original author or authors.`
	`2`	`+ * Copyright 2002-2018 the original author or authors.`
`3`	`3`	`*`
`4`	`4`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`5`	`5`	`* you may not use this file except in compliance with the License.`
`@@ -28,7 +28,10 @@`
`28`	`28`	`* how to bootstrap the <em>Spring TestContext Framework</em>.`
`29`	`29`	`*`
`30`	`30`	`* <p>This annotation may also be used as a <em>meta-annotation</em> to create`
`31`		`- * custom <em>composed annotations</em>.`
	`31`	`+ * custom <em>composed annotations</em>. As of Spring Framework 5.1, a locally`
	`32`	`+ * declared {@code @BootstrapWith} annotation (i.e., one that is <em>directly`
	`33`	`+ * present</em> on the current test class) will override any meta-present`
	`34`	`+ * declarations of {@code @BootstrapWith}.`
`32`	`35`	`*`
`33`	`36`	`* @author Sam Brannen`
`34`	`37`	`* @since 4.1`