commit 1f8ae117b4b9d6f2f81e9ee0ed4e73e4882711d1
author Matt Sicker <boards@gmail.com> Sat Nov 03 11:42:00 2018 -0500
committer Matt Sicker <boards@gmail.com> Sat Nov 03 11:42:00 2018 -0500
tree a24a867ba560ec6ac7086f3bc0dc5136bc26cc58
parent f39add4d8bf43610abc58d99f23426d9def2bce8
parent c8fc6e3ec550a162851a89b6ea970e73cc171615

Merge branch 'named-logger'

log4j-api-kotlin/pom.xml

diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml
index 78b42be..70424d8 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>
@@ -103,6 +103,21 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.jetbrains.dokka</groupId>
+        <artifactId>dokka-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>dokka</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <skip>false</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

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

pom.xml

diff --git a/pom.xml b/pom.xml
index e1e6a8e..13ed06a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,10 +52,11 @@
     <Log4jReleaseKey>748F15B2CF9BA8F024155E6ED7C92B70FA1C814D</Log4jReleaseKey>
     <changes.plugin.version>2.12</changes.plugin.version>
     <checkstyle.plugin.version>2.17</checkstyle.plugin.version>
+    <dokka.plugin.version>0.9.17</dokka.plugin.version>
     <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>
@@ -64,7 +65,7 @@
     <!-- See https://maven.apache.org/plugins/maven-site-plugin/migrate.html -->
     <velocity.plugin.version>1.5</velocity.plugin.version>
     <asciidoc.plugin.version>1.5.6</asciidoc.plugin.version>
-    <surefire.plugin.version>2.19.1</surefire.plugin.version>
+    <surefire.plugin.version>2.22.1</surefire.plugin.version>
     <log4jParentDir>${basedir}</log4jParentDir>
   </properties>
 
@@ -117,6 +118,32 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>${surefire.plugin.version}</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
+        <plugin>
+          <groupId>org.jetbrains.dokka</groupId>
+          <artifactId>dokka-maven-plugin</artifactId>
+          <version>${dokka.plugin.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
@@ -198,6 +225,13 @@
           </asciidoc>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.jetbrains.dokka</groupId>
+        <artifactId>dokka-maven-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
   <reporting>
@@ -350,6 +384,13 @@
       </plugin>
     </plugins>
   </reporting>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>jcenter</id>
+      <name>JCenter</name>
+      <url>https://jcenter.bintray.com/</url>
+    </pluginRepository>
+  </pluginRepositories>
   <repositories>
     <repository>
       <id>apache.snapshots</id>