diff --git a/build.gradle b/build.gradle
index 93ba50765e..c9bec2e770 100644
--- a/build.gradle
+++ b/build.gradle
@@ -45,7 +45,7 @@ ext {
 	slf4jVersion         = "1.7.25"	  // spring-jcl + consistent 3rd party deps
 	tiles3Version        = "3.0.8"
 	tomcatVersion        = "9.0.10"
-	undertowVersion      = "2.0.12.Final"
+	undertowVersion      = "2.0.13.Final"
 
 	gradleScriptDir = "${rootProject.projectDir}/gradle"
 	withoutJclOverSlf4J = {
diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle
index 364b2e5b22..aa6403b74f 100644
--- a/spring-context-support/spring-context-support.gradle
+++ b/spring-context-support/spring-context-support.gradle
@@ -6,7 +6,7 @@ dependencies {
 	compile(project(":spring-core"))
 	optional(project(":spring-jdbc"))  // for Quartz support
 	optional(project(":spring-tx"))  // for Quartz support
-	optional("javax.activation:activation:1.1.1")
+	optional("javax.activation:javax.activation-api:1.2.0")
 	optional("javax.mail:javax.mail-api:1.6.1")
 	optional("javax.cache:cache-api:1.1.0")
 	optional("com.github.ben-manes.caffeine:caffeine:2.6.2")
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index d146d81408..40ad780b37 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -81,7 +81,7 @@ dependencies {
 	optional("io.netty:netty-buffer")
 	testCompile("io.projectreactor:reactor-test")
 	testCompile("org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}")
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
 	testCompile("javax.xml.bind:jaxb-api:2.3.0")
 	testCompile("com.fasterxml.woodstox:woodstox-core:5.1.0") {
 		exclude group: "stax", module: "stax-api"
diff --git a/spring-messaging/spring-messaging.gradle b/spring-messaging/spring-messaging.gradle
index 72242151a5..fc7f1106c6 100644
--- a/spring-messaging/spring-messaging.gradle
+++ b/spring-messaging/spring-messaging.gradle
@@ -36,7 +36,7 @@ dependencies {
 	testCompile("org.apache.tomcat.embed:tomcat-embed-websocket:${tomcatVersion}")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.jetbrains.kotlin:kotlin-stdlib:${kotlinVersion}")
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
 	testRuntime("com.sun.activation:javax.activation:1.2.0")
diff --git a/spring-oxm/spring-oxm.gradle b/spring-oxm/spring-oxm.gradle
index ccfe173fc8..1948e7ad7a 100644
--- a/spring-oxm/spring-oxm.gradle
+++ b/spring-oxm/spring-oxm.gradle
@@ -99,7 +99,7 @@ dependencies {
 	compile(project(":spring-beans"))
 	compile(project(":spring-core"))
 	optional("javax.xml.bind:jaxb-api:2.3.0")
-	optional("javax.activation:activation:1.1.1")
+	optional("javax.activation:javax.activation-api:1.2.0")
 	optional("org.codehaus.castor:castor-xml:1.4.1")  {
 		exclude group: "stax", module: "stax-api"
 		exclude group: "org.springframework", module: "spring-context"
@@ -117,7 +117,7 @@ dependencies {
 	}
 	testCompile(files(genCastor.classesDir).builtBy(genCastor))
 	testCompile(files(genJaxb.classesDir).builtBy(genJaxb))
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
 	testRuntime("xerces:xercesImpl:2.11.0")  // for Castor
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 26dc0b342b..c25f328651 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -20,7 +20,7 @@ dependencies {
 	optional(project(":spring-webflux"))
 	optional(project(":spring-webmvc"))
 	optional(project(":spring-websocket"))
-	optional("javax.activation:activation:1.1.1")
+	optional("javax.activation:javax.activation-api:1.2.0")
 	optional("javax.el:javax.el-api:3.0.1-b04")
 	optional("javax.inject:javax.inject:1")
 	optional("javax.servlet:javax.servlet-api:4.0.1")
@@ -47,7 +47,7 @@ dependencies {
 		exclude group: "commons-logging", module: "commons-logging"
 		exclude group: "io.netty", module: "netty"
 	}
-	optional("org.xmlunit:xmlunit-matchers:2.6.0")
+	optional("org.xmlunit:xmlunit-matchers:2.6.1")
 	optional("org.skyscreamer:jsonassert:1.5.0")
 	optional("com.jayway.jsonpath:json-path:2.4.0")
 	optional("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
diff --git a/spring-web/spring-web.gradle b/spring-web/spring-web.gradle
index 9d95c1bb65..8452de2990 100644
--- a/spring-web/spring-web.gradle
+++ b/spring-web/spring-web.gradle
@@ -77,7 +77,7 @@ dependencies {
 	testCompile("com.squareup.okhttp3:mockwebserver:3.11.0")
 	testCompile("org.jetbrains.kotlin:kotlin-reflect:${kotlinVersion}")
 	testCompile("org.skyscreamer:jsonassert:1.5.0")
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
 	testRuntime("com.sun.mail:javax.mail:1.6.1")
 	testRuntime("com.sun.xml.bind:jaxb-core:2.3.0.1")
 	testRuntime("com.sun.xml.bind:jaxb-impl:2.3.0.1")
diff --git a/spring-webmvc/spring-webmvc.gradle b/spring-webmvc/spring-webmvc.gradle
index c00cf76279..264e533ad0 100644
--- a/spring-webmvc/spring-webmvc.gradle
+++ b/spring-webmvc/spring-webmvc.gradle
@@ -66,7 +66,7 @@ dependencies {
 		exclude group: "xom", module: "xom"
 		exclude group: "xerces", module: "xercesImpl"
 	}
-	testCompile("org.xmlunit:xmlunit-matchers:2.6.0")
+	testCompile("org.xmlunit:xmlunit-matchers:2.6.1")
 	testCompile("io.projectreactor:reactor-core")
 	testCompile("io.reactivex:rxjava:${rxjavaVersion}")
 	testCompile("io.reactivex:rxjava-reactive-streams:${rxjavaAdapterVersion}")