Revert "Upgrade to Spring Boot 1.4"

Author: cfieber

build.gradle

@@ -15,6 +15,7 @@
  */
 
 buildscript {
+
   repositories {
     jcenter()
     maven { url 'http://dl.bintray.com/spinnaker/gradle/' }
@@ -32,7 +33,7 @@ allprojects {
   group = 'com.netflix.spinnaker.kork'
 
   ext {
-    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.61.0'
+    spinnakerDependenciesVersion = project.hasProperty('spinnakerDependenciesVersion') ? project.property('spinnakerDependenciesVersion') : '0.63.0'
   }
 
   def checkLocalVersions = [spinnakerDependenciesVersion: spinnakerDependenciesVersion]
@@ -58,18 +59,4 @@ allprojects {
   jacoco {
     toolVersion = '0.7.7.201606060606'
   }
-
-  configurations {
-    all {
-      resolutionStrategy {
-        eachDependency {
-          if (it.requested.group.startsWith('org.apache.tomcat')) {
-            it.useVersion spinnaker.version('tomcat')
-          }
-        }
-      }
-    }
-  }
-
-
 }

kork-core/src/main/java/com/netflix/spinnaker/kork/metrics/SpectatorConfiguration.java

@@ -55,7 +55,7 @@ MetricWriter spectatorMetricWriter(Registry registry) {
 
   @Bean
   @Primary
-  @ConditionalOnMissingClass("org.springframework.messaging.MessageChannel")
+  @ConditionalOnMissingClass(name = "org.springframework.messaging.MessageChannel")
   @ConditionalOnMissingBean(name = "primaryMetricWriter")
   public MetricWriter primaryMetricWriter(List<MetricWriter> writers) {
     return new CompositeMetricWriter(writers);

kork-swagger/kork-swagger.gradle

@@ -1,6 +1,6 @@
 dependencies {
   compile spinnaker.dependency('bootAutoConfigure')
-  compile "io.springfox:springfox-swagger2:2.6.0"
-  compile "io.springfox:springfox-swagger-ui:2.6.0"
-  compile "io.swagger:swagger-annotations:1.5.10"
+  compile "io.springfox:springfox-swagger2:2.2.2"
+  compile "io.springfox:springfox-swagger-ui:2.2.2"
+  compile "com.wordnik:swagger-annotations:1.3.13"
 }

kork-web/kork-web.gradle

@@ -11,7 +11,6 @@ dependencies {
 
   compileOnly spinnaker.dependency('bootActuator')
 
-  spinnaker.group('tomcatEmbedded')
   spinnaker.group('spockBase')
 }
 

kork-web/src/main/groovy/com/netflix/spinnaker/tomcat/x509/BlacklistingJSSESocketFactory.java

@@ -23,9 +23,6 @@
 import javax.net.ssl.X509TrustManager;
 import java.util.Optional;
 
-/**
- * TODO: Handle Tomcat 8.5 refactoring that removes low level JSSESocketFactory. See https://github.com/spring-projects/spring-boot/issues/6164 for more details.
- */
 public class BlacklistingJSSESocketFactory extends JSSESocketFactory {
   private static final String BLACKLIST_PREFIX = "blacklist:";