You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2018/03/27 17:55:24 UTC
[04/25] logging-log4j-kotlin git commit: Update Kotlin version to
1.1.60
Update Kotlin version to 1.1.60
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/000c1116
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/000c1116
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/000c1116
Branch: refs/heads/master
Commit: 000c111626457fe651b9162584e8848c58162245
Parents: 5c64cf4
Author: Raman Gupta <ro...@gmail.com>
Authored: Thu Nov 23 20:29:46 2017 -0500
Committer: Raman Gupta <ro...@gmail.com>
Committed: Thu Nov 23 20:29:46 2017 -0500
----------------------------------------------------------------------
log4j-api-kotlin-sample/pom.xml | 5 ++---
log4j-api-kotlin/pom.xml | 7 +++++--
pom.xml | 3 +--
3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/000c1116/log4j-api-kotlin-sample/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-kotlin-sample/pom.xml b/log4j-api-kotlin-sample/pom.xml
index 510118c..811bb9c 100644
--- a/log4j-api-kotlin-sample/pom.xml
+++ b/log4j-api-kotlin-sample/pom.xml
@@ -27,9 +27,7 @@
<packaging>jar</packaging>
<name>Kotlin API samples</name>
<url>http://http://logging.apache.org/log4j/2.x/</url>
- <properties>
- <kotlin.version>1.0.5</kotlin.version>
- </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -41,6 +39,7 @@
<scope>runtime</scope>
</dependency>
</dependencies>
+
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<plugins>
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/000c1116/log4j-api-kotlin/pom.xml
----------------------------------------------------------------------
diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml
index d0c62a6..4460b9e 100644
--- a/log4j-api-kotlin/pom.xml
+++ b/log4j-api-kotlin/pom.xml
@@ -27,10 +27,11 @@
<packaging>jar</packaging>
<name>Kotlin wrapper for Log4j API</name>
<description>Kotlin wrapper for Log4j API</description>
+
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
- <kotlin.version>1.0.5</kotlin.version>
</properties>
+
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -60,10 +61,11 @@
<dependency>
<groupId>com.nhaarman</groupId>
<artifactId>mockito-kotlin</artifactId>
- <version>0.12.0</version>
+ <version>1.2.0</version>
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
@@ -112,6 +114,7 @@
</plugin>
</plugins>
</build>
+
<reporting>
<plugins>
<plugin>
http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/000c1116/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0453ad0..a251e55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,10 +36,9 @@
</scm>
<properties>
- <kotlin.version>1.0.5-2</kotlin.version>
+ <kotlin.version>1.1.60</kotlin.version>
</properties>
-
<dependencyManagement>
<dependencies>
<dependency>