From c11bcc7fd2163960bc2f585e46876a7038103339 Mon Sep 17 00:00:00 2001
From: Pierre Delagrave <pdelagrave@pivotal.io>
Date: Mon, 16 Dec 2019 17:19:19 -0500
Subject: [PATCH] chore(testfix): liquibase/jackson incompatibility (#4223)

See https://github.com/spinnaker/kork/pull/442
---
 clouddriver-sql/clouddriver-sql.gradle                        | 1 +
 .../spinnaker/clouddriver/sql/event/SqlEventRepositoryTest.kt | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/clouddriver-sql/clouddriver-sql.gradle b/clouddriver-sql/clouddriver-sql.gradle
index ff850a1044b..3cd3dee1509 100644
--- a/clouddriver-sql/clouddriver-sql.gradle
+++ b/clouddriver-sql/clouddriver-sql.gradle
@@ -44,6 +44,7 @@ dependencies {
   testImplementation "io.strikt:strikt-core"
   testImplementation "dev.minutest:minutest"
   testImplementation "io.mockk:mockk"
+  testImplementation "com.fasterxml.jackson.module:jackson-module-kotlin"
 
   testRuntimeOnly "org.junit.platform:junit-platform-launcher"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine"
diff --git a/clouddriver-sql/src/test/kotlin/com/netflix/spinnaker/clouddriver/sql/event/SqlEventRepositoryTest.kt b/clouddriver-sql/src/test/kotlin/com/netflix/spinnaker/clouddriver/sql/event/SqlEventRepositoryTest.kt
index e6d047dc848..3bdfb31e4a9 100644
--- a/clouddriver-sql/src/test/kotlin/com/netflix/spinnaker/clouddriver/sql/event/SqlEventRepositoryTest.kt
+++ b/clouddriver-sql/src/test/kotlin/com/netflix/spinnaker/clouddriver/sql/event/SqlEventRepositoryTest.kt
@@ -16,6 +16,8 @@
 package com.netflix.spinnaker.clouddriver.sql.event
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.netflix.spectator.api.NoopRegistry
 import com.netflix.spinnaker.clouddriver.event.AbstractSpinnakerEvent
 import com.netflix.spinnaker.clouddriver.event.exceptions.AggregateChangeRejectedException
@@ -198,7 +200,7 @@ class SqlEventRepositoryTest : JUnit5Minutests {
       jooq = database.context,
       serviceVersion = serviceVersion,
       objectMapper = ObjectMapper().apply {
-        findAndRegisterModules()
+        registerModules(KotlinModule(), JavaTimeModule())
         registerSubtypes(MyEvent::class.java)
       },
       applicationEventPublisher = applicationEventPublisher,