fix(build): Bump kork to 7.72.0
MODIFY
gate-plugins/src/test/groovy/com/netflix/spinnaker/gate/plugins/web/info/PluginInfoControllerSpec.groovy
gate-plugins/src/test/groovy/com/netflix/spinnaker/gate/plugins/web/info/PluginInfoControllerSpec.groovy
package com.netflix.spinnaker.gate.plugins.web.info
import com.fasterxml.jackson.databind.ObjectMapper
+import com.netflix.spinnaker.config.ErrorConfiguration
import com.netflix.spinnaker.config.PluginsAutoConfiguration
import com.netflix.spinnaker.config.okhttp3.OkHttpClientProvider
import com.netflix.spinnaker.gate.config.ServiceConfiguration
@@ -38,6 +39,7 @@ import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.context.annotation.Import
import org.springframework.test.context.ActiveProfiles
import org.springframework.test.context.ContextConfiguration
import org.springframework.test.context.TestPropertySource
@@ -49,6 +51,7 @@ import static org.mockito.ArgumentMatchers.any
import static org.mockito.Mockito.when
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
+@Import(ErrorConfiguration)
@WebMvcTest(controllers = [PluginInfoController])
@AutoConfigureMockMvc(addFilters = false)
@ContextConfiguration(classes = [PluginsAutoConfiguration.class,PluginInfoController, GenericExceptionHandlers, SpinnakerExtensionsConfigProperties, PluginWebConfiguration, ServiceConfiguration])

MODIFY
gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy
gate-web/src/test/groovy/com/netflix/spinnaker/gate/FunctionalSpec.groovy
@@ -18,6 +18,7 @@ package com.netflix.spinnaker.gate
import com.fasterxml.jackson.databind.ObjectMapper
import com.netflix.spectator.api.NoopRegistry
+import com.netflix.spinnaker.config.ErrorConfiguration
import com.netflix.spinnaker.fiat.shared.FiatClientConfigurationProperties
import com.netflix.spinnaker.fiat.shared.FiatStatus
import com.netflix.spinnaker.gate.config.ServiceConfiguration
@@ -27,17 +28,16 @@ import com.netflix.spinnaker.gate.services.*
import com.netflix.spinnaker.gate.services.internal.*
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.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.autoconfigure.groovy.template.GroovyTemplateAutoConfiguration
import org.springframework.boot.autoconfigure.gson.GsonAutoConfiguration
import org.springframework.context.ConfigurableApplicationContext
import org.springframework.context.annotation.Bean
+import org.springframework.context.annotation.Import
import org.springframework.core.annotation.Order
import org.springframework.security.config.annotation.web.builders.HttpSecurity
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter
-import retrofit.RestAdapter
import retrofit.RetrofitError
import retrofit.RestAdapter;
import retrofit.client.OkClient
@@ -174,6 +174,7 @@ class FunctionalSpec extends Specification {
}
@Order(10)
+ @Import(ErrorConfiguration)
@EnableAutoConfiguration(exclude = [GroovyTemplateAutoConfiguration, GsonAutoConfiguration])
private static class FunctionalConfiguration extends WebSecurityConfigurerAdapter {
@@ -272,11 +273,6 @@ class FunctionalSpec extends Specification {
)
}
- @Bean
- GenericExceptionHandlers genericExceptionHandlers() {
- new GenericExceptionHandlers()
- }
-
@Override
protected void configure(HttpSecurity http) throws Exception {
http

MODIFY
gradle.properties
gradle.properties
enablePublishing=false
fiatVersion=1.23.0
includeProviders=basic,iap,ldap,oauth2,saml,x509
-korkVersion=7.70.0
+korkVersion=7.72.0
kotlinVersion=1.4.0
org.gradle.parallel=true
spinnakerGradleVersion=8.6.0

fix(build): Bump kork to 7.72.0 (#1356)