From 8829f0b95d9134ee24cbea8debb105eca6145b6b Mon Sep 17 00:00:00 2001
From: Dmitry Pavlov <zeldigas@gmail.com>
Date: Sat, 7 Oct 2023 16:58:45 +0300
Subject: [PATCH] migrated to `io.github.oshai:kotlin-logging-jvm`

---
 CHANGELOG.md                                  |  5 +++++
 cli/pom.xml                                   |  2 +-
 confluence-client/pom.xml                     |  2 +-
 .../confclient/ConfluenceClientImpl.kt        |  2 +-
 convert/pom.xml                               |  2 +-
 .../text2confl/convert/AttachmentCollector.kt |  2 +-
 .../ConfluenceStorageFormatConverters.kt      |  2 +-
 .../markdown/MarkdownAttachmentCollector.kt   |  2 +-
 .../diagram/MermaidDiagramsGenerator.kt       |  2 +-
 .../diagram/PlantUmlDiagramsGenerator.kt      |  2 +-
 .../convert/asciidoc/RenderingOfLinksTest.kt  | 20 +++++++++++++++++++
 .../text2confl/core/upload/ContentUploader.kt |  2 +-
 .../text2confl/core/upload/DryRunClient.kt    |  2 +-
 .../core/upload/PageUploadOperationsImpl.kt   |  2 +-
 pom.xml                                       |  4 ++--
 15 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4dd8df4..0893bc2f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,11 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
 
+### Changed
+
+- dependency updates:
+  - migrated to `io.github.oshai:kotlin-logging-jvm`
+
 ## 0.14.0 - 2023-09-20
 
 ### Added
diff --git a/cli/pom.xml b/cli/pom.xml
index 0e418d2c..ca489be6 100644
--- a/cli/pom.xml
+++ b/cli/pom.xml
@@ -75,7 +75,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.github.microutils</groupId>
+            <groupId>io.github.oshai</groupId>
             <artifactId>kotlin-logging-jvm</artifactId>
         </dependency>
         <dependency>
diff --git a/confluence-client/pom.xml b/confluence-client/pom.xml
index 51be701e..1e4abec5 100644
--- a/confluence-client/pom.xml
+++ b/confluence-client/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.github.microutils</groupId>
+            <groupId>io.github.oshai</groupId>
             <artifactId>kotlin-logging-jvm</artifactId>
         </dependency>
 
diff --git a/confluence-client/src/main/kotlin/com/github/zeldigas/confclient/ConfluenceClientImpl.kt b/confluence-client/src/main/kotlin/com/github/zeldigas/confclient/ConfluenceClientImpl.kt
index 0a81ad59..777fe5bf 100644
--- a/confluence-client/src/main/kotlin/com/github/zeldigas/confclient/ConfluenceClientImpl.kt
+++ b/confluence-client/src/main/kotlin/com/github/zeldigas/confclient/ConfluenceClientImpl.kt
@@ -7,6 +7,7 @@ import com.github.zeldigas.confclient.model.Attachment
 import com.github.zeldigas.confclient.model.ConfluencePage
 import com.github.zeldigas.confclient.model.PageAttachments
 import com.github.zeldigas.confclient.model.Space
+import io.github.oshai.kotlinlogging.KotlinLogging
 import io.ktor.client.*
 import io.ktor.client.call.*
 import io.ktor.client.engine.cio.*
@@ -22,7 +23,6 @@ import io.ktor.serialization.jackson.*
 import io.ktor.util.cio.*
 import io.ktor.utils.io.*
 import io.ktor.utils.io.streams.*
-import mu.KotlinLogging
 import java.nio.file.Path
 import java.security.cert.X509Certificate
 import javax.net.ssl.X509TrustManager
diff --git a/convert/pom.xml b/convert/pom.xml
index 90ade03d..553c38b8 100644
--- a/convert/pom.xml
+++ b/convert/pom.xml
@@ -102,7 +102,7 @@
         <!--common libraries-->
 
         <dependency>
-            <groupId>io.github.microutils</groupId>
+            <groupId>io.github.oshai</groupId>
             <artifactId>kotlin-logging-jvm</artifactId>
         </dependency>
 
diff --git a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/AttachmentCollector.kt b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/AttachmentCollector.kt
index fe01bd1d..ecf8789b 100644
--- a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/AttachmentCollector.kt
+++ b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/AttachmentCollector.kt
@@ -1,7 +1,7 @@
 package com.github.zeldigas.text2confl.convert
 
 import com.github.zeldigas.text2confl.convert.confluence.ReferenceProvider
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.net.URI
 import java.nio.file.Path
 import java.nio.file.Paths
diff --git a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/ConfluenceStorageFormatConverters.kt b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/ConfluenceStorageFormatConverters.kt
index 40513f98..6845027f 100644
--- a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/ConfluenceStorageFormatConverters.kt
+++ b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/ConfluenceStorageFormatConverters.kt
@@ -29,7 +29,7 @@ import com.vladsch.flexmark.util.data.DataKey
 import com.vladsch.flexmark.util.data.MutableDataHolder
 import com.vladsch.flexmark.util.sequence.BasedSequence
 import com.vladsch.flexmark.util.sequence.Escaping
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 
 
 internal class ConfluenceFormatExtension : HtmlRendererExtension, Parser.ParserExtension {
diff --git a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/MarkdownAttachmentCollector.kt b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/MarkdownAttachmentCollector.kt
index 4d711af6..af592924 100644
--- a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/MarkdownAttachmentCollector.kt
+++ b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/MarkdownAttachmentCollector.kt
@@ -8,7 +8,7 @@ import com.vladsch.flexmark.util.ast.Document
 import com.vladsch.flexmark.util.ast.Node
 import com.vladsch.flexmark.util.ast.NodeVisitor
 import com.vladsch.flexmark.util.ast.VisitHandler
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.nio.file.Path
 
 class MarkdownAttachmentCollector(
diff --git a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/MermaidDiagramsGenerator.kt b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/MermaidDiagramsGenerator.kt
index 5656bfc3..a2a808b7 100644
--- a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/MermaidDiagramsGenerator.kt
+++ b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/MermaidDiagramsGenerator.kt
@@ -1,7 +1,7 @@
 package com.github.zeldigas.text2confl.convert.markdown.diagram
 
 import com.github.zeldigas.text2confl.convert.markdown.MermaidDiagramsConfiguration
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.nio.file.Path
 
 class MermaidDiagramsGenerator(
diff --git a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/PlantUmlDiagramsGenerator.kt b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/PlantUmlDiagramsGenerator.kt
index 08dddbc3..4d9a548c 100644
--- a/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/PlantUmlDiagramsGenerator.kt
+++ b/convert/src/main/kotlin/com/github/zeldigas/text2confl/convert/markdown/diagram/PlantUmlDiagramsGenerator.kt
@@ -1,7 +1,7 @@
 package com.github.zeldigas.text2confl.convert.markdown.diagram
 
 import com.github.zeldigas.text2confl.convert.markdown.PlantUmlDiagramsConfiguration
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.nio.file.Path
 
 class PlantUmlDiagramsGenerator(
diff --git a/convert/src/test/kotlin/com/github/zeldigas/text2confl/convert/asciidoc/RenderingOfLinksTest.kt b/convert/src/test/kotlin/com/github/zeldigas/text2confl/convert/asciidoc/RenderingOfLinksTest.kt
index 5580f8de..7b243219 100644
--- a/convert/src/test/kotlin/com/github/zeldigas/text2confl/convert/asciidoc/RenderingOfLinksTest.kt
+++ b/convert/src/test/kotlin/com/github/zeldigas/text2confl/convert/asciidoc/RenderingOfLinksTest.kt
@@ -146,6 +146,26 @@ internal class RenderingOfLinksTest : RenderingTestBase() {
         )
     }
 
+    @Test
+    fun `Mailto link rendering`() {
+        val result = toHtml(
+            """
+            mailto:join@discuss.example.org[Subscribe,Subscribe me,I want to participate.]
+            
+            Send email to example@example.org
+            
+            link:mailto:example@example.org[Send email]
+        """.trimIndent()
+        )
+
+        assertThat(result).isEqualToConfluenceFormat(
+            """
+            <p><a href="mailto:join@discuss.example.org?subject=Subscribe+me&amp;body=I+want+to+participate.">Subscribe</a></p>
+            <p>Send email to <a href="mailto:example@example.org">example@example.org</a></p>
+            <p><a href="mailto:example@example.org">Send email</a></p>
+        """.trimIndent(),
+        )
+    }
 }
 
 
diff --git a/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/ContentUploader.kt b/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/ContentUploader.kt
index ad2527a5..800a05b6 100644
--- a/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/ContentUploader.kt
+++ b/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/ContentUploader.kt
@@ -6,11 +6,11 @@ import com.github.zeldigas.text2confl.convert.EditorVersion
 import com.github.zeldigas.text2confl.convert.Page
 import com.github.zeldigas.text2confl.convert.PageHeader
 import com.github.zeldigas.text2confl.core.config.Cleanup
+import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
-import mu.KotlinLogging
 
 
 class ContentUploader(
diff --git a/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/DryRunClient.kt b/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/DryRunClient.kt
index 0a70ecde..4297482c 100644
--- a/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/DryRunClient.kt
+++ b/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/DryRunClient.kt
@@ -2,7 +2,7 @@ package com.github.zeldigas.text2confl.core.upload
 
 import com.github.zeldigas.confclient.*
 import com.github.zeldigas.confclient.model.*
-import mu.KotlinLogging
+import io.github.oshai.kotlinlogging.KotlinLogging
 import java.time.ZonedDateTime
 
 class DryRunClient(private val realClient: ConfluenceClient) : ConfluenceClient by realClient {
diff --git a/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/PageUploadOperationsImpl.kt b/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/PageUploadOperationsImpl.kt
index 6e3f07ce..d0682df6 100644
--- a/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/PageUploadOperationsImpl.kt
+++ b/core/src/main/kotlin/com/github/zeldigas/text2confl/core/upload/PageUploadOperationsImpl.kt
@@ -6,9 +6,9 @@ import com.github.zeldigas.confclient.model.PageProperty
 import com.github.zeldigas.text2confl.convert.EditorVersion
 import com.github.zeldigas.text2confl.convert.Page
 import com.github.zeldigas.text2confl.convert.PageContent
+import io.github.oshai.kotlinlogging.KotlinLogging
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.launch
-import mu.KotlinLogging
 import java.nio.file.Path
 import kotlin.io.path.extension
 
diff --git a/pom.xml b/pom.xml
index 347ce52a..1bf9b847 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,9 +117,9 @@
                 <version>1.4.11</version>
             </dependency>
             <dependency>
-                <groupId>io.github.microutils</groupId>
+                <groupId>io.github.oshai</groupId>
                 <artifactId>kotlin-logging-jvm</artifactId>
-                <version>3.0.5</version>
+                <version>5.1.0</version>
             </dependency>
             <dependency>
                 <groupId>io.mockk</groupId>