diff --git a/lib/java/build.gradle b/lib/java/build.gradle
index 5f0d278..9184f7b 100644
--- a/lib/java/build.gradle
+++ b/lib/java/build.gradle
@@ -36,6 +36,12 @@
     id 'maven'
     id 'signing'
     id 'com.github.johnrengelman.shadow' version '4.0.4'
+    id "com.github.spotbugs" version "2.0.0"
+}
+
+ext {
+    // https://github.com/spotbugs/spotbugs-gradle-plugin/issues/32#issuecomment-409951172
+    SpotBugsTask = com.github.spotbugs.SpotBugsTask
 }
 
 description = 'Apache Thrift Java Library'
diff --git a/lib/java/gradle.properties b/lib/java/gradle.properties
index c5d2a1b..8559464 100644
--- a/lib/java/gradle.properties
+++ b/lib/java/gradle.properties
@@ -25,10 +25,10 @@
 maven-repository-id=apache.releases.https
 
 # Dependency versions
-httpclient.version=4.5.6
-httpcore.version=4.4.1
-slf4j.version=1.7.25
+httpclient.version=4.5.10
+httpcore.version=4.4.12
+slf4j.version=1.7.28
 servlet.version=2.5
 junit.version=4.12
-mockito.version=1.9.5
+mockito.version=1.10.19
 javax.annotation.version=1.3.2
diff --git a/lib/java/gradle/codeQualityChecks.gradle b/lib/java/gradle/codeQualityChecks.gradle
index 1ff1c29..b066287 100644
--- a/lib/java/gradle/codeQualityChecks.gradle
+++ b/lib/java/gradle/codeQualityChecks.gradle
@@ -3,18 +3,23 @@
 // Configure the Gradle code quality plugins here.
 //
 
-apply plugin: 'findbugs'
+dependencies {
+    spotbugs configurations.spotbugsPlugins.dependencies
+    spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.8.0'
+}
 
-findbugs {
+apply plugin: 'com.github.spotbugs'
+
+spotbugs{
     ignoreFailures = true
-    toolVersion = '3.0.1'
+    toolVersion = '3.1.12'
     sourceSets = [ sourceSets.main ]
     effort = 'max'
     reportLevel = 'low'
     excludeFilter = file('code_quality_tools/findbugs-filter.xml')
 }
 
-tasks.withType(FindBugs) {
+tasks.withType(SpotBugsTask) {
     reports {
         text.enabled = false
         html.enabled = true