Merge branch '5.2.x'

# Conflicts:
#	build.gradle

build.gradle

@@ -117,7 +117,7 @@ configure(allprojects) { project ->
 			dependency "net.sf.ehcache:ehcache:2.10.6"
 			dependency "org.ehcache:jcache:1.0.1"
 			dependency "org.ehcache:ehcache:3.4.0"
-			dependency "org.hibernate:hibernate-core:5.4.20.Final"
+			dependency "org.hibernate:hibernate-core:5.4.21.Final"
 			dependency "org.hibernate:hibernate-validator:6.1.5.Final"
 			dependency "org.webjars:webjars-locator-core:0.45"
 			dependency "org.webjars:underscorejs:1.8.3"
@@ -202,7 +202,7 @@ configure(allprojects) { project ->
 			dependency("net.sourceforge.htmlunit:htmlunit:2.43.0") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
-			dependency("org.seleniumhq.selenium:htmlunit-driver:2.43.0") {
+			dependency("org.seleniumhq.selenium:htmlunit-driver:2.43.1") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.seleniumhq.selenium:selenium-java:3.141.59") {

spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java

@@ -35,6 +35,7 @@ public class BeanEntry implements ParseState.Entry {
 		this.beanDefinitionName = beanDefinitionName;
 	}
 
+
 	@Override
 	public String toString() {
 		return "Bean '" + this.beanDefinitionName + "'";

spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java

@@ -200,9 +200,9 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * Factory method for creating the {@link GenericApplicationContext} used by
 	 * this {@code ContextLoader}.
 	 * <p>The default implementation creates a {@code GenericApplicationContext}
-	 * using the default constructor. This method may be overridden in subclasses
-	 * &mdash; for example, to create a {@code GenericApplicationContext} with
-	 * a custom {@link DefaultListableBeanFactory} implementation.
+	 * using the default constructor. This method may get overridden e.g. to use
+	 * a custom context subclass or to create a {@code GenericApplicationContext}
+	 * with a custom {@link DefaultListableBeanFactory} implementation.
 	 * @return a newly instantiated {@code GenericApplicationContext}
 	 * @since 5.2.9
 	 */