diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index 452905bdf92..446a86f8d78 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -85,7 +85,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"
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<T> implements RowMapper<T> {
 							"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)) {