Bumped Kotlin and Kotlin Extensions baseline to `1.6.21` and `1.6.4` respectively
diff --git a/.github/dependabot.yaml b/.github/dependabot.yaml
index 05abddf..3176f0f 100644
--- a/.github/dependabot.yaml
+++ b/.github/dependabot.yaml
@@ -25,7 +25,13 @@
open-pull-requests-limit: 10
ignore:
# Keep Kotlin baseline
- - dependency-name: "org.jetbrains.kotlin:kotlin-*"
+ - dependency-name: "org.jetbrains.kotlin:*"
+ update-types: ["version-update:semver-major", "version-update:semver-minor"]
+ # Keep Kotlin extensions baseline
+ - dependency-name: "org.jetbrains.kotlinx:*"
+ update-types: ["version-update:semver-major", "version-update:semver-minor"]
+ # Keep Mockito baseline (5+ requires Java 11)
+ - dependency-name: "org.mockito.kotlin:*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
- package-ecosystem: github-actions
diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml
index 3ea3dea..b46690b 100644
--- a/log4j-api-kotlin/pom.xml
+++ b/log4j-api-kotlin/pom.xml
@@ -106,7 +106,7 @@
</dependency>
<dependency>
- <groupId>com.nhaarman.mockitokotlin2</groupId>
+ <groupId>org.mockito.kotlin</groupId>
<artifactId>mockito-kotlin</artifactId>
<scope>test</scope>
</dependency>
diff --git a/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt
index d657d13..d19b14b 100644
--- a/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt
+++ b/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt
@@ -16,13 +16,13 @@
*/
package org.apache.logging.log4j.kotlin
-import com.nhaarman.mockitokotlin2.*
import org.apache.logging.log4j.Level
import org.apache.logging.log4j.MarkerManager
import org.apache.logging.log4j.message.*
import org.apache.logging.log4j.spi.ExtendedLogger
import org.junit.jupiter.api.Test
import org.mockito.ArgumentMatchers.anyString
+import org.mockito.kotlin.*
import kotlin.test.assertEquals
import kotlin.test.assertFailsWith
diff --git a/pom.xml b/pom.xml
index 61a1e5c..f64a194 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,9 +127,9 @@
<jmh.version>1.37</jmh.version>
<junit.version>5.10.0</junit.version>
<log4j.version>2.20.0</log4j.version>
- <kotlin.version>1.3.72</kotlin.version>
- <kotlinx.coroutines.version>1.3.9</kotlinx.coroutines.version>
- <mockito-kotlin.version>2.2.0</mockito-kotlin.version>
+ <kotlin.version>1.6.21</kotlin.version>
+ <kotlinx.coroutines.version>1.6.4</kotlinx.coroutines.version>
+ <mockito-kotlin.version>4.1.0</mockito-kotlin.version>
<spotbugs-annotations.version>4.7.3</spotbugs-annotations.version>
<!-- plugin versions -->
@@ -206,7 +206,7 @@
</dependency>
<dependency>
- <groupId>com.nhaarman.mockitokotlin2</groupId>
+ <groupId>org.mockito.kotlin</groupId>
<artifactId>mockito-kotlin</artifactId>
<version>${mockito-kotlin.version}</version>
</dependency>
diff --git a/src/changelog/.1.x.x/kotlin-baseline.xml b/src/changelog/.1.x.x/kotlin-baseline.xml
new file mode 100644
index 0000000..75c1bac
--- /dev/null
+++ b/src/changelog/.1.x.x/kotlin-baseline.xml
@@ -0,0 +1,8 @@
+<entry xmlns="http://logging.apache.org/log4j/changelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.1.xsd"
+ type="changed">
+ <author id="github:breun"/>
+ <author id="github:vy"/>
+ <description format="markdown">Bumped Kotlin and Kotlin Extensions baseline to `1.6.21` and `1.6.4` respectively</description>
+</entry>
