Clean up pom files
* Fix group ids
* Use logging-parent
* Use log4j 2.11.0
* Use Kotlin 1.2.31
diff --git a/log4j-api-kotlin-sample/pom.xml b/log4j-api-kotlin-sample/pom.xml
index 810f338..7ae5f4c 100644
--- a/log4j-api-kotlin-sample/pom.xml
+++ b/log4j-api-kotlin-sample/pom.xml
@@ -19,13 +19,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-kotlin</artifactId>
- <version>2.10.1-SNAPSHOT</version>
+ <artifactId>log4j-api-kotlin-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
+
<artifactId>log4j-api-kotlin-sample</artifactId>
+ <version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Kotlin API samples</name>
+ <name>Apache Log4j Kotlin API Samples</name>
+ <description>Sample usage of the Log4j Kotlin API</description>
<url>http://http://logging.apache.org/log4j/2.x/</url>
<dependencies>
diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml
index c79537a..e3c340a 100644
--- a/log4j-api-kotlin/pom.xml
+++ b/log4j-api-kotlin/pom.xml
@@ -19,18 +19,16 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-kotlin</artifactId>
- <version>2.10.1-SNAPSHOT</version>
+ <artifactId>log4j-api-kotlin-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
- <artifactId>log4j-api-kotlin</artifactId>
- <packaging>jar</packaging>
- <name>Kotlin wrapper for Log4j API</name>
- <description>Kotlin wrapper for Log4j API</description>
- <properties>
- <log4jParentDir>${basedir}/..</log4jParentDir>
- </properties>
+ <artifactId>log4j-api-kotlin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Apache Log4j Kotlin API</name>
+ <description>Kotlin wrapper for Log4j API</description>
<dependencies>
<dependency>
@@ -67,6 +65,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.12</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -100,59 +99,12 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <!-- Include the standard NOTICE and LICENSE -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <skip>false</skip>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
</plugins>
</build>
<reporting>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>${changes.plugin.version}</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
- <issueLinkTemplate>%URL%/show_bug.cgi?id=%ISSUE%</issueLinkTemplate>
- <useJql>true</useJql>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>${pmd.plugin.version}</version>
- <configuration>
- <targetJdk>${maven.compile.target}</targetJdk>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
diff --git a/pom.xml b/pom.xml
index bc2b2dd..31af9ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,26 +17,30 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>log4j-kotlin</artifactId>
- <packaging>pom</packaging>
- <name>Apache Log4j 2 Kotlin API</name>
- <version>2.10.1-SNAPSHOT</version>
<parent>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>2.10.1-SNAPSHOT</version>
+ <groupId>org.apache.logging</groupId>
+ <artifactId>logging-parent</artifactId>
+ <version>2</version>
</parent>
- <description>Apache Log4j 2 Kotlin API</description>
- <url>http://logging.apache.org/log4j/2.x/</url>
+
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api-kotlin-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Apache Log4j Kotlin API</name>
+ <description>Apache Log4j Kotlin API parent project</description>
+
+ <!-- TODO: website publishing -->
+ <url>https://logging.apache.org/log4j/kotlin/</url>
<scm>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf?p=logging-log4j-kotlin.git;a=summary</url>
- <tag>log4j-${Log4jReleaseVersion}</tag>
</scm>
<properties>
- <kotlin.version>1.2.21</kotlin.version>
+ <kotlin.version>1.2.31</kotlin.version>
+ <log4j.version>2.11.0</log4j.version>
</properties>
<dependencyManagement>
@@ -46,6 +50,30 @@
<artifactId>log4j-api-kotlin</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ <version>${log4j.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
