From 5a3b3fbfd8dc127b56d24a654ea9a58dd7a4b11a Mon Sep 17 00:00:00 2001 From: Travis Tomsu Date: Tue, 1 Nov 2016 10:38:50 -0400 Subject: [PATCH] Rolls deps version forward, which pulls back Spring Boot back to 1.2.8 (#110) --- build.gradle | 4 ++-- fiat-web/src/main/java/com/netflix/spinnaker/fiat/Main.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 045aeba85..6ef3ea826 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ buildscript { ext { - springBootVersion = "1.4.1.RELEASE" + springBootVersion = "1.2.8.RELEASE" } repositories { jcenter() @@ -35,7 +35,7 @@ allprojects { apply plugin: 'groovy' ext { - spinnakerDependenciesVersion = "0.62.0" + spinnakerDependenciesVersion = "0.64.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 index 2c009c645..ca8e677c5 100644 --- 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.web.support.SpringBootServletInitializer; +import org.springframework.boot.context.web.SpringBootServletInitializer; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import;