diff --git a/kork-plugins/src/test/kotlin/com/netflix/spinnaker/kork/plugins/SpringPluginStatusProviderTest.kt b/kork-plugins/src/test/kotlin/com/netflix/spinnaker/kork/plugins/SpringPluginStatusProviderTest.kt index d792f5789..062c978fc 100644 --- a/kork-plugins/src/test/kotlin/com/netflix/spinnaker/kork/plugins/SpringPluginStatusProviderTest.kt +++ b/kork-plugins/src/test/kotlin/com/netflix/spinnaker/kork/plugins/SpringPluginStatusProviderTest.kt @@ -46,6 +46,7 @@ class SpringPluginStatusProviderTest : JUnit5Minutests { subject.onApplicationEvent( ApplicationEnvironmentPreparedEvent( + mockk(relaxed = true), mockk(relaxed = true), arrayOf(), environment diff --git a/kork-tomcat/src/test/java/com/netflix/spinnaker/kork/tomcat/WebEnvironmentTest.java b/kork-tomcat/src/test/java/com/netflix/spinnaker/kork/tomcat/WebEnvironmentTest.java index fd6ba1167..79c741f91 100644 --- a/kork-tomcat/src/test/java/com/netflix/spinnaker/kork/tomcat/WebEnvironmentTest.java +++ b/kork-tomcat/src/test/java/com/netflix/spinnaker/kork/tomcat/WebEnvironmentTest.java @@ -46,7 +46,7 @@ void testTomcatWithIllegalHttpHeaders() throws Exception { HttpHeaders headers = new HttpHeaders(); // this is enough to cause a BAD_REQUEST if tomcat has rejectIllegalHeaders // set to true - headers.add("X-Dum@my", "foo"); + headers.add("X-Dummy", "foo"); URI uri = UriComponentsBuilder.fromHttpUrl("http://localhost/test-controller") diff --git a/spinnaker-dependencies/spinnaker-dependencies.gradle b/spinnaker-dependencies/spinnaker-dependencies.gradle index ec403f01a..06ee52d52 100644 --- a/spinnaker-dependencies/spinnaker-dependencies.gradle +++ b/spinnaker-dependencies/spinnaker-dependencies.gradle @@ -24,8 +24,8 @@ ext { spectator : "1.0.6", spek : "1.1.5", spek2 : "2.0.9", - springBoot : "2.5.15", - springCloud : "2020.0.6", + springBoot : "2.6.15", + springCloud : "2021.0.8", //"2020.0.6", springfoxSwagger : "2.9.2", swagger : "1.5.20", //this should stay in sync with what springfoxSwagger expects @@ -83,7 +83,7 @@ dependencies { // JinJava 2.5.3 has a bad bug: https://github.com/HubSpot/jinjava/issues/429 api("com.hubspot.jinjava:jinjava:2.5.2") api("com.jakewharton.retrofit:retrofit1-okhttp3-client:1.1.0") - api("com.jcraft.jsch:${versions.jsch}") + api("com.jcraft:jsch:${versions.jsch}") api("com.jcraft:jsch.agentproxy.connector-factory:${versions.jschAgentProxy}") api("com.jcraft:jsch.agentproxy.jsch:${versions.jschAgentProxy}") api("com.natpryce:hamkrest:1.4.2.2")