Upgrades to Spring Boot 1.4 by way of a spinnaker-deps bump (#106)

spinnaker · Oct 19, 2016 · f33e69a · f33e69a
1 parent cc33be7
commit f33e69a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,14 +16,14 @@
 
 buildscript {
   ext {
-    springBootVersion = "1.2.8.RELEASE"
+    springBootVersion = "1.4.1.RELEASE"
   }
   repositories {
     jcenter()
     maven { url "http://spinnaker.bintray.com/gradle" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.8.0'
+    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.9.0'
     classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
   }
 }
@@ -35,7 +35,7 @@ allprojects {
   apply plugin: 'groovy'
 
   ext {
-    spinnakerDependenciesVersion = "0.60.0"
+    spinnakerDependenciesVersion = "0.62.0"
   }
 
   if (spinnakerDependenciesVersion.indexOf('-dev') != -1) {

diff --git a/fiat-web/src/main/java/com/netflix/spinnaker/fiat/Main.java b/fiat-web/src/main/java/com/netflix/spinnaker/fiat/Main.java
@@ -19,7 +19,7 @@
 import com.netflix.spinnaker.config.ErrorConfiguration;
 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;