Skip to content

Commit

Permalink
chore(testfix): liquibase/jackson incompatibility (#4223)
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierre Delagrave authored and mergify[bot] committed Dec 16, 2019
1 parent d7ee9a0 commit c11bcc7
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions clouddriver-sql/clouddriver-sql.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit c11bcc7

Please sign in to comment.