fix(java17): add Jackson converter to RestAdapters to avoid Gson (#1174)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
spinnaker · Sep 20, 2023 · f3b7597 · f3b7597
1 parent 73fb887
commit f3b7597
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/PluginMonitorConfig.java b/igor-web/src/main/groovy/com/netflix/spinnaker/igor/config/PluginMonitorConfig.java
@@ -68,11 +68,8 @@ public PluginReleaseService pluginReleaseService(
                     clientProvider.getClient(new DefaultServiceEndpoint("front50", address))))
             .setLogLevel(retrofitLogLevel)
             .setLog(new Slf4jRetrofitLogger(Front50Service.class))
-<<<<<<< HEAD
-=======
             .setConverter(new JacksonConverter(objectMapper))
             .setErrorHandler(SpinnakerRetrofitErrorHandler.getInstance())
->>>>>>> c1bd0b19 (fix(java17): add Jackson converter to RestAdapters to avoid Gson (#1174))
             .build()
             .create(Front50Service.class);