diff --git a/build.gradle b/build.gradle
index 25c961aa39..33eb5ad829 100644
--- a/build.gradle
+++ b/build.gradle
@@ -60,7 +60,7 @@ configure(allprojects) { project ->
 	ext.slf4jVersion         = "1.7.25"
 	ext.tiles3Version        = "3.0.7"
 	ext.tomcatVersion        = "8.5.23"
-	ext.undertowVersion      = "1.4.20.Final"
+	ext.undertowVersion      = "1.4.21.Final"
 
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
diff --git a/spring-context-support/spring-context-support.gradle b/spring-context-support/spring-context-support.gradle
index 2674d418c4..79bfa884a2 100644
--- a/spring-context-support/spring-context-support.gradle
+++ b/spring-context-support/spring-context-support.gradle
@@ -9,7 +9,7 @@ dependencies {
 	optional("javax.activation:activation:1.1.1")
 	optional("javax.mail:javax.mail-api:1.6.0")
 	optional("javax.cache:cache-api:1.0.0")
-	optional("com.github.ben-manes.caffeine:caffeine:2.5.6")
+	optional("com.github.ben-manes.caffeine:caffeine:2.6.0")
 	optional("net.sf.ehcache:ehcache:2.10.4")
 	optional("org.quartz-scheduler:quartz:2.3.0")
 	optional("org.codehaus.fabric3.api:commonj:1.1.0")