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 2022/03/30 01:14:07 UTC
[logging-log4j2] branch master updated: Disable compiler forks and other pom cleanups
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-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new c880660 Disable compiler forks and other pom cleanups
c880660 is described below
commit c8806608e08eae86057663a75554cd6b5442f8bb
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Tue Mar 29 20:13:53 2022 -0500
Disable compiler forks and other pom cleanups
Signed-off-by: Matt Sicker <ma...@apache.org>
---
log4j-1.2-api/pom.xml | 1 -
log4j-api-test/pom.xml | 2 +-
log4j-api/pom.xml | 3 +--
log4j-core-its/pom.xml | 1 -
log4j-core-test/pom.xml | 3 +--
log4j-docker/pom.xml | 1 -
log4j-flume-ng/pom.xml | 1 -
log4j-gctests/pom.xml | 1 -
log4j-jcl/pom.xml | 1 -
log4j-jmx-gui/pom.xml | 2 --
log4j-jndi-test/pom.xml | 1 -
log4j-jndi/pom.xml | 1 -
log4j-jpl/pom.xml | 1 -
log4j-jul/pom.xml | 1 -
log4j-kubernetes/pom.xml | 3 +--
log4j-layout-template-json/pom.xml | 2 +-
log4j-liquibase/pom.xml | 1 -
log4j-plugin-processor/pom.xml | 1 -
log4j-plugins-test/pom.xml | 2 +-
log4j-plugins/pom.xml | 2 +-
log4j-script/pom.xml | 3 +--
log4j-slf4j-impl/pom.xml | 1 -
log4j-slf4j18-impl/pom.xml | 1 -
log4j-smtp/pom.xml | 2 +-
log4j-spring-boot/pom.xml | 2 +-
log4j-taglib/pom.xml | 3 +--
log4j-to-jul/pom.xml | 1 -
log4j-to-slf4j/pom.xml | 1 -
28 files changed, 11 insertions(+), 34 deletions(-)
diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml
index 30914e4..28518e6 100644
--- a/log4j-1.2-api/pom.xml
+++ b/log4j-1.2-api/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-1.2-api</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index ac8afc2..bce0f32 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -104,7 +104,7 @@
<showWarnings>true</showWarnings>
<verbose>false</verbose>
<encoding>UTF-8</encoding>
- <fork>true</fork>
+ <fork>false</fork>
<meminitial>256</meminitial>
<maxmem>1024</maxmem>
<compilerArgs>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 9e75c15..93eb030 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-api</artifactId>
<packaging>jar</packaging>
@@ -109,7 +108,7 @@
<showWarnings>true</showWarnings>
<verbose>false</verbose>
<encoding>UTF-8</encoding>
- <fork>true</fork>
+ <fork>false</fork>
<meminitial>256</meminitial>
<maxmem>1024</maxmem>
<compilerArgs>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index 64825db..930d5cb 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-core-its</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 7e6610d..c8deb37 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-core-test</artifactId>
<packaging>jar</packaging>
@@ -316,7 +315,7 @@
<showWarnings>true</showWarnings>
<verbose>false</verbose>
<encoding>UTF-8</encoding>
- <fork>true</fork>
+ <fork>false</fork>
<meminitial>256</meminitial>
<maxmem>1024</maxmem>
<compilerArgs>
diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml
index b198475..d866784 100644
--- a/log4j-docker/pom.xml
+++ b/log4j-docker/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-docker</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml
index e259bdf..6bc60c9 100644
--- a/log4j-flume-ng/pom.xml
+++ b/log4j-flume-ng/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-flume-ng</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-gctests/pom.xml b/log4j-gctests/pom.xml
index 22712f2..217e69c 100644
--- a/log4j-gctests/pom.xml
+++ b/log4j-gctests/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-gctests</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml
index 26323cb..d31c8ea 100644
--- a/log4j-jcl/pom.xml
+++ b/log4j-jcl/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-jcl</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index 8bf58d2..3553feb 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-jmx-gui</artifactId>
<packaging>jar</packaging>
@@ -33,7 +32,6 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>JMX GUI Documentation</docLabel>
<projectDir>/jmx-gui</projectDir>
- <jenkins.java.home>/home/jenkins/tools/java/latest1.7</jenkins.java.home>
<module.name>org.apache.logging.log4j.jmx.gui</module.name>
<maven.doap.skip>true</maven.doap.skip>
</properties>
diff --git a/log4j-jndi-test/pom.xml b/log4j-jndi-test/pom.xml
index 77a171a..fac6f2e 100644
--- a/log4j-jndi-test/pom.xml
+++ b/log4j-jndi-test/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-jndi-test</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jndi/pom.xml b/log4j-jndi/pom.xml
index e3d89cb..20686a9 100644
--- a/log4j-jndi/pom.xml
+++ b/log4j-jndi/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-jndi</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
index b940b7d..b019fc6 100644
--- a/log4j-jpl/pom.xml
+++ b/log4j-jpl/pom.xml
@@ -21,7 +21,6 @@
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index 529a2b6..04d76b3 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -21,7 +21,6 @@
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml
index 8e348a1..1d065ed 100644
--- a/log4j-kubernetes/pom.xml
+++ b/log4j-kubernetes/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-kubernetes</artifactId>
<packaging>jar</packaging>
@@ -87,7 +86,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
</configuration>
</plugin>
</plugins>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 8992b8f..6507df8 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -137,7 +137,7 @@
<showWarnings>true</showWarnings>
<verbose>false</verbose>
<encoding>UTF-8</encoding>
- <fork>true</fork>
+ <fork>false</fork>
<meminitial>256</meminitial>
<maxmem>1024</maxmem>
<compilerArgs>
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 993e5d7..378bf29 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-liquibase</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-plugin-processor/pom.xml b/log4j-plugin-processor/pom.xml
index 79cfac1..40774b9 100644
--- a/log4j-plugin-processor/pom.xml
+++ b/log4j-plugin-processor/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-plugin-processor</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml
index 9c798bf..84a4e02 100644
--- a/log4j-plugins-test/pom.xml
+++ b/log4j-plugins-test/pom.xml
@@ -95,7 +95,7 @@
<showWarnings>true</showWarnings>
<verbose>false</verbose>
<encoding>UTF-8</encoding>
- <fork>true</fork>
+ <fork>false</fork>
<meminitial>256</meminitial>
<maxmem>1024</maxmem>
<compilerArgs>
diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml
index 38366c4..0a3dc9a 100644
--- a/log4j-plugins/pom.xml
+++ b/log4j-plugins/pom.xml
@@ -87,7 +87,7 @@
<showWarnings>true</showWarnings>
<verbose>false</verbose>
<encoding>UTF-8</encoding>
- <fork>true</fork>
+ <fork>false</fork>
<meminitial>256</meminitial>
<maxmem>1024</maxmem>
<compilerArgs>
diff --git a/log4j-script/pom.xml b/log4j-script/pom.xml
index 15908ae..ed89e66 100644
--- a/log4j-script/pom.xml
+++ b/log4j-script/pom.xml
@@ -21,7 +21,6 @@
<artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -125,7 +124,7 @@
<configuration>
<instructions>
<Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
- <Export-Package>org.apache.logging.log4j.jul</Export-Package>
+ <Export-Package>org.apache.logging.log4j.script.*</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 1d56f2d..776bfe6 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-slf4j-impl</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-slf4j18-impl/pom.xml b/log4j-slf4j18-impl/pom.xml
index 6860bac..daea718 100644
--- a/log4j-slf4j18-impl/pom.xml
+++ b/log4j-slf4j18-impl/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-slf4j18-impl</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-smtp/pom.xml b/log4j-smtp/pom.xml
index 1b5956d..cc5941c 100644
--- a/log4j-smtp/pom.xml
+++ b/log4j-smtp/pom.xml
@@ -77,7 +77,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Fragment-Host>org.apache.logging.log4j.core.appender.mom.jeromq</Fragment-Host>
+ <Fragment-Host>org.apache.logging.log4j.core</Fragment-Host>
<Export-Package>*</Export-Package>
</instructions>
</configuration>
diff --git a/log4j-spring-boot/pom.xml b/log4j-spring-boot/pom.xml
index 37652b6..172857e 100644
--- a/log4j-spring-boot/pom.xml
+++ b/log4j-spring-boot/pom.xml
@@ -135,7 +135,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>org.apache.logging.log4j.spring.cloud.config.controller</Export-Package>
+ <Export-Package>*</Export-Package>
</instructions>
</configuration>
</plugin>
diff --git a/log4j-taglib/pom.xml b/log4j-taglib/pom.xml
index b649dde..4e153e4 100644
--- a/log4j-taglib/pom.xml
+++ b/log4j-taglib/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-taglib</artifactId>
<packaging>jar</packaging>
@@ -115,7 +114,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
+ <reuseForks>true</reuseForks>
</configuration>
</plugin>
</plugins>
diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml
index 2262d39..d20e959 100644
--- a/log4j-to-jul/pom.xml
+++ b/log4j-to-jul/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-to-jul</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml
index 9d2dbf2..b40dd4f 100644
--- a/log4j-to-slf4j/pom.xml
+++ b/log4j-to-slf4j/pom.xml
@@ -21,7 +21,6 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
- <relativePath>../</relativePath>
</parent>
<artifactId>log4j-to-slf4j</artifactId>
<packaging>jar</packaging>