Repository: logging-log4j-kotlin Updated Branches: refs/heads/master 247c0c105 -> f39add4d8
Update to Kotlin 1.3 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/7d2eb416 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/7d2eb416 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/7d2eb416 Branch: refs/heads/master Commit: 7d2eb416bbf9fcd7c978f082fd5a10bff0666191 Parents: 247c0c1 Author: Raman Gupta <[email protected]> Authored: Fri Nov 2 02:01:15 2018 -0400 Committer: Raman Gupta <[email protected]> Committed: Fri Nov 2 02:01:15 2018 -0400 ---------------------------------------------------------------------- log4j-api-kotlin/pom.xml | 4 ++-- .../test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt | 2 +- pom.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7d2eb416/log4j-api-kotlin/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml index 78b42be..a37e19d 100644 --- a/log4j-api-kotlin/pom.xml +++ b/log4j-api-kotlin/pom.xml @@ -73,9 +73,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.nhaarman</groupId> + <groupId>com.nhaarman.mockitokotlin2</groupId> <artifactId>mockito-kotlin</artifactId> - <version>1.2.0</version> + <version>2.0.0</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7d2eb416/log4j-api-kotlin/src/test/kotlin/org.apache.logging.log4j.kotlin/LoggerTest.kt ---------------------------------------------------------------------- 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 2a981f4..0d0ef58 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,7 +16,7 @@ */ package org.apache.logging.log4j.kotlin -import com.nhaarman.mockito_kotlin.* +import com.nhaarman.mockitokotlin2.* import org.apache.logging.log4j.Level import org.apache.logging.log4j.MarkerManager import org.apache.logging.log4j.junit.LoggerContextRule http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7d2eb416/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e1e6a8e..4ad69a4 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ <findbugs.plugin.version>3.0.5</findbugs.plugin.version> <javadoc.plugin.version>2.10.3</javadoc.plugin.version> <jxr.plugin.version>2.5</jxr.plugin.version> - <kotlin.version>1.2.31</kotlin.version> + <kotlin.version>1.3.0</kotlin.version> <log4j.version>2.11.0</log4j.version> <pmd.plugin.version>3.8</pmd.plugin.version> <rat.plugin.version>0.12</rat.plugin.version>
