chore(dependencies): Reverting Spring Boot 2.2 upgrade (#999)

* chore(dependencies): Reverting Spring Boot 2.2 upgrade

Revert "chore(dependencies): Upgrade Spring Boot to 2.2.1 (#966)"
This reverts commit 46c0678

* fix(dependencies): Removed outdated dependencies

build.gradle

@@ -51,7 +51,6 @@ allprojects {
 
       implementation "org.codehaus.groovy:groovy-all"
       implementation "net.logstash.logback:logstash-logback-encoder"
-      implementation "org.jetbrains.kotlin:kotlin-reflect"
       runtimeOnly "org.springframework.boot:spring-boot-properties-migrator"
       testRuntime "org.springframework.boot:spring-boot-properties-migrator"
 

gate-core/gate-core.gradle

@@ -31,7 +31,6 @@ dependencies {
   implementation "com.netflix.spinnaker.kork:kork-core"
   implementation "com.netflix.spinnaker.kork:kork-web"
   implementation "com.netflix.spinnaker.kork:kork-security"
-  implementation "com.netflix.spinnaker.kork:kork-manageddelivery"
   implementation "com.netflix.spectator:spectator-api"
   implementation "com.github.ben-manes.caffeine:guava"
   implementation "com.netflix.hystrix:hystrix-core"

gate-web/gate-web.gradle

@@ -39,7 +39,6 @@ dependencies {
   implementation "com.netflix.spinnaker.kork:kork-secrets-aws"
   implementation "com.netflix.spinnaker.kork:kork-secrets-gcp"
   implementation "com.netflix.spinnaker.kork:kork-core"
-  implementation "com.netflix.spinnaker.kork:kork-manageddelivery"
   implementation "com.netflix.frigga:frigga"
   implementation "redis.clients:jedis"
   implementation "com.netflix.hystrix:hystrix-core"
@@ -58,7 +57,6 @@ dependencies {
   testImplementation "com.squareup.retrofit:retrofit-mock"
   testImplementation "org.springframework.security:spring-security-test"
   testImplementation "org.springframework.security:spring-security-ldap"
-  testImplementation "org.springframework.security:spring-security-oauth2-jose"
   testImplementation "com.unboundid:unboundid-ldapsdk"
   testImplementation "com.netflix.spinnaker.kork:kork-jedis-test"
 

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

@@ -17,7 +17,7 @@
 package com.netflix.spinnaker.gate
 
 import com.netflix.spinnaker.hystrix.spectator.HystrixSpectatorConfig
-import org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthContributorAutoConfiguration
+import org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthIndicatorAutoConfiguration
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
 import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
@@ -33,9 +33,7 @@ import org.springframework.scheduling.annotation.EnableAsync
 @EnableConfigurationProperties
 @Import([HystrixSpectatorConfig])
 @ComponentScan(["com.netflix.spinnaker.gate", "com.netflix.spinnaker.config"])
-@EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration,
-  GsonAutoConfiguration,
-  LdapHealthContributorAutoConfiguration])
+@EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration, LdapHealthIndicatorAutoConfiguration])
 class Main {
 
   static final Map<String, String> DEFAULT_PROPS = [

gate-web/src/main/groovy/com/netflix/spinnaker/gate/health/RedisRelaxedHealthIndicator.groovy

@@ -27,7 +27,7 @@ import org.springframework.stereotype.Component
 import org.springframework.util.Assert
 import redis.clients.jedis.Jedis
 import redis.clients.jedis.JedisPool
-import redis.clients.jedis.util.Pool
+import redis.clients.util.Pool
 
 import java.util.concurrent.atomic.AtomicReference
 import java.util.function.ToDoubleFunction

gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy

@@ -41,6 +41,7 @@ import com.netflix.spinnaker.kork.dynamicconfig.DynamicConfigService
 import com.netflix.spinnaker.kork.dynamicconfig.SpringDynamicConfigService
 import com.netflix.spinnaker.kork.web.exceptions.GenericExceptionHandlers
 import org.springframework.boot.SpringApplication
+import org.springframework.boot.actuate.autoconfigure.ldap.LdapHealthIndicatorAutoConfiguration
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
 import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
@@ -253,7 +254,7 @@ class FunctionalSpec extends Specification {
   }
 
   @Order(10)
-  @EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration])
+  @EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration, LdapHealthIndicatorAutoConfiguration])
   private static class FunctionalConfiguration extends WebSecurityConfigurerAdapter {
 
     @Bean

gradle.properties

@@ -1,7 +1,7 @@
-#Tue Dec 17 19:07:24 UTC 2019
-fiatVersion=1.11.0
+#Tue Dec 10 20:06:19 UTC 2019
+fiatVersion=1.12.0
 enablePublishing=false
+korkVersion=7.4.0
 spinnakerGradleVersion=7.0.1
-korkVersion=7.1.0
-includeProviders=basic,iap,ldap,oauth2,saml,x509
 org.gradle.parallel=true
+includeProviders=basic,iap,ldap,oauth2,saml,x509