Skip to content

Commit f33e69a

Browse files
author
Travis Tomsu
authored
Upgrades to Spring Boot 1.4 by way of a spinnaker-deps bump (#106)
1 parent cc33be7 commit f33e69a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616

1717
buildscript {
1818
ext {
19-
springBootVersion = "1.2.8.RELEASE"
19+
springBootVersion = "1.4.1.RELEASE"
2020
}
2121
repositories {
2222
jcenter()
2323
maven { url "http://spinnaker.bintray.com/gradle" }
2424
}
2525
dependencies {
26-
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.8.0'
26+
classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.9.0'
2727
classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
2828
}
2929
}
@@ -35,7 +35,7 @@ allprojects {
3535
apply plugin: 'groovy'
3636

3737
ext {
38-
spinnakerDependenciesVersion = "0.60.0"
38+
spinnakerDependenciesVersion = "0.62.0"
3939
}
4040

4141
if (spinnakerDependenciesVersion.indexOf('-dev') != -1) {

fiat-web/src/main/java/com/netflix/spinnaker/fiat/Main.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.netflix.spinnaker.config.ErrorConfiguration;
2020
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2121
import org.springframework.boot.builder.SpringApplicationBuilder;
22-
import org.springframework.boot.context.web.SpringBootServletInitializer;
22+
import org.springframework.boot.web.support.SpringBootServletInitializer;
2323
import org.springframework.context.annotation.ComponentScan;
2424
import org.springframework.context.annotation.Configuration;
2525
import org.springframework.context.annotation.Import;

0 commit comments

Comments
 (0)