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 spinnaker/kork#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 <root@140f03da0671> Co-authored-by: David Byron <[email protected]>
spinnaker · Nov 20, 2023 · 3e0c67a · 3e0c67a
1 parent 976d469
commit 3e0c67a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -114,7 +114,7 @@ public Scheduler scheduler() {
     return Schedulers.io();
   }
 
-  @Bean
+  @Bean(name = {"mapper", "objectMapper"})
   public ObjectMapper mapper() {
     return OrcaObjectMapper.getInstance();
   }