diff --git a/build.gradle b/build.gradle
index c3b0fbca67b..c2d2355007d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ configure(allprojects) { project ->
 				entry 'log4j-slf4j-impl'
 				entry 'log4j-jul'
 			}
-			dependency "org.slf4j:slf4j-api:1.7.26"
+			dependency "org.slf4j:slf4j-api:1.7.28"
 
 			dependency "com.google.code.findbugs:jsr305:3.0.2"
 
@@ -67,7 +67,7 @@ configure(allprojects) { project ->
 				entry 'aspectjtools'
 				entry 'aspectjweaver'
 			}
-			dependencySet(group: 'org.codehaus.groovy', version: '2.5.7') {
+			dependencySet(group: 'org.codehaus.groovy', version: '2.5.8') {
 				entry 'groovy'
 				entry 'groovy-jsr223'
 				entry 'groovy-templates'
@@ -95,7 +95,7 @@ configure(allprojects) { project ->
 				exclude group: "xpp3", name: "xpp3_min"
 				exclude group: "xmlpull", name: "xmlpull"
 			}
-			dependency "org.apache.johnzon:johnzon-jsonb:1.1.12"
+			dependency "org.apache.johnzon:johnzon-jsonb:1.1.13"
 			dependency("org.codehaus.jettison:jettison:1.3.8") {
 				exclude group: "stax", name: "stax-api"
 			}
@@ -109,7 +109,7 @@ configure(allprojects) { project ->
 			dependency "com.h2database:h2:1.4.199"
 			dependency "com.github.ben-manes.caffeine:caffeine:2.8.0"
 			dependency "com.github.librepdf:openpdf:1.2.21"
-			dependency "com.rometools:rome:1.12.1"
+			dependency "com.rometools:rome:1.12.2"
 			dependency "commons-io:commons-io:2.5"
 			dependency "io.vavr:vavr:0.10.0"
 			dependency "net.sf.jopt-simple:jopt-simple:5.0.4"
@@ -162,11 +162,11 @@ configure(allprojects) { project ->
 				}
 			}
 
-			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.2') {
+			dependencySet(group: 'com.squareup.okhttp3', version: '3.14.3') {
 				entry 'okhttp'
 				entry 'mockwebserver'
 			}
-			dependency("org.apache.httpcomponents:httpclient:4.5.9") {
+			dependency("org.apache.httpcomponents:httpclient:4.5.10") {
 				exclude group: "commons-logging", name: "commons-logging"
 			}
 			dependency("org.apache.httpcomponents:httpasyncclient:4.1.4") {
@@ -244,7 +244,7 @@ configure(allprojects) { project ->
 
 			dependency "com.ibm.websphere:uow:6.0.2.17"
 			dependency "com.jamonapi:jamon:2.81"
-			dependency "joda-time:joda-time:2.10.3"
+			dependency "joda-time:joda-time:2.10.4"
 			dependency "org.eclipse.persistence:org.eclipse.persistence.jpa:2.7.4"
 			dependency "org.javamoney:moneta:1.3"
 
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
index 0246c1772a3..4bbcaf33341 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/ComposablePointcut.java
@@ -203,7 +203,7 @@ public class ComposablePointcut implements Pointcut, Serializable {
 
 	@Override
 	public String toString() {
-		return "ComposablePointcut: " + this.classFilter + ", " + this.methodMatcher;
+		return getClass().getName() + ": " + this.classFilter + ", " + this.methodMatcher;
 	}
 
 }
diff --git a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
index d3775267746..d76cdd72537 100644
--- a/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
+++ b/spring-aop/src/main/java/org/springframework/aop/support/DefaultIntroductionAdvisor.java
@@ -82,25 +82,25 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 	/**
 	 * Create a DefaultIntroductionAdvisor for the given advice.
 	 * @param advice the Advice to apply
-	 * @param intf the interface to introduce
+	 * @param ifc the interface to introduce
 	 */
-	public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class<?> intf) {
+	public DefaultIntroductionAdvisor(DynamicIntroductionAdvice advice, Class<?> ifc) {
 		Assert.notNull(advice, "Advice must not be null");
 		this.advice = advice;
-		addInterface(intf);
+		addInterface(ifc);
 	}
 
 
 	/**
 	 * Add the specified interface to the list of interfaces to introduce.
-	 * @param intf the interface to introduce
+	 * @param ifc the interface to introduce
 	 */
-	public void addInterface(Class<?> intf) {
-		Assert.notNull(intf, "Interface must not be null");
-		if (!intf.isInterface()) {
-			throw new IllegalArgumentException("Specified class [" + intf.getName() + "] must be an interface");
+	public void addInterface(Class<?> ifc) {
+		Assert.notNull(ifc, "Interface must not be null");
+		if (!ifc.isInterface()) {
+			throw new IllegalArgumentException("Specified class [" + ifc.getName() + "] must be an interface");
 		}
-		this.interfaces.add(intf);
+		this.interfaces.add(ifc);
 	}
 
 	@Override
@@ -113,8 +113,8 @@ public class DefaultIntroductionAdvisor implements IntroductionAdvisor, ClassFil
 		for (Class<?> ifc : this.interfaces) {
 			if (this.advice instanceof DynamicIntroductionAdvice &&
 					!((DynamicIntroductionAdvice) this.advice).implementsInterface(ifc)) {
-			throw new IllegalArgumentException("DynamicIntroductionAdvice [" + this.advice + "] " +
-					"does not implement interface [" + ifc.getName() + "] specified for introduction");
+				throw new IllegalArgumentException("DynamicIntroductionAdvice [" + this.advice + "] " +
+						"does not implement interface [" + ifc.getName() + "] specified for introduction");
 			}
 		}
 	}