From 3e0c67a6ee0016d2e67a6730cede945f4f828d14 Mon Sep 17 00:00:00 2001 From: spinnakerbot Date: Mon, 20 Nov 2023 17:16:16 -0500 Subject: [PATCH] chore(dependencies): Autobump korkVersion (#4602) * chore(dependencies): Autobump korkVersion * fix(core): give the ObjectMapper bean two names: mapper and objectMapper to match the names other code expects. With the introduction of another ObjectMapper bean in the spring context from ArtifactStoreConfiguration (artifactObjectMapper) in https://github.com/spinnaker/kork/pull/1120, spring needs some way to know which to use. With the additional name, all the current uses of the ObjectMapper from OrcaConfiguration continue to get the bean they got before PR 1120. --------- Co-authored-by: root Co-authored-by: David Byron --- gradle.properties | 2 +- .../com/netflix/spinnaker/orca/config/OrcaConfiguration.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0f8bd93800..f7abb85e63 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ fiatVersion=1.42.0 -korkVersion=7.201.0 +korkVersion=7.202.0 kotlinVersion=1.4.32 org.gradle.parallel=true spinnakerGradleVersion=8.31.0 diff --git a/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java b/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java index 9a7c4ddf62..1d81afee06 100644 --- a/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java +++ b/orca-core/src/main/java/com/netflix/spinnaker/orca/config/OrcaConfiguration.java @@ -114,7 +114,7 @@ public Scheduler scheduler() { return Schedulers.io(); } - @Bean + @Bean(name = {"mapper", "objectMapper"}) public ObjectMapper mapper() { return OrcaObjectMapper.getInstance(); }