chore(springBoot): Upgrade to Spring Boot 1.5.4 (#1486)

build.gradle

@@ -22,7 +22,7 @@ buildscript {
   }
   dependencies {
     classpath "com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.16.0"
-    classpath "org.springframework.boot:spring-boot-gradle-plugin:1.2.8.RELEASE"
+    classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.4.RELEASE"
     classpath "org.junit.platform:junit-platform-gradle-plugin:$junitVersion"
     classpath "com.netflix.nebula:nebula-kotlin-plugin:$kotlinVersion"
   }
@@ -34,7 +34,7 @@ allprojects {
   group = "com.netflix.spinnaker.orca"
 
   ext {
-    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.106.0'
+    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.109.2'
   }
 
   def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]

orca-core/orca-core.gradle

@@ -38,7 +38,5 @@ dependencies {
   compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:${spinnaker.version('jackson')}"
   compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:${spinnaker.version('jackson')}"
 
-  compile "org.springframework.security:spring-security-web:3.2.9.RELEASE"
-
   testCompile project(":orca-test")
 }

orca-front50/orca-front50.gradle

@@ -16,7 +16,7 @@
 
 dependencies {
   compile project(":orca-retrofit")
-  compile "com.netflix.spinnaker.fiat:fiat-api:0.26.0"
+  spinnaker.group("fiat")
 
   testCompile project(":orca-test")
 }

orca-queue-redis/src/test/kotlin/com/netflix/spinnaker/orca/q/redis/RedisQueueTest.kt

@@ -30,6 +30,7 @@ import org.jetbrains.spek.api.Spek
 import org.jetbrains.spek.api.dsl.describe
 import org.jetbrains.spek.api.dsl.it
 import org.junit.Assert
+import org.springframework.context.ApplicationEvent
 import org.springframework.context.ApplicationEventPublisher
 import java.time.Clock
 
@@ -52,7 +53,10 @@ private val createQueue = { clock: Clock,
     pool = redis!!.pool,
     clock = clock,
     deadMessageHandler = deadLetterCallback,
-    publisher = publisher ?: ApplicationEventPublisher { }
+    publisher = publisher ?: (object : ApplicationEventPublisher {
+      override fun publishEvent(event: ApplicationEvent?) {}
+      override fun publishEvent(event: Any?) {}
+    })
   )
 }
 

orca-queue/src/test/kotlin/com/netflix/spinnaker/orca/q/memory/InMemoryQueueTest.kt

@@ -20,6 +20,7 @@ import com.netflix.spinnaker.orca.q.DeadMessageCallback
 import com.netflix.spinnaker.orca.q.QueueTest
 import com.netflix.spinnaker.orca.q.metrics.MonitorableQueueTest
 import org.funktionale.partials.invoke
+import org.springframework.context.ApplicationEvent
 import org.springframework.context.ApplicationEventPublisher
 import java.time.Clock
 
@@ -37,7 +38,10 @@ private val createQueue = {
   InMemoryQueue(
     clock = clock,
     deadMessageHandler = deadLetterCallback,
-    publisher = publisher ?: ApplicationEventPublisher { }
+    publisher = publisher ?: (object : ApplicationEventPublisher {
+      override fun publishEvent(event: ApplicationEvent?) {}
+      override fun publishEvent(event: Any?) {}
+    })
   )
 }
 

orca-web/orca-web.gradle

@@ -48,15 +48,6 @@ dependencies {
   compile project(":orca-queue-redis")
   compile project(":orca-pipelinetemplate")
 
-//  Replace below with this line when fiat becomes stable.
-//  spinnaker.group "fiat"
-  compile "org.springframework.boot:spring-boot-starter-actuator:1.2.8.RELEASE"
-  compile "org.springframework.boot:spring-boot-starter-web:1.2.8.RELEASE"
-  compile "org.springframework.boot:spring-boot-starter-data-rest:1.2.8.RELEASE"
-  compile "org.springframework.security:spring-security-config:3.2.9.RELEASE"
-  compile "org.springframework.security:spring-security-core:3.2.9.RELEASE"
-  compile "org.springframework.security:spring-security-web:3.2.9.RELEASE"
-
   runtime spinnaker.dependency("kork")
   compile spinnaker.dependency('korkExceptions')
   compile spinnaker.dependency("korkStackdriver")

orca-web/src/main/groovy/com/netflix/spinnaker/orca/Main.groovy

@@ -38,7 +38,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.batch.BatchAutoConfiguration
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
 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

orca-web/src/main/groovy/com/netflix/spinnaker/orca/web/config/WebConfiguration.groovy

@@ -27,7 +27,7 @@ import com.netflix.spinnaker.orca.jackson.OrcaObjectMapper
 import groovy.transform.CompileStatic
 import org.springframework.beans.factory.annotation.Autowire
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.boot.context.embedded.FilterRegistrationBean
+import org.springframework.boot.web.servlet.FilterRegistrationBean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
 import org.springframework.context.annotation.Configuration