bump to spring 4.3.10, and spring-boot 1.5.4

build.gradle

@@ -54,10 +54,10 @@ subprojects { project ->
 
   dependencies {
     // spinnaker.group('test')
-    testCompile "org.springframework.boot:spring-boot-starter-test:1.2.8.RELEASE"
+    testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
     testCompile "org.spockframework:spock-core:1.1-groovy-2.4-rc-2"
     testCompile "org.spockframework:spock-spring:1.1-groovy-2.4-rc-2"
-    testCompile "org.springframework:spring-test:4.1.9.RELEASE"
+    testCompile "org.springframework:spring-test:$springVersion"
     testCompile "cglib:cglib-nodep:3.2.0"
     testCompile "org.objenesis:objenesis:2.1"
     testCompile "junit:junit:4.11"

gradle.properties

@@ -1,2 +1,3 @@
-springBootVersion=1.2.5.RELEASE
+springVersion=4.3.10.RELEASE
+springBootVersion=1.5.4.RELEASE
 kotlinVersion=1.1.2

kayenta-web/kayenta-web.gradle

@@ -27,7 +27,7 @@ dependencies {
   compile "org.springframework.boot:spring-boot-starter-actuator:1.2.8.RELEASE"
 
   //compile spinnaker.dependency('bootWeb')
-  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
+  compile "org.springframework.boot:spring-boot-starter-web:1.5.4.RELEASE"
 
   //compile spinnaker.dependency("korkSwagger")
   compile "com.netflix.spinnaker.kork:kork-swagger:1.93.0"

kayenta-web/src/main/java/com/netflix/kayenta/Main.java

@@ -25,7 +25,7 @@
 import com.netflix.kayenta.stackdriver.config.StackdriverConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.context.web.SpringBootServletInitializer;
+import org.springframework.boot.web.support.SpringBootServletInitializer;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;