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 2023/01/30 01:37:07 UTC
[logging-log4j-kotlin] branch master updated: Simplify more pom stuff
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j-kotlin.git
The following commit(s) were added to refs/heads/master by this push:
new 29ac530 Simplify more pom stuff
29ac530 is described below
commit 29ac5303e10a909e62826473eb359e680ac42cac
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Sun Jan 29 19:36:59 2023 -0600
Simplify more pom stuff
---
log4j-api-kotlin-benchmark/pom.xml | 8 ++------
log4j-api-kotlin-sample/pom.xml | 28 +++++++-------------------
log4j-api-kotlin/pom.xml | 5 +++++
pom.xml | 40 +++++++++++++++++---------------------
4 files changed, 32 insertions(+), 49 deletions(-)
diff --git a/log4j-api-kotlin-benchmark/pom.xml b/log4j-api-kotlin-benchmark/pom.xml
index bc15835..5bbbc79 100644
--- a/log4j-api-kotlin-benchmark/pom.xml
+++ b/log4j-api-kotlin-benchmark/pom.xml
@@ -36,7 +36,6 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<jmh.version>1.23</jmh.version>
<jmh.generator>default</jmh.generator>
- <javac.target>1.8</javac.target>
<uberjar.name>benchmarks</uberjar.name>
<maven.javadoc.skip>true</maven.javadoc.skip>
</properties>
@@ -87,10 +86,11 @@
<plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
- <version>${kotlin.version}</version>
<executions>
<execution>
<id>process-sources</id>
+ <!-- intentionally done during generate-sources so that we can let JMH work after that -->
+ <!--suppress KotlinMavenPluginPhase -->
<phase>generate-sources</phase>
<goals>
<goal>compile</goal>
@@ -170,11 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <compilerVersion>${javac.target}</compilerVersion>
- <source>${javac.target}</source>
- <target>${javac.target}</target>
<compilerArgument>-proc:none</compilerArgument>
</configuration>
<executions>
diff --git a/log4j-api-kotlin-sample/pom.xml b/log4j-api-kotlin-sample/pom.xml
index 1679e84..40a3ff5 100644
--- a/log4j-api-kotlin-sample/pom.xml
+++ b/log4j-api-kotlin-sample/pom.xml
@@ -68,38 +68,24 @@
<build>
<sourceDirectory>src/main/kotlin</sourceDirectory>
+
<plugins>
+
<plugin>
- <artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
- <version>${kotlin.version}</version>
- <executions>
- <execution>
- <id>compile</id>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test-compile</id>
- <goals>
- <goal>test-compile</goal>
- </goals>
- </execution>
- </executions>
+ <artifactId>kotlin-maven-plugin</artifactId>
</plugin>
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.5.0</version>
<configuration>
<mainClass>org.apache.logging.log4j.kotlin.sample.LoggingApp</mainClass>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- </plugin>
+
</plugins>
+
</build>
+
</project>
diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml
index 982a96a..c2f85dc 100644
--- a/log4j-api-kotlin/pom.xml
+++ b/log4j-api-kotlin/pom.xml
@@ -109,6 +109,11 @@
<testSourceDirectory>src/test/kotlin</testSourceDirectory>
<plugins>
+ <plugin>
+ <groupId>org.jetbrains.kotlin</groupId>
+ <artifactId>kotlin-maven-plugin</artifactId>
+ </plugin>
+
<plugin>
<groupId>org.jetbrains.dokka</groupId>
<artifactId>dokka-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index a1f0906..d7ec6ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,8 @@
<!-- =================
Common properties
================= -->
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<!-- Skipping `maven-site-plugin` globally.
It is manually enabled only for the parent module below. -->
@@ -248,6 +250,22 @@
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<version>${kotlin.version}</version>
+ <executions>
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>test-compile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>test-compile</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -311,28 +329,6 @@
<plugins>
- <plugin>
- <groupId>org.jetbrains.kotlin</groupId>
- <artifactId>kotlin-maven-plugin</artifactId>
- <version>${kotlin.version}</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- </execution>
- <execution>
- <id>test-compile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>test-compile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
<!-- ███████ ████████ █████ ██████ ████████ ███████ ██ ████████ ███████
██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██
███████ ██ ███████ ██████ ██ ███████ ██ ██ █████