diff --git a/build.gradle b/build.gradle
index 1abbba06f78..c9e1a279a37 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,9 +47,9 @@ configure(allprojects) { project ->
 	ext.hsqldbVersion        = "2.4.0"
 	ext.jackson2Version      = "2.9.1"
 	ext.jettyVersion         = "9.4.7.v20170914"
-	ext.junitJupiterVersion  = "5.0.0"
-	ext.junitPlatformVersion = "1.0.0"
-	ext.junitVintageVersion  = "4.12.0"
+	ext.junitJupiterVersion  = "5.0.1"
+	ext.junitPlatformVersion = "1.0.1"
+	ext.junitVintageVersion  = "4.12.1"
 	ext.kotlinVersion        = "1.1.51"
 	ext.log4jVersion         = "2.9.1"
 	ext.nettyVersion         = "4.1.16.Final"
@@ -59,7 +59,7 @@ configure(allprojects) { project ->
 	ext.rxjava2Version       = "2.1.4"
 	ext.slf4jVersion         = "1.7.25"
 	ext.tiles3Version        = "3.0.7"
-	ext.tomcatVersion        = "8.5.21"
+	ext.tomcatVersion        = "8.5.23"
 	ext.undertowVersion      = "1.4.20.Final"
 
 	ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
diff --git a/spring-test/spring-test.gradle b/spring-test/spring-test.gradle
index 35f12275ddc..4bf4f675dd2 100644
--- a/spring-test/spring-test.gradle
+++ b/spring-test/spring-test.gradle
@@ -35,6 +35,7 @@ dependencies {
 	optional("javax.websocket:javax.websocket-api:1.1")
 	optional("junit:junit:4.12")
 	optional("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
+	optional("org.apiguardian:apiguardian-api:1.0.0")  // for compiling against JUnit 5 without warnings
 	optional("org.testng:testng:6.12")
 	optional("org.aspectj:aspectjweaver:${aspectjVersion}")
 	optional("org.codehaus.groovy:groovy-all:${groovyVersion}")