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

build.gradle

@@ -16,15 +16,15 @@
 
 buildscript {
   ext {
-    springBootVersion = "1.2.8.RELEASE"
+    springBootVersion = "1.5.4.RELEASE"
   }
   repositories {
     jcenter()
     maven { url "http://spinnaker.bintray.com/gradle" }
     maven { url "https://plugins.gradle.org/m2/" }
   }
   dependencies {
-    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.12.0'
+    classpath 'com.netflix.spinnaker.gradle:spinnaker-gradle-project:3.16.0'
     classpath "org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}"
   }
 }
@@ -36,7 +36,7 @@ allprojects {
   apply plugin: 'groovy'
 
   ext {
-    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.93.0'
+    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.106.0-rc.1-springBoot154'
   }
 
   def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]
@@ -59,16 +59,6 @@ allprojects {
     dependenciesVersion = spinnakerDependenciesVersion
   }
 
-  configurations.all {
-    resolutionStrategy {
-      eachDependency {
-        if (it.requested.group == 'org.springframework') {
-          it.useVersion '4.1.9.RELEASE'
-        }
-      }
-    }
-  }
-
   test {
     testLogging {
       exceptionFormat = 'full'

fiat-api/src/main/java/com/netflix/spinnaker/fiat/shared/FiatAuthenticationConfig.java

@@ -27,8 +27,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+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;

fiat-core/fiat-core.gradle

@@ -17,4 +17,5 @@ dependencies {
   testCompile spinnaker.dependency("retrofitJackson")
   spinnaker.group("test")
   testCompile spinnaker.dependency("bootAutoConfigure")
+  testCompile spinnaker.dependency("bootActuator")
 }

fiat-core/src/test/groovy/com/netflix/spinnaker/fiat/YamlFileApplicationContextInitializer.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright 2017 Netflix, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.netflix.spinnaker.fiat;
+
+import org.springframework.boot.env.YamlPropertySourceLoader;
+import org.springframework.context.ApplicationContextInitializer;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.io.Resource;
+
+import java.io.IOException;
+
+// source: https://stackoverflow.com/a/37349492/5569046
+public class YamlFileApplicationContextInitializer implements ApplicationContextInitializer<ConfigurableApplicationContext> {
+  @Override
+  public void initialize(ConfigurableApplicationContext applicationContext) {
+    try {
+      Resource resource = applicationContext.getResource("classpath:application.yml");
+      YamlPropertySourceLoader sourceLoader = new YamlPropertySourceLoader();
+      PropertySource<?> yamlTestProperties = sourceLoader.load("yamlTestProperties", resource, null);
+      applicationContext.getEnvironment().getPropertySources().addLast(yamlTestProperties);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    }
+  }
+}

fiat-core/src/test/groovy/com/netflix/spinnaker/fiat/model/resources/PermissionsSpec.groovy

@@ -18,19 +18,16 @@ package com.netflix.spinnaker.fiat.model.resources
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.databind.SerializationFeature
+import com.netflix.spinnaker.fiat.YamlFileApplicationContextInitializer
 import com.netflix.spinnaker.fiat.model.Authorization
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.boot.test.ConfigFileApplicationContextInitializer
-import org.springframework.boot.test.SpringApplicationConfiguration
-import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.test.context.ContextConfiguration
-import org.springframework.test.context.TestPropertySource
 import spock.lang.Specification
 
-@ContextConfiguration(classes = TestConfig, initializers = ConfigFileApplicationContextInitializer)
+@ContextConfiguration(classes = TestConfig, initializers = YamlFileApplicationContextInitializer)
 class PermissionsSpec extends Specification {
 
   private static final Authorization R = Authorization.READ

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;

fiat-web/src/main/java/com/netflix/spinnaker/fiat/config/FiatConfig.java

@@ -9,8 +9,8 @@
 import lombok.val;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.embedded.FilterRegistrationBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;