diff --git a/azure-application-insights-spring-boot-starter/build.gradle b/azure-application-insights-spring-boot-starter/build.gradle
index 10e550843b3..7cf8ab861ca 100644
--- a/azure-application-insights-spring-boot-starter/build.gradle
+++ b/azure-application-insights-spring-boot-starter/build.gradle
@@ -45,21 +45,22 @@ sourceSets {
     }
 }
 
+def springBootVersion = '1.5.21.RELEASE'
 dependencies {
     compile(project(':core'))
     compile(project(':web'))
     compile(project(':ApplicationInsightsInternalLogger'))
     compile ([group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'])
-    compileOnly('org.springframework.boot:spring-boot:1.5.9.RELEASE')
-    compileOnly('org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE')
-    compileOnly('org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE')
-    compileOnly('org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE')
+    compileOnly("org.springframework.boot:spring-boot:$springBootVersion")
+    compileOnly("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
+    compileOnly("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+    compileOnly("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
     testCompile('junit:junit:4.12')
-    testCompile('org.springframework.boot:spring-boot-starter-test:1.5.9.RELEASE')
-    testCompile('org.springframework.boot:spring-boot:1.5.9.RELEASE')
-    testCompile('org.springframework.boot:spring-boot-autoconfigure:1.5.9.RELEASE')
-    testCompile('org.springframework.boot:spring-boot-starter-web:1.5.9.RELEASE')
-    testCompile('org.springframework.boot:spring-boot-configuration-processor:1.5.9.RELEASE')
+    testCompile("org.springframework.boot:spring-boot-starter-test:$springBootVersion")
+    testCompile("org.springframework.boot:spring-boot:$springBootVersion")
+    testCompile("org.springframework.boot:spring-boot-autoconfigure:$springBootVersion")
+    testCompile("org.springframework.boot:spring-boot-starter-web:$springBootVersion")
+    testCompile("org.springframework.boot:spring-boot-configuration-processor:$springBootVersion")
     testCompile('org.assertj:assertj-core:2.6.0')
 }
 
diff --git a/gradle/common-java.gradle b/gradle/common-java.gradle
index 5eadd199629..ad3dee5436d 100644
--- a/gradle/common-java.gradle
+++ b/gradle/common-java.gradle
@@ -36,7 +36,7 @@ tasks.withType(JavaCompile) {
 }
 
 checkstyle {
-    toolVersion = '8.15'
+    toolVersion = '8.22'
     configFile = file("${rootProject.projectDir}/config/checkstyle/checkstyle.xml")
     configProperties["rootDir"] = rootProject.projectDir
     showViolations = false