Merge branch '6.0.x'

sbrannen · sbrannen · commit 7162faaa4d94 · 2023-07-06T17:30:02.000+02:00
diff --git a/spring-test/src/main/java/org/springframework/test/context/ContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/ContextCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2023 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.
@@ -25,7 +25,8 @@
  *
  * <p>Customizers are created by {@link ContextCustomizerFactory} implementations.
  *
- * <p>Implementations must implement correct {@code equals} and {@code hashCode}
+ * <p><strong>WARNING</strong>: implementations must implement correct
+ * {@link Object#equals(Object) equals} and {@link Object#hashCode() hashCode}
  * methods since customizers form part of the {@link MergedContextConfiguration}
  * which is used as a cache key.
  *

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-2023 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.`
`@@ -25,7 +25,8 @@`
`25`	`25`	`*`
`26`	`26`	`* <p>Customizers are created by {@link ContextCustomizerFactory} implementations.`
`27`	`27`	`*`
`28`		`- * <p>Implementations must implement correct {@code equals} and {@code hashCode}`
	`28`	`+ * <p><strong>WARNING</strong>: implementations must implement correct`
	`29`	`+ * {@link Object#equals(Object) equals} and {@link Object#hashCode() hashCode}`
`29`	`30`	`* methods since customizers form part of the {@link MergedContextConfiguration}`
`30`	`31`	`* which is used as a cache key.`
`31`	`32`	`*`