Merge branch 'kl5' of github.com:oshai/pact-jvm into oshai-kl5

pact-foundation · Jul 26, 2023 · 494a0dc · 494a0dc
2 parents 6c1f850 + 3e22d63
commit 494a0dc
Show file tree

Hide file tree

Showing 82 changed files with 88 additions and 83 deletions.
diff --git a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/BaseBuilder.kt
@@ -19,7 +19,7 @@ import io.pact.plugins.jvm.core.CatalogueManager
 import io.pact.plugins.jvm.core.DefaultPluginManager
 import io.pact.plugins.jvm.core.PactPlugin
 import io.pact.plugins.jvm.core.PactPluginNotFoundException
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.util.regex.Pattern
 
 open class BaseBuilder(

diff --git a/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt b/consumer/groovy/src/main/kotlin/au/com/dius/pact/consumer/groovy/Matchers.kt
@@ -25,7 +25,7 @@ import au.com.dius.pact.core.model.matchingrules.NumberTypeMatcher
 import au.com.dius.pact.core.model.matchingrules.RegexMatcher
 import au.com.dius.pact.core.support.isNotEmpty
 import com.mifmif.common.regex.Generex
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.commons.lang3.time.DateFormatUtils
 import org.apache.commons.lang3.time.DateUtils
 import java.text.ParseException

diff --git a/...y/src/main/kotlin/au/com/dius/pact/consumer/groovy/messaging/SynchronousMessageBuilder.kt b/...y/src/main/kotlin/au/com/dius/pact/consumer/groovy/messaging/SynchronousMessageBuilder.kt
@@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.deepMerge
 import au.com.dius.pact.core.support.json.JsonValue
 import groovy.lang.Closure
 import io.pact.plugins.jvm.core.ContentMatcher
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 open class SynchronousMessageBuilder(
   private val description: String,

diff --git a/consumer/junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt b/consumer/junit5/src/main/kotlin/au/com/dius/pact/consumer/junit5/PactConsumerTestExt.kt
@@ -30,7 +30,7 @@ import au.com.dius.pact.core.support.Metrics
 import au.com.dius.pact.core.support.expressions.DataType
 import au.com.dius.pact.core.support.expressions.ExpressionParser
 import au.com.dius.pact.core.support.isNotEmpty
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Nested
 import org.junit.jupiter.api.extension.AfterAllCallback

diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/KTorMockServer.kt
@@ -34,7 +34,7 @@ import io.ktor.util.network.port
 import io.netty.channel.Channel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.net.SocketAddress
 import java.util.zip.DeflaterInputStream
 import java.util.zip.GZIPInputStream

diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/MockHttpServer.kt
@@ -29,7 +29,7 @@ import io.ktor.util.network.hostname
 import io.pact.plugins.jvm.core.CatalogueEntry
 import io.pact.plugins.jvm.core.CatalogueEntryProviderType
 import io.pact.plugins.jvm.core.CatalogueEntryType
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.commons.text.StringEscapeUtils
 import org.apache.hc.client5.http.classic.methods.HttpOptions
 import org.apache.hc.client5.http.impl.DefaultHttpRequestRetryStrategy

diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/PluginMockServer.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/PluginMockServer.kt
@@ -14,7 +14,7 @@ import io.pact.plugins.jvm.core.DefaultPluginManager
 import io.pact.plugins.jvm.core.MockServerDetails
 import io.pact.plugins.jvm.core.MockServerResults
 import io.pact.plugins.jvm.core.PluginManager
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 /**
  * Mock server provided by a plugin

diff --git a/consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt b/consumer/src/main/kotlin/au/com/dius/pact/consumer/dsl/PactBuilder.kt
@@ -38,7 +38,7 @@ import io.pact.plugins.jvm.core.DefaultPluginManager
 import io.pact.plugins.jvm.core.PactPlugin
 import io.pact.plugins.jvm.core.PactPluginEntryNotFoundException
 import io.pact.plugins.jvm.core.PactPluginNotFoundException
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.nio.file.Path
 import java.nio.file.Paths
 import kotlin.io.path.exists

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/FormPostContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/FormPostContentMatcher.kt
@@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.OptionalBody
 import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.padTo
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.hc.core5.http.NameValuePair
 import org.apache.hc.core5.net.WWWFormCodec
 

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/HeaderMatcher.kt
@@ -1,6 +1,6 @@
 package au.com.dius.pact.core.matchers
 
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 object HeaderMatcher : KLogging() {
 

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/JsonContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/JsonContentMatcher.kt
@@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.json.JsonParser
 import au.com.dius.pact.core.support.json.JsonValue
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 object JsonContentMatcher : ContentMatcher, KLogging() {
 

diff --git a/.../matchers/src/main/kotlin/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcher.kt b/.../matchers/src/main/kotlin/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcher.kt
@@ -8,7 +8,7 @@ import au.com.dius.pact.core.support.json.JsonException
 import au.com.dius.pact.core.support.json.JsonParser
 import au.com.dius.pact.core.support.json.KafkaSchemaRegistryWireFormatter
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 class KafkaJsonSchemaContentMatcher : ContentMatcher {
 

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MatcherExecutor.kt
@@ -36,7 +36,7 @@ import com.github.zafarkhaja.semver.Version
 import io.pact.plugins.jvm.core.CatalogueEntry
 import io.pact.plugins.jvm.core.CatalogueEntryProviderType
 import io.pact.plugins.jvm.core.CatalogueEntryType
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.lang3.time.DateUtils
 import org.apache.tika.config.TikaConfig
 import org.apache.tika.io.TikaInputStream

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matchers.kt
@@ -20,7 +20,7 @@ import au.com.dius.pact.core.model.matchingrules.MinMaxEqualsIgnoreOrderMatcher
 import au.com.dius.pact.core.model.matchingrules.ValuesMatcher
 import au.com.dius.pact.core.model.parsePath
 import au.com.dius.pact.core.support.Either
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.math.BigInteger
 import java.util.Comparator
 

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/Matching.kt
@@ -19,7 +19,7 @@ import au.com.dius.pact.core.model.matchingrules.ValuesMatcher
 import au.com.dius.pact.core.model.parsePath
 import au.com.dius.pact.core.support.padTo
 import io.pact.plugins.jvm.core.PluginConfiguration
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.commons.codec.binary.Hex
 
 data class MatchingContext @JvmOverloads constructor(

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MetadataMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MetadataMatcher.kt
@@ -1,6 +1,6 @@
 package au.com.dius.pact.core.matchers
 
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 object MetadataMatcher : KLogging() {
 

diff --git a/...matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MultipartMessageContentMatcher.kt b/...matchers/src/main/kotlin/au/com/dius/pact/core/matchers/MultipartMessageContentMatcher.kt
@@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.IHttpPart
 import au.com.dius.pact.core.model.OptionalBody
 import au.com.dius.pact.core.support.Result
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.util.Enumeration
 import javax.mail.BodyPart
 import javax.mail.Header

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PlainTextContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PlainTextContentMatcher.kt
@@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.OptionalBody
 import au.com.dius.pact.core.model.matchingrules.RegexMatcher
 import au.com.dius.pact.core.support.Result
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 class PlainTextContentMatcher : ContentMatcher {
 

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PluginContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/PluginContentMatcher.kt
@@ -4,7 +4,7 @@ import au.com.dius.pact.core.model.ContentType
 import au.com.dius.pact.core.model.OptionalBody
 import au.com.dius.pact.core.support.Result
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 /**
  * Content matcher that delegates to a plugin

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/QueryMatcher.kt
@@ -1,7 +1,7 @@
 package au.com.dius.pact.core.matchers
 
 import au.com.dius.pact.core.support.padTo
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.atteo.evo.inflector.English
 
 object QueryMatcher : KLogging() {

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/RequestMatching.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/RequestMatching.kt
@@ -10,7 +10,7 @@ import au.com.dius.pact.core.model.V4Pact
 import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.json.JsonValue
 import io.pact.plugins.jvm.core.PluginConfiguration
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 sealed class RequestMatch {
   private val score: Int

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/ResponseMatching.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/ResponseMatching.kt
@@ -2,7 +2,7 @@ package au.com.dius.pact.core.matchers
 
 import au.com.dius.pact.core.model.IResponse
 import io.pact.plugins.jvm.core.PluginConfiguration
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 sealed class ResponseMatch
 object FullResponseMatch : ResponseMatch()

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/XmlContentMatcher.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/XmlContentMatcher.kt
@@ -5,7 +5,7 @@ import au.com.dius.pact.core.model.OptionalBody
 import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.zipAll
 import io.pact.plugins.jvm.core.InteractionContents
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.xerces.dom.TextImpl
 import org.w3c.dom.NamedNodeMap
 import org.w3c.dom.Node

diff --git a/...s/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ArrayContainsJsonGenerator.kt b/...s/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ArrayContainsJsonGenerator.kt
@@ -8,7 +8,7 @@ import au.com.dius.pact.core.model.generators.JsonContentTypeHandler
 import au.com.dius.pact.core.model.generators.JsonQueryResult
 import au.com.dius.pact.core.model.matchingrules.MatchingRuleCategory
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 object ArrayContainsJsonGenerator : KLogging(), Generator {
   override val type: String

diff --git a/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ResponseGenerator.kt b/core/matchers/src/main/kotlin/au/com/dius/pact/core/matchers/generators/ResponseGenerator.kt
@@ -9,7 +9,7 @@ import au.com.dius.pact.core.model.v4.MessageContents
 import au.com.dius.pact.core.support.Json.toJson
 import au.com.dius.pact.core.support.json.JsonValue
 import io.pact.plugins.jvm.core.CatalogueManager
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 interface ResponseGenerator {
   /**

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/BasePact.kt
@@ -4,7 +4,7 @@ import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.Utils
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.io.File
 import java.util.Collections
 import kotlin.reflect.full.declaredFunctions

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/ContentType.kt
@@ -1,7 +1,7 @@
 package au.com.dius.pact.core.model
 
 import au.com.dius.pact.core.support.isNotEmpty
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.tika.mime.MediaType
 import org.apache.tika.mime.MediaTypeRegistry
 import org.apache.tika.mime.MimeTypes

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/HttpPart.kt
@@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.generators.Generators
 import au.com.dius.pact.core.model.matchingrules.MatchingRules
 import au.com.dius.pact.core.support.isNotEmpty
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.nio.charset.Charset
 import java.util.Base64
 

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/OptionalBody.kt
@@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.ContentType.Companion.UNKNOWN
 import au.com.dius.pact.core.model.ContentType.Companion.XMLREGEXP
 import au.com.dius.pact.core.model.ContentType.Companion.XMLREGEXP2
 import au.com.dius.pact.core.support.json.JsonParser
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.commons.codec.binary.Hex
 import org.apache.tika.config.TikaConfig
 import org.apache.tika.io.TikaInputStream

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactMerge.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactMerge.kt
@@ -1,7 +1,7 @@
 package au.com.dius.pact.core.model
 
 import au.com.dius.pact.core.support.Result
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 data class MergeResult(val ok: Boolean, val message: String, val result: Pact? = null)
 

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactReader.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactReader.kt
@@ -20,8 +20,8 @@ import au.com.dius.pact.core.support.json.map
 import au.com.dius.pact.core.support.jsonArray
 import au.com.dius.pact.core.support.jsonObject
 import au.com.dius.pact.core.support.unwrap
-import mu.KLogging
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.hc.client5.http.auth.AuthScope
 import org.apache.hc.client5.http.auth.UsernamePasswordCredentials
 import org.apache.hc.client5.http.classic.methods.HttpGet

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactWriter.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/PactWriter.kt
@@ -4,7 +4,7 @@ import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.json.JsonParser
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.PrintWriter

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/Request.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/Request.kt
@@ -8,7 +8,7 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRules
 import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl
 import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 /**
  * Request made by a consumer to a provider

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/RequestResponseInteraction.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/RequestResponseInteraction.kt
@@ -2,7 +2,7 @@ package au.com.dius.pact.core.model
 
 import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.json.JsonParser
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.net.URLEncoder
 
 /**

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/Response.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/Response.kt
@@ -6,7 +6,7 @@ import au.com.dius.pact.core.model.generators.Generators
 import au.com.dius.pact.core.model.matchingrules.MatchingRules
 import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 
 /**
  * Response from a provider to a consumer

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4HttpParts.kt
@@ -8,7 +8,7 @@ import au.com.dius.pact.core.model.matchingrules.MatchingRules
 import au.com.dius.pact.core.model.matchingrules.MatchingRulesImpl
 import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import org.apache.commons.beanutils.BeanUtils
 
 private fun headersFromJson(json: JsonValue): Map<String, List<String>> {

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/V4Pact.kt
@@ -14,8 +14,8 @@ import au.com.dius.pact.core.support.isNotEmpty
 import au.com.dius.pact.core.support.json.JsonValue
 import au.com.dius.pact.core.support.json.map
 import au.com.dius.pact.core.support.jsonObject
-import mu.KLogging
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.lang3.builder.HashCodeBuilder
 import java.util.Base64
 

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateExpression.kt
@@ -7,7 +7,7 @@ import au.com.dius.pact.core.support.generators.expressions.DateExpressionLexer
 import au.com.dius.pact.core.support.generators.expressions.DateExpressionParser
 import au.com.dius.pact.core.support.generators.expressions.DateOffsetType
 import au.com.dius.pact.core.support.generators.expressions.Operation
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.time.DayOfWeek
 import java.time.Month
 import java.time.OffsetDateTime

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/DateTimeExpression.kt
@@ -2,7 +2,7 @@ package au.com.dius.pact.core.model.generators
 
 import au.com.dius.pact.core.support.Result
 import au.com.dius.pact.core.support.mapError
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.lang.Integer.parseInt
 import java.time.OffsetDateTime
 

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generator.kt
@@ -12,8 +12,8 @@ import au.com.dius.pact.core.support.getOr
 import au.com.dius.pact.core.support.isNotEmpty
 import au.com.dius.pact.core.support.json.JsonValue
 import com.mifmif.common.regex.Generex
-import mu.KLogging
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.apache.commons.lang3.RandomStringUtils
 import org.apache.commons.lang3.RandomUtils
 import java.math.BigDecimal

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generators.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/Generators.kt
@@ -10,7 +10,7 @@ import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.json.JsonParser
 import au.com.dius.pact.core.support.json.JsonValue
 import au.com.dius.pact.core.support.json.orNull
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.util.Locale
 
 enum class Category {

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/generators/TimeExpression.kt
@@ -7,7 +7,7 @@ import au.com.dius.pact.core.support.generators.expressions.TimeBase
 import au.com.dius.pact.core.support.generators.expressions.TimeExpressionLexer
 import au.com.dius.pact.core.support.generators.expressions.TimeExpressionParser
 import au.com.dius.pact.core.support.generators.expressions.TimeOffsetType
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.time.LocalTime
 import java.time.OffsetDateTime
 import java.time.ZoneOffset

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRuleCategory.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRuleCategory.kt
@@ -3,7 +3,7 @@ package au.com.dius.pact.core.model.matchingrules
 import au.com.dius.pact.core.model.PactSpecVersion
 import au.com.dius.pact.core.model.generators.Generator
 import au.com.dius.pact.core.support.json.JsonValue
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.util.Comparator
 import java.util.function.Predicate
 

diff --git a/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRules.kt b/core/model/src/main/kotlin/au/com/dius/pact/core/model/matchingrules/MatchingRules.kt
@@ -12,7 +12,7 @@ import au.com.dius.pact.core.support.Either
 import au.com.dius.pact.core.support.Json
 import au.com.dius.pact.core.support.json.JsonValue
 import au.com.dius.pact.core.support.json.map
-import mu.KLogging
+import io.github.oshai.kotlinlogging.KLogging
 import java.lang.RuntimeException
 
 /**