From 71e70aed14e7200425ee34e85c65d033bdeb6b73 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 27 Aug 2020 17:13:33 +0200 Subject: [PATCH 1/2] Polishing --- .../springframework/beans/factory/parsing/BeanEntry.java | 1 + .../test/context/support/AbstractGenericContextLoader.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java b/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java index b1fded25d1..ccba6d76e6 100644 --- a/spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java +++ b/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 + "'"; diff --git a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java b/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java index 8b31ed1873..8794ec49f4 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/AbstractGenericContextLoader.java +++ b/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}. *

The default implementation creates a {@code GenericApplicationContext} - * using the default constructor. This method may be overridden in subclasses - * — 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 */ From 387eddcf7598e5b7d488381d5e9070ded1611aa4 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 27 Aug 2020 17:29:06 +0200 Subject: [PATCH 2/2] Upgrade to Hibernate ORM 5.4.21, HtmlUnit 2.43, AspectJ 1.9.6 --- build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index f79429b975..52586f08f9 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,7 @@ configure(allprojects) { project -> dependency "org.slf4j:slf4j-api:1.7.30" dependency "com.google.code.findbugs:jsr305:3.0.2" - dependencySet(group: 'org.aspectj', version: '1.9.5') { + dependencySet(group: 'org.aspectj', version: '1.9.6') { entry 'aspectjrt' entry 'aspectjtools' entry 'aspectjweaver' @@ -115,7 +115,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" @@ -194,10 +194,10 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.10.0" - dependency("net.sourceforge.htmlunit:htmlunit:2.42.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.43.0") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.seleniumhq.selenium:htmlunit-driver:2.42.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") {