From c4c124b16d6752a89c7f588f1ec5daebbcd3c765 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 16 Mar 2022 11:19:57 +0100 Subject: [PATCH 1/3] Upgrade to Log4J 2.17.2, SLF4J 1.7.36, Netty 4.1.75, SmallRye Mutiny 1.4, Hibernate Validator 6.2.3, Mockito 4.4, HtmlUnit 2.59 --- build.gradle | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 111e6242d6a..654653cb803 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ configure(allprojects) { project -> dependencyManagement { imports { mavenBom "com.fasterxml.jackson:jackson-bom:2.12.6" - mavenBom "io.netty:netty-bom:4.1.74.Final" + mavenBom "io.netty:netty-bom:4.1.75.Final" mavenBom "io.projectreactor:reactor-bom:2020.0.17" mavenBom "io.r2dbc:r2dbc-bom:Arabba-SR12" mavenBom "io.rsocket:rsocket-bom:1.1.1" @@ -39,13 +39,13 @@ configure(allprojects) { project -> mavenBom "org.junit:junit-bom:5.8.2" } dependencies { - dependencySet(group: 'org.apache.logging.log4j', version: '2.17.1') { + dependencySet(group: 'org.apache.logging.log4j', version: '2.17.2') { entry 'log4j-api' entry 'log4j-core' entry 'log4j-jul' entry 'log4j-slf4j-impl' } - dependency "org.slf4j:slf4j-api:1.7.35" + dependency "org.slf4j:slf4j-api:1.7.36" dependency("com.google.code.findbugs:findbugs:3.0.1") { exclude group: "dom4j", name: "dom4j" } @@ -68,7 +68,7 @@ configure(allprojects) { project -> dependency "io.reactivex:rxjava-reactive-streams:1.2.1" dependency "io.reactivex.rxjava2:rxjava:2.2.21" dependency "io.reactivex.rxjava3:rxjava:3.1.3" - dependency "io.smallrye.reactive:mutiny:1.3.1" + dependency "io.smallrye.reactive:mutiny:1.4.0" dependency "io.projectreactor.tools:blockhound:1.0.6.RELEASE" dependency "com.caucho:hessian:4.0.63" @@ -124,7 +124,7 @@ configure(allprojects) { project -> dependency "org.ehcache:jcache:1.0.1" dependency "org.ehcache:ehcache:3.4.0" dependency "org.hibernate:hibernate-core:5.4.33.Final" - dependency "org.hibernate:hibernate-validator:6.2.2.Final" + dependency "org.hibernate:hibernate-validator:6.2.3.Final" dependency "org.webjars:webjars-locator-core:0.48" dependency "org.webjars:underscorejs:1.8.3" @@ -198,7 +198,7 @@ configure(allprojects) { project -> exclude group: "org.hamcrest", name: "hamcrest-core" } } - dependencySet(group: 'org.mockito', version: '4.3.1') { + dependencySet(group: 'org.mockito', version: '4.4.0') { entry('mockito-core') { exclude group: "org.hamcrest", name: "hamcrest-core" } @@ -206,10 +206,10 @@ configure(allprojects) { project -> } dependency "io.mockk:mockk:1.12.1" - dependency("net.sourceforge.htmlunit:htmlunit:2.58.0") { + dependency("net.sourceforge.htmlunit:htmlunit:2.59.0") { exclude group: "commons-logging", name: "commons-logging" } - dependency("org.seleniumhq.selenium:htmlunit-driver:2.58.0") { + dependency("org.seleniumhq.selenium:htmlunit-driver:2.59.0") { exclude group: "commons-logging", name: "commons-logging" } dependency("org.seleniumhq.selenium:selenium-java:3.141.59") { From c1261f2860176bf3091e51b772fa35bf558d38bb Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 16 Mar 2022 11:20:49 +0100 Subject: [PATCH 2/3] Fix accidental exclusion of BeanMapEmitter class Closes gh-28110 --- spring-core/spring-core.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index 69f78fc7306..bfa3a423b52 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -76,7 +76,8 @@ jar { dependsOn cglibRepackJar from(zipTree(cglibRepackJar.archivePath)) { include "org/springframework/cglib/**" - exclude "org/springframework/cglib/beans/BeanMap*.class" + exclude "org/springframework/cglib/beans/BeanMap.class" + exclude "org/springframework/cglib/beans/BeanMap\$*.class" exclude "org/springframework/cglib/core/AbstractClassGenerator*.class" exclude "org/springframework/cglib/core/AsmApi*.class" exclude "org/springframework/cglib/core/KeyFactory.class" From 46363c337bda05c2098a13e1cf038bbf758a7081 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 16 Mar 2022 11:21:43 +0100 Subject: [PATCH 3/3] Avoid confusing debug log entries with DataClassRowMapper Closes gh-28179 --- .../springframework/jdbc/core/BeanPropertyRowMapper.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java index 5399e9c4741..5c2ae3b8c90 100644 --- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java +++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/BeanPropertyRowMapper.java @@ -341,12 +341,6 @@ public class BeanPropertyRowMapper implements RowMapper { "Unable to map column '" + column + "' to property '" + pd.getName() + "'", ex); } } - else { - // No PropertyDescriptor found - if (rowNumber == 0 && logger.isDebugEnabled()) { - logger.debug("No property found for column '" + column + "' mapped to field '" + field + "'"); - } - } } if (populatedProperties != null && !populatedProperties.equals(this.mappedProperties)) {