You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/03/04 14:50:28 UTC
[logging-log4j2] branch main updated (acd123f3a1 -> 3afdc2c81d)
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
from acd123f3a1 Upload reproducibility failure context artifacts in CI (#1321)
new d4ef99a1b9 Add basic `sortPom` configuration
new 3afdc2c81d Sort POMs
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
log4j-api-test/pom.xml | 8 +-
log4j-api/pom.xml | 6 +-
log4j-appserver/pom.xml | 2 +-
log4j-bom/pom.xml | 31 ++-
log4j-cassandra/pom.xml | 12 +-
log4j-core-its/pom.xml | 6 +-
log4j-core-test/pom.xml | 8 +-
log4j-core/pom.xml | 6 +-
log4j-couchdb/pom.xml | 6 +-
log4j-csv/pom.xml | 6 +-
log4j-jakarta-web/pom.xml | 4 +-
log4j-jdbc-dbcp2/pom.xml | 6 +-
log4j-jdbc/pom.xml | 6 +-
log4j-jeromq/pom.xml | 6 +-
log4j-jms/pom.xml | 6 +-
log4j-jmx-gui/pom.xml | 4 +-
log4j-jpa/pom.xml | 6 +-
log4j-jpl/pom.xml | 38 ++--
log4j-jul/pom.xml | 92 ++++----
log4j-kafka/pom.xml | 6 +-
log4j-layout-jackson-json/pom.xml | 6 +-
log4j-layout-jackson-xml/pom.xml | 6 +-
log4j-layout-jackson-yaml/pom.xml | 6 +-
log4j-layout-jackson/pom.xml | 6 +-
log4j-layout-template-json-test/pom.xml | 61 +++--
log4j-layout-template-json/pom.xml | 6 +-
log4j-liquibase/pom.xml | 8 +-
log4j-mongodb3/pom.xml | 6 +-
log4j-mongodb4/pom.xml | 6 +-
log4j-osgi/pom.xml | 16 +-
log4j-perf/pom.xml | 4 +-
log4j-plugin-processor/pom.xml | 6 +-
log4j-plugins-test/pom.xml | 6 +-
log4j-plugins/pom.xml | 6 +-
log4j-script/pom.xml | 16 +-
log4j-slf4j-impl/pom.xml | 10 +-
log4j-slf4j2-impl/pom.xml | 18 +-
log4j-smtp/pom.xml | 6 +-
.../log4j-spring-cloud-config-client/pom.xml | 2 +-
log4j-spring-cloud-config/pom.xml | 6 +-
log4j-web/pom.xml | 6 +-
pom.xml | 246 +++++++++++----------
42 files changed, 342 insertions(+), 382 deletions(-)
[logging-log4j2] 02/02: Sort POMs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3afdc2c81da906561155e4081f6e8f005c98859b
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Sat Mar 4 15:50:08 2023 +0100
Sort POMs
---
log4j-api-test/pom.xml | 8 +-
log4j-api/pom.xml | 6 +-
log4j-appserver/pom.xml | 2 +-
log4j-cassandra/pom.xml | 12 +-
log4j-core-its/pom.xml | 6 +-
log4j-core-test/pom.xml | 8 +-
log4j-core/pom.xml | 6 +-
log4j-couchdb/pom.xml | 6 +-
log4j-csv/pom.xml | 6 +-
log4j-jakarta-web/pom.xml | 4 +-
log4j-jdbc-dbcp2/pom.xml | 6 +-
log4j-jdbc/pom.xml | 6 +-
log4j-jeromq/pom.xml | 6 +-
log4j-jms/pom.xml | 6 +-
log4j-jmx-gui/pom.xml | 4 +-
log4j-jpa/pom.xml | 6 +-
log4j-jpl/pom.xml | 38 ++--
log4j-jul/pom.xml | 92 ++++----
log4j-kafka/pom.xml | 6 +-
log4j-layout-jackson-json/pom.xml | 6 +-
log4j-layout-jackson-xml/pom.xml | 6 +-
log4j-layout-jackson-yaml/pom.xml | 6 +-
log4j-layout-jackson/pom.xml | 6 +-
log4j-layout-template-json-test/pom.xml | 61 +++---
log4j-layout-template-json/pom.xml | 6 +-
log4j-liquibase/pom.xml | 8 +-
log4j-mongodb3/pom.xml | 6 +-
log4j-mongodb4/pom.xml | 6 +-
log4j-osgi/pom.xml | 16 +-
log4j-perf/pom.xml | 4 +-
log4j-plugin-processor/pom.xml | 6 +-
log4j-plugins-test/pom.xml | 6 +-
log4j-plugins/pom.xml | 6 +-
log4j-script/pom.xml | 16 +-
log4j-slf4j-impl/pom.xml | 10 +-
log4j-slf4j2-impl/pom.xml | 18 +-
log4j-smtp/pom.xml | 6 +-
.../log4j-spring-cloud-config-client/pom.xml | 2 +-
log4j-spring-cloud-config/pom.xml | 6 +-
log4j-web/pom.xml | 6 +-
pom.xml | 241 ++++++++++-----------
41 files changed, 309 insertions(+), 379 deletions(-)
diff --git a/log4j-api-test/pom.xml b/log4j-api-test/pom.xml
index 182facb200..e5ed7009b5 100644
--- a/log4j-api-test/pom.xml
+++ b/log4j-api-test/pom.xml
@@ -126,10 +126,8 @@
<configuration>
<instructions>
<Export-Package>org.apache.logging.log4j.*</Export-Package>
- <Import-Package>
- sun.reflect;resolution:=optional,
- *
- </Import-Package>
+ <Import-Package>sun.reflect;resolution:=optional,
+ *</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.util.Activator</Bundle-Activator>
<_fixupmessages>"Classes found in the wrong directory";is:=warning</_fixupmessages>
</instructions>
@@ -142,10 +140,10 @@
<executions>
<execution>
<id>remove-module-info</id>
- <phase>process-classes</phase>
<goals>
<goal>clean</goal>
</goals>
+ <phase>process-classes</phase>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 8dfe87b1d8..1aa46bb52a 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -52,10 +52,8 @@
<configuration>
<instructions>
<Export-Package>org.apache.logging.log4j.*</Export-Package>
- <Import-Package>
- sun.reflect;resolution:=optional,
- *
- </Import-Package>
+ <Import-Package>sun.reflect;resolution:=optional,
+ *</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.util.Activator</Bundle-Activator>
<_fixupmessages>"Classes found in the wrong directory";is:=warning</_fixupmessages>
</instructions>
diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml
index dc6f90adca..cb2a5a0a08 100644
--- a/log4j-appserver/pom.xml
+++ b/log4j-appserver/pom.xml
@@ -20,8 +20,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
diff --git a/log4j-cassandra/pom.xml b/log4j-cassandra/pom.xml
index 42f6b98655..058dda06bc 100644
--- a/log4j-cassandra/pom.xml
+++ b/log4j-cassandra/pom.xml
@@ -16,18 +16,16 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-cassandra</artifactId>
<name>Apache Log4j Cassandra</name>
- <description>
- Cassandra appender for Log4j.
- </description>
+ <description>Cassandra appender for Log4j.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Cassandra Documentation</docLabel>
@@ -123,15 +121,13 @@
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<!-- in Java 16+, https://openjdk.java.net/jeps/396 encapsulates internals CassandraRule accesses -->
- <argLine>
- --add-opens java.base/java.io=ALL-UNNAMED
+ <argLine>--add-opens java.base/java.io=ALL-UNNAMED
--add-opens java.base/java.lang=ALL-UNNAMED
--add-opens java.base/java.nio=ALL-UNNAMED
--add-opens java.base/java.util=ALL-UNNAMED
--add-opens java.base/java.util.concurrent=ALL-UNNAMED
--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED
- --add-opens java.base/sun.nio.ch=ALL-UNNAMED
- </argLine>
+ --add-opens java.base/sun.nio.ch=ALL-UNNAMED</argLine>
</configuration>
</plugin>
</plugins>
diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml
index aaed4efbd6..68b8e9c187 100644
--- a/log4j-core-its/pom.xml
+++ b/log4j-core-its/pom.xml
@@ -235,10 +235,8 @@
<excludes>
<exclude>**/ForceNoDefClassFoundError.*</exclude>
</excludes>
- <groups>
- org.apache.logging.log4j.core.test.categories.PerformanceTests,
- org.apache.logging.log4j.core.test.categories.Appenders$Jms
- </groups>
+ <groups>org.apache.logging.log4j.core.test.categories.PerformanceTests,
+ org.apache.logging.log4j.core.test.categories.Appenders$Jms</groups>
</configuration>
</plugin>
<plugin>
diff --git a/log4j-core-test/pom.xml b/log4j-core-test/pom.xml
index 0e444d4b8b..2a9c38c4da 100644
--- a/log4j-core-test/pom.xml
+++ b/log4j-core-test/pom.xml
@@ -329,8 +329,7 @@
<Bundle-SymbolicName>org.apache.logging.log4j.core</Bundle-SymbolicName>
<!-- TODO: exclude internal classes from export -->
<Export-Package>org.apache.logging.log4j.core.*</Export-Package>
- <Import-Package>
- sun.reflect;resolution:=optional,
+ <Import-Package>sun.reflect;resolution:=optional,
org.apache.logging.log4j.util,
org.apache.logging.log4j.plugins,
org.apache.logging.log4j.plugins.convert,
@@ -338,8 +337,7 @@
org.apache.logging.log4j.plugins.util,
org.apache.logging.log4j.plugins.validation,
org.apache.logging.log4j.plugins.inject,
- *
- </Import-Package>
+ *</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.core.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
@@ -351,10 +349,10 @@
<executions>
<execution>
<id>remove-module-info</id>
- <phase>process-classes</phase>
<goals>
<goal>clean</goal>
</goals>
+ <phase>process-classes</phase>
<configuration>
<excludeDefaultDirectories>true</excludeDefaultDirectories>
<filesets>
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 9a5a9f31a0..78d38bd1b9 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -137,15 +137,13 @@
<Bundle-SymbolicName>org.apache.logging.log4j.core</Bundle-SymbolicName>
<!-- TODO: exclude internal classes from export -->
<Export-Package>org.apache.logging.log4j.core.*</Export-Package>
- <Import-Package>
- javax.activation;version="[1.2,2)";resolution:=optional,
+ <Import-Package>javax.activation;version="[1.2,2)";resolution:=optional,
javax.jms;version="[1.1,3)";resolution:=optional,
javax.mail;version="[1.6,2)";resolution:=optional,
javax.mail.internet;version="[1.6,2)";resolution:=optional,
javax.mail.util;version="[1.6,2)";resolution:=optional,
sun.reflect;resolution:=optional,
- *
- </Import-Package>
+ *</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.core.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
diff --git a/log4j-couchdb/pom.xml b/log4j-couchdb/pom.xml
index 2107e158ca..9ceaf9dc53 100644
--- a/log4j-couchdb/pom.xml
+++ b/log4j-couchdb/pom.xml
@@ -16,18 +16,16 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-couchdb</artifactId>
<name>Apache Log4j CouchDB</name>
- <description>
- CouchDB appender for Log4j.
- </description>
+ <description>CouchDB appender for Log4j.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>CouchDB Documentation</docLabel>
diff --git a/log4j-csv/pom.xml b/log4j-csv/pom.xml
index 5ba937b82b..dcf6853190 100644
--- a/log4j-csv/pom.xml
+++ b/log4j-csv/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-csv</artifactId>
<name>Apache Log4j CSV</name>
- <description>
- Apache Log4j CSV Layout.
- </description>
+ <description>Apache Log4j CSV Layout.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j CSV Documentation</docLabel>
diff --git a/log4j-jakarta-web/pom.xml b/log4j-jakarta-web/pom.xml
index 0060ca7e2e..487b831cc1 100644
--- a/log4j-jakarta-web/pom.xml
+++ b/log4j-jakarta-web/pom.xml
@@ -16,12 +16,12 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-jakarta-web</artifactId>
<packaging>jar</packaging>
diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
index 75f2ae25ad..d92a81d521 100644
--- a/log4j-jdbc-dbcp2/pom.xml
+++ b/log4j-jdbc-dbcp2/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-jdbc-dbcp2</artifactId>
<name>Apache Log4j JDBC DBCP 2</name>
- <description>
- Connection source for the JDBC Appender using Apache Commons DBCP2.
- </description>
+ <description>Connection source for the JDBC Appender using Apache Commons DBCP2.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j JDBC DBCP 2 Documentation</docLabel>
diff --git a/log4j-jdbc/pom.xml b/log4j-jdbc/pom.xml
index 0c9c1b7a52..4bc195904e 100644
--- a/log4j-jdbc/pom.xml
+++ b/log4j-jdbc/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-jdbc</artifactId>
<name>Apache Log4j JDBC</name>
- <description>
- Apache Log4j Java Database Connectivity (JDBC).
- </description>
+ <description>Apache Log4j Java Database Connectivity (JDBC).</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j JDBC Documentation</docLabel>
diff --git a/log4j-jeromq/pom.xml b/log4j-jeromq/pom.xml
index 073dfafe39..3e1748ee51 100644
--- a/log4j-jeromq/pom.xml
+++ b/log4j-jeromq/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-jeromq</artifactId>
<name>Apache Log4j JeroMQ</name>
- <description>
- Apache Log4j ZeroMQ using JeroMQ.
- </description>
+ <description>Apache Log4j ZeroMQ using JeroMQ.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j ZeroMQ using JeroMQ Documentation</docLabel>
diff --git a/log4j-jms/pom.xml b/log4j-jms/pom.xml
index 13bf9022bf..222bd077cd 100644
--- a/log4j-jms/pom.xml
+++ b/log4j-jms/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-jms</artifactId>
<name>Apache Log4j JMS</name>
- <description>
- Apache Log4j Java Message Service (JMS).
- </description>
+ <description>Apache Log4j Java Message Service (JMS).</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j JMS Documentation</docLabel>
diff --git a/log4j-jmx-gui/pom.xml b/log4j-jmx-gui/pom.xml
index 8cbcf9e3d3..3193df4e43 100644
--- a/log4j-jmx-gui/pom.xml
+++ b/log4j-jmx-gui/pom.xml
@@ -25,9 +25,7 @@
<artifactId>log4j-jmx-gui</artifactId>
<packaging>jar</packaging>
<name>Apache Log4j JMX GUI</name>
- <description>
- Swing GUI to remotely edit Log4j configurations. This includes a JConsole plugin and a StatusLogger monitor.
- </description>
+ <description>Swing GUI to remotely edit Log4j configurations. This includes a JConsole plugin and a StatusLogger monitor.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>JMX GUI Documentation</docLabel>
diff --git a/log4j-jpa/pom.xml b/log4j-jpa/pom.xml
index 4fd8c769c1..72636e53ef 100644
--- a/log4j-jpa/pom.xml
+++ b/log4j-jpa/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-jpa</artifactId>
<name>Apache Log4j JPA</name>
- <description>
- Apache Log4j Java Persistence API Appender.
- </description>
+ <description>Apache Log4j Java Persistence API Appender.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j JPA Documentation</docLabel>
diff --git a/log4j-jpl/pom.xml b/log4j-jpl/pom.xml
index b637c9498d..1938ed200a 100644
--- a/log4j-jpl/pom.xml
+++ b/log4j-jpl/pom.xml
@@ -16,22 +16,22 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>log4j-jpl</artifactId>
+ <name>Apache Log4j JDK Platform Logging Adapter</name>
+ <description>The Apache Log4j implementation of java.lang.System.LoggerFinder</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<module.name>org.apache.logging.log4j.jpl</module.name>
</properties>
- <artifactId>log4j-jpl</artifactId>
- <name>Apache Log4j JDK Platform Logging Adapter</name>
- <description>The Apache Log4j implementation of java.lang.System.LoggerFinder</description>
-
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
@@ -106,30 +106,30 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>11</source>
+ <target>11</target>
+ <release>11</release>
+ <proc>none</proc>
+ <!-- disable errorprone -->
+ <compilerId>javac</compilerId>
+ </configuration>
<executions>
<execution>
<id>default-compile</id>
- <phase>compile</phase>
<goals>
<goal>compile</goal>
</goals>
+ <phase>compile</phase>
</execution>
<execution>
<id>default-testCompile</id>
- <phase>test-compile</phase>
<goals>
<goal>testCompile</goal>
</goals>
+ <phase>test-compile</phase>
</execution>
</executions>
- <configuration>
- <source>11</source>
- <target>11</target>
- <release>11</release>
- <proc>none</proc>
- <!-- disable errorprone -->
- <compilerId>javac</compilerId>
- </configuration>
</plugin>
<!-- Workaround Surefire 3.0.0-M7 limitation: it does not add the main classes with 'patch-module' -->
<plugin>
@@ -138,10 +138,10 @@
<executions>
<execution>
<id>shade-test-module</id>
- <phase>process-test-classes</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>process-test-classes</phase>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
@@ -156,8 +156,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <!-- Manual override of the Surefire provider -->
- <!-- The `surefire-platform` provider initializes JUL before calling our tests -->
+ <!-- Manual override of the Surefire provider -->
+ <!-- The `surefire-platform` provider initializes JUL before calling our tests -->
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
diff --git a/log4j-jul/pom.xml b/log4j-jul/pom.xml
index ac31b8f3a7..8204f8dff5 100644
--- a/log4j-jul/pom.xml
+++ b/log4j-jul/pom.xml
@@ -16,21 +16,21 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
-
- <properties>
- <log4jParentDir>${basedir}/..</log4jParentDir>
- </properties>
<artifactId>log4j-jul</artifactId>
<name>Apache Log4j JUL Adapter</name>
<description>The Apache Log4j implementation of java.util.logging</description>
+ <properties>
+ <log4jParentDir>${basedir}/..</log4jParentDir>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -54,7 +54,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -107,6 +107,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <java.awt.headless>true</java.awt.headless>
+ </systemPropertyVariables>
+ <argLine>-Xms256m -Xmx1024m</argLine>
+ <forkCount>1</forkCount>
+ <reuseForks>false</reuseForks>
+ </configuration>
<dependencies>
<!-- Manual override of the Surefire provider -->
<!-- The `surefire-platform` provider initializes JUL before calling our tests -->
@@ -116,47 +124,39 @@
<version>${surefire.version}</version>
</dependency>
</dependencies>
- <configuration>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <excludes>
+ <exclude>${log4j.skip.test1}</exclude>
+ <exclude>${log4j.skip.test2}</exclude>
+ <exclude>Log4jBridgeHandlerTest.java</exclude>
+ </excludes>
+ </configuration>
+ </execution>
+ <execution>
+ <!-- this test needs some special configuration, thus its own run -->
+ <id>bridgeHandler-test</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <phase>test</phase>
+ <configuration>
+ <includes>
+ <include>Log4jBridgeHandlerTest.java</include>
+ </includes>
<systemPropertyVariables>
- <java.awt.headless>true</java.awt.headless>
+ <java.util.logging.config.file>src/test/resources/logging-test.properties</java.util.logging.config.file>
+ <log4j2.configurationFile>log4j2-julBridge-test.xml</log4j2.configurationFile>
</systemPropertyVariables>
- <argLine>-Xms256m -Xmx1024m</argLine>
- <forkCount>1</forkCount>
- <reuseForks>false</reuseForks>
- </configuration>
- <executions>
- <execution>
- <id>default-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>${log4j.skip.test1}</exclude>
- <exclude>${log4j.skip.test2}</exclude>
- <exclude>Log4jBridgeHandlerTest.java</exclude>
- </excludes>
- </configuration>
- </execution>
- <execution>
- <!-- this test needs some special configuration, thus its own run -->
- <id>bridgeHandler-test</id>
- <phase>test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <includes>
- <include>Log4jBridgeHandlerTest.java</include>
- </includes>
- <systemPropertyVariables>
- <java.util.logging.config.file>src/test/resources/logging-test.properties</java.util.logging.config.file>
- <log4j2.configurationFile>log4j2-julBridge-test.xml</log4j2.configurationFile>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/log4j-kafka/pom.xml b/log4j-kafka/pom.xml
index 52948ba416..014f1c2a5c 100644
--- a/log4j-kafka/pom.xml
+++ b/log4j-kafka/pom.xml
@@ -16,18 +16,16 @@
limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-kafka</artifactId>
<name>Apache Log4j Kafka</name>
- <description>
- Apache Log4j Kafka.
- </description>
+ <description>Apache Log4j Kafka.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Kafka Documentation</docLabel>
diff --git a/log4j-layout-jackson-json/pom.xml b/log4j-layout-jackson-json/pom.xml
index bbf89f3025..36169ac475 100644
--- a/log4j-layout-jackson-json/pom.xml
+++ b/log4j-layout-jackson-json/pom.xml
@@ -16,18 +16,16 @@
limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-layout-jackson-json</artifactId>
<name>Apache Log4j Layout for Jackson JSON</name>
- <description>
- Apache Log4j Layout for Jackson JSON.
- </description>
+ <description>Apache Log4j Layout for Jackson JSON.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Layout for Jackson JSON Documentation</docLabel>
diff --git a/log4j-layout-jackson-xml/pom.xml b/log4j-layout-jackson-xml/pom.xml
index 6f40c7cc39..5ed2d04fdc 100644
--- a/log4j-layout-jackson-xml/pom.xml
+++ b/log4j-layout-jackson-xml/pom.xml
@@ -16,18 +16,16 @@
limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-layout-jackson-xml</artifactId>
<name>Apache Log4j Layout for Jackson XML</name>
- <description>
- Apache Log4j Layout for Jackson XML.
- </description>
+ <description>Apache Log4j Layout for Jackson XML.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Layout for Jackson XML Documentation</docLabel>
diff --git a/log4j-layout-jackson-yaml/pom.xml b/log4j-layout-jackson-yaml/pom.xml
index 365847adf4..d5f5a5749c 100644
--- a/log4j-layout-jackson-yaml/pom.xml
+++ b/log4j-layout-jackson-yaml/pom.xml
@@ -16,18 +16,16 @@
limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-layout-jackson-yaml</artifactId>
<name>Apache Log4j Layout for Jackson YAML</name>
- <description>
- Apache Log4j Layout for Jackson YAML.
- </description>
+ <description>Apache Log4j Layout for Jackson YAML.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Layout for Jackson YAML Documentation</docLabel>
diff --git a/log4j-layout-jackson/pom.xml b/log4j-layout-jackson/pom.xml
index 32af99561b..32e32b12cd 100644
--- a/log4j-layout-jackson/pom.xml
+++ b/log4j-layout-jackson/pom.xml
@@ -16,18 +16,16 @@
limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-layout-jackson</artifactId>
<name>Apache Log4j Layout for Jackson</name>
- <description>
- Apache Log4j Layout for Jackson.
- </description>
+ <description>Apache Log4j Layout for Jackson.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j Layout for Jackson Documentation</docLabel>
diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml
index bf2757d9e7..664a4ad678 100644
--- a/log4j-layout-template-json-test/pom.xml
+++ b/log4j-layout-template-json-test/pom.xml
@@ -193,6 +193,9 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
<executions>
<execution>
<goals>
@@ -201,9 +204,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <skip>true</skip>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -263,22 +263,6 @@
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start</goal>
- </goals>
- </execution>
- <execution>
- <id>stop</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<verbose>all</verbose>
<startParallel>true</startParallel>
@@ -292,7 +276,8 @@
<xpack.security.enabled>false</xpack.security.enabled>
<discovery.type>single-node</discovery.type>
</env>
- <memory>1000000000</memory> <!-- 1g -->
+ <memory>1000000000</memory>
+ <!-- 1g -->
<ports>
<port>9200:9200</port>
</ports>
@@ -337,9 +322,7 @@
<arg>--pipeline.batch.size</arg>
<arg>1</arg>
<arg>-e</arg>
- <arg>
-
- input {
+ <arg>input {
gelf {
host => "logstash"
use_tcp => true
@@ -382,9 +365,7 @@
hosts => ["http://elasticsearch:9200"]
index => "log4j"
}
- }
-
- </arg>
+ }</arg>
</exec>
</entrypoint>
<wait>
@@ -395,24 +376,40 @@
</image>
</images>
</configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
<executions>
<execution>
+ <id>start</id>
<goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
+ <goal>start</goal>
</goals>
+ <phase>pre-integration-test</phase>
+ </execution>
+ <execution>
+ <id>stop</id>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ <phase>post-integration-test</phase>
</execution>
</executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
<configuration>
<skip>false</skip>
<includes>
<include>**/*IT.java</include>
</includes>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml
index 84159e3e86..798ebb5066 100644
--- a/log4j-layout-template-json/pom.xml
+++ b/log4j-layout-template-json/pom.xml
@@ -27,10 +27,8 @@
<artifactId>log4j-layout-template-json</artifactId>
<name>Apache Log4j layout for templated JSON encoding</name>
- <description>
- JSON Template Layout is a customizable, efficient, and garbage-free JSON generating Apache Log4j layout.
- It encodes log events according to the structure described by the JSON template provided.
- </description>
+ <description>JSON Template Layout is a customizable, efficient, and garbage-free JSON generating Apache Log4j layout.
+ It encodes log events according to the structure described by the JSON template provided.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
diff --git a/log4j-liquibase/pom.xml b/log4j-liquibase/pom.xml
index 24e19e2411..c3e58ff75c 100644
--- a/log4j-liquibase/pom.xml
+++ b/log4j-liquibase/pom.xml
@@ -84,9 +84,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>
- liquibase.ext.logging.log4j2
- </Export-Package>
+ <Export-Package>liquibase.ext.logging.log4j2</Export-Package>
</instructions>
</configuration>
</plugin>
@@ -121,10 +119,10 @@
<executions>
<execution>
<id>default-tests</id>
- <phase>test</phase>
<goals>
<goal>test</goal>
</goals>
+ <phase>test</phase>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -136,10 +134,10 @@
</execution>
<execution>
<id>test-optional</id>
- <phase>test</phase>
<goals>
<goal>test</goal>
</goals>
+ <phase>test</phase>
<configuration>
<excludes>
<exclude>**/LoggerTest.java</exclude>
diff --git a/log4j-mongodb3/pom.xml b/log4j-mongodb3/pom.xml
index bef9415e9f..7d2d82ed31 100644
--- a/log4j-mongodb3/pom.xml
+++ b/log4j-mongodb3/pom.xml
@@ -16,18 +16,16 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-mongodb3</artifactId>
<name>Apache Log4j MongoDB 3</name>
- <description>
- MongoDB appender for Log4j using the MongoDB 3 driver API.
- </description>
+ <description>MongoDB appender for Log4j using the MongoDB 3 driver API.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>MongoDB 3 Documentation</docLabel>
diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml
index de1aaad2ae..fbf0735734 100644
--- a/log4j-mongodb4/pom.xml
+++ b/log4j-mongodb4/pom.xml
@@ -16,18 +16,16 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-mongodb4</artifactId>
<name>Apache Log4j MongoDB 4</name>
- <description>
- MongoDB appender for Log4j using the MongoDB 4 driver API.
- </description>
+ <description>MongoDB appender for Log4j using the MongoDB 4 driver API.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>MongoDB 4 Documentation</docLabel>
diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml
index 9345605c74..203a17c5c6 100644
--- a/log4j-osgi/pom.xml
+++ b/log4j-osgi/pom.xml
@@ -140,12 +140,12 @@
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>exam-maven-plugin</artifactId>
<executions>
- <execution>
- <phase>generate-test-resources</phase>
- <goals>
- <goal>generate-link-files</goal>
- </goals>
- </execution>
+ <execution>
+ <goals>
+ <goal>generate-link-files</goal>
+ </goals>
+ <phase>generate-test-resources</phase>
+ </execution>
</executions>
</plugin>
<plugin>
@@ -154,9 +154,7 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.logging.log4j.osgi</Bundle-SymbolicName>
- <Import-Package>
- *
- </Import-Package>
+ <Import-Package>*</Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/log4j-perf/pom.xml b/log4j-perf/pom.xml
index ce84004504..9ba2b4ed11 100644
--- a/log4j-perf/pom.xml
+++ b/log4j-perf/pom.xml
@@ -18,8 +18,8 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
@@ -177,10 +177,10 @@
<artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
+ <phase>package</phase>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<minimizeJar>false</minimizeJar>
diff --git a/log4j-plugin-processor/pom.xml b/log4j-plugin-processor/pom.xml
index f956d75e55..68ac9018e0 100644
--- a/log4j-plugin-processor/pom.xml
+++ b/log4j-plugin-processor/pom.xml
@@ -84,12 +84,10 @@
<Bundle-SymbolicName>org.apache.logging.log4j.plugins</Bundle-SymbolicName>
<!-- TODO: exclude internal classes from export -->
<Export-Package>org.apache.logging.log4j.plugins.*</Export-Package>
- <Import-Package>
- org.apache.logging.log4j,
+ <Import-Package>org.apache.logging.log4j,
org.apache.logging.log4j.status,
org.apache.logging.log4j.util,
- org.osgi.framework.*
- </Import-Package>
+ org.osgi.framework.*</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.plugins.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml
index e377d591f6..fdc61e1888 100644
--- a/log4j-plugins-test/pom.xml
+++ b/log4j-plugins-test/pom.xml
@@ -88,12 +88,10 @@
<Bundle-SymbolicName>org.apache.logging.log4j.plugins</Bundle-SymbolicName>
<!-- TODO: exclude internal classes from export -->
<Export-Package>org.apache.logging.log4j.plugins.*</Export-Package>
- <Import-Package>
- org.apache.logging.log4j,
+ <Import-Package>org.apache.logging.log4j,
org.apache.logging.log4j.status,
org.apache.logging.log4j.util,
- org.osgi.framework.*
- </Import-Package>
+ org.osgi.framework.*</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.plugins.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml
index 00d5fe1238..6ab3456d8c 100644
--- a/log4j-plugins/pom.xml
+++ b/log4j-plugins/pom.xml
@@ -59,12 +59,10 @@
<Bundle-SymbolicName>org.apache.logging.log4j.plugins</Bundle-SymbolicName>
<!-- TODO: exclude internal classes from export -->
<Export-Package>org.apache.logging.log4j.plugins.*</Export-Package>
- <Import-Package>
- org.apache.logging.log4j,
+ <Import-Package>org.apache.logging.log4j,
org.apache.logging.log4j.status,
org.apache.logging.log4j.util,
- org.osgi.framework.*
- </Import-Package>
+ org.osgi.framework.*</Import-Package>
<Bundle-Activator>org.apache.logging.log4j.plugins.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
diff --git a/log4j-script/pom.xml b/log4j-script/pom.xml
index c76be7da2d..24ad1da9f3 100644
--- a/log4j-script/pom.xml
+++ b/log4j-script/pom.xml
@@ -16,22 +16,22 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>log4j-script</artifactId>
+ <name>Apache Log4j Script Support</name>
+ <description>The Apache Log4j Script Engine Support</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<module.name>org.apache.logging.log4j.script</module.name>
</properties>
- <artifactId>log4j-script</artifactId>
- <name>Apache Log4j Script Support</name>
- <description>The Apache Log4j Script Engine Support</description>
-
<dependencies>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -139,10 +139,10 @@
<executions>
<execution>
<id>shade-test-module</id>
- <phase>process-test-classes</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>process-test-classes</phase>
<configuration>
<outputDirectory>${project.build.testOutputDirectory}</outputDirectory>
<resources>
diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml
index 4b86ef257b..42fb245c82 100644
--- a/log4j-slf4j-impl/pom.xml
+++ b/log4j-slf4j-impl/pom.xml
@@ -100,10 +100,8 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>
- org.apache.logging.slf4j,
- org.slf4j.impl
- </Export-Package>
+ <Export-Package>org.apache.logging.slf4j,
+ org.slf4j.impl</Export-Package>
</instructions>
</configuration>
</plugin>
@@ -164,10 +162,10 @@
<executions>
<execution>
<id>loop-test</id>
- <phase>test</phase>
<goals>
<goal>test</goal>
</goals>
+ <phase>test</phase>
<configuration>
<includes>
<include>**/OverflowTest.java</include>
@@ -176,10 +174,10 @@
</execution>
<execution>
<id>default-test</id>
- <phase>test</phase>
<goals>
<goal>test</goal>
</goals>
+ <phase>test</phase>
<configuration>
<includes>
<include>**/*Test.java</include>
diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml
index 0a9ba2c37a..2b7e72a939 100644
--- a/log4j-slf4j2-impl/pom.xml
+++ b/log4j-slf4j2-impl/pom.xml
@@ -106,16 +106,10 @@
<artifactId>maven-bundle-plugin</artifactId>
<configuration>
<instructions>
- <Export-Package>
- org.apache.logging.slf4j,
- org.slf4j.impl
- </Export-Package>
- <Require-Capability>
- osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"
- </Require-Capability>
- <Provide-Capability>
- osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider
- </Provide-Capability>
+ <Export-Package>org.apache.logging.slf4j,
+ org.slf4j.impl</Export-Package>
+ <Require-Capability>osgi.extender;filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+ <Provide-Capability>osgi.serviceloader;osgi.serviceloader=org.slf4j.spi.SLF4JServiceProvider</Provide-Capability>
</instructions>
</configuration>
</plugin>
@@ -125,10 +119,10 @@
<executions>
<execution>
<id>loop-test</id>
- <phase>test</phase>
<goals>
<goal>test</goal>
</goals>
+ <phase>test</phase>
<configuration>
<includes>
<include>**/OverflowTest.java</include>
@@ -138,10 +132,10 @@
</execution>
<execution>
<id>default-test</id>
- <phase>test</phase>
<goals>
<goal>test</goal>
</goals>
+ <phase>test</phase>
<configuration>
<includes>
<include>**/*Test.java</include>
diff --git a/log4j-smtp/pom.xml b/log4j-smtp/pom.xml
index 77e1efef11..2c8bcf5b1a 100644
--- a/log4j-smtp/pom.xml
+++ b/log4j-smtp/pom.xml
@@ -7,18 +7,16 @@
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and
~ limitations under the License. -->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-smtp</artifactId>
<name>Apache Log4j SMTP</name>
- <description>
- Apache Log4j Simple Mail Transfer Protocol (SMTP) Appender.
- </description>
+ <description>Apache Log4j Simple Mail Transfer Protocol (SMTP) Appender.</description>
<properties>
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Log4j SMTP Appender Documentation</docLabel>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
index f4359bb713..8355709703 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
@@ -38,8 +38,8 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>${project.version}</version>
- <scope>import</scope>
<type>pom</type>
+ <scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 6639a99c15..fd153b94c7 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -26,6 +26,9 @@
<packaging>pom</packaging>
<name>Apache Log4j Spring Cloud Config Support</name>
<url>http://maven.apache.org</url>
+ <modules>
+ <module>log4j-spring-cloud-config-client</module>
+ </modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-cloud.version>2021.0.4</spring-cloud.version>
@@ -57,7 +60,4 @@
</dependency>
</dependencies>
</dependencyManagement>
- <modules>
- <module>log4j-spring-cloud-config-client</module>
- </modules>
</project>
diff --git a/log4j-web/pom.xml b/log4j-web/pom.xml
index 8b1b748365..280fc6d45a 100644
--- a/log4j-web/pom.xml
+++ b/log4j-web/pom.xml
@@ -16,12 +16,12 @@
~ limitations under the License.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>log4j</artifactId>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>log4j-web</artifactId>
<packaging>jar</packaging>
@@ -60,7 +60,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.hamcrest</groupId>
+ <groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/pom.xml b/pom.xml
index 0c34cc3c4d..73f84c40f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,21 +28,12 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j</artifactId>
- <packaging>pom</packaging>
<version>3.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
<name>Apache Log4j 2</name>
<description>Apache Log4j 2</description>
<url>https://logging.apache.org/log4j/2.x/</url>
- <issueManagement>
- <system>GitHub Issues</system>
- <url>https://github.com/apache/logging-log4j2/issues</url>
- </issueManagement>
-
- <ciManagement>
- <system>GitHub Actions</system>
- <url>https://github.com/apache/logging-log4j2/actions</url>
- </ciManagement>
<inceptionYear>1999</inceptionYear>
@@ -219,12 +210,92 @@
</mailingLists>
+ <!-- Modules in alphabetical order: -->
+ <modules>
+ <module>log4j-1.2-api</module>
+ <module>log4j-api</module>
+ <module>log4j-api-test</module>
+ <module>log4j-appserver</module>
+ <module>log4j-bom</module>
+ <module>log4j-cassandra</module>
+ <module>log4j-core</module>
+ <module>log4j-core-its</module>
+ <module>log4j-core-test</module>
+ <module>log4j-couchdb</module>
+ <module>log4j-csv</module>
+ <!-- `log4j-distribution` is excluded to speed up the build.
+ It is only needed while creating a release.
+ It is enabled by the `apache-release` profile defined below. -->
+ <module>log4j-docker</module>
+ <module>log4j-flume-ng</module>
+ <module>log4j-gctests</module>
+ <module>log4j-iostreams</module>
+ <module>log4j-jakarta-web</module>
+ <module>log4j-jcl</module>
+ <module>log4j-jdbc</module>
+ <module>log4j-jdbc-dbcp2</module>
+ <module>log4j-jeromq</module>
+ <module>log4j-jms</module>
+ <module>log4j-jmx-gui</module>
+ <module>log4j-jndi</module>
+ <module>log4j-jndi-test</module>
+ <module>log4j-jpa</module>
+ <module>log4j-jpl</module>
+ <module>log4j-jul</module>
+ <module>log4j-kafka</module>
+ <module>log4j-kubernetes</module>
+ <module>log4j-layout-jackson</module>
+ <module>log4j-layout-jackson-json</module>
+ <module>log4j-layout-jackson-xml</module>
+ <module>log4j-layout-jackson-yaml</module>
+ <module>log4j-layout-template-json</module>
+ <module>log4j-layout-template-json-test</module>
+ <module>log4j-liquibase</module>
+ <module>log4j-mongodb3</module>
+ <module>log4j-mongodb4</module>
+ <module>log4j-osgi</module>
+ <module>log4j-perf</module>
+ <module>log4j-plugin-processor</module>
+ <module>log4j-plugins</module>
+ <module>log4j-plugins-test</module>
+ <module>log4j-script</module>
+ <module>log4j-slf4j2-impl</module>
+ <module>log4j-slf4j-impl</module>
+ <module>log4j-smtp</module>
+ <module>log4j-spring-boot</module>
+ <module>log4j-spring-cloud-config</module>
+ <module>log4j-taglib</module>
+ <module>log4j-to-jul</module>
+ <module>log4j-to-slf4j</module>
+ <module>log4j-web</module>
+ </modules>
+
<scm>
<connection>scm:git:https://github.com/apache/logging-log4j2.git</connection>
<developerConnection>scm:git:https://github.com/apache/logging-log4j2.git</developerConnection>
- <url>https://github.com/apache/logging-log4j2</url>
<tag>log4j-${log4jReleaseVersion}</tag>
+ <url>https://github.com/apache/logging-log4j2</url>
</scm>
+ <issueManagement>
+ <system>GitHub Issues</system>
+ <url>https://github.com/apache/logging-log4j2/issues</url>
+ </issueManagement>
+
+ <ciManagement>
+ <system>GitHub Actions</system>
+ <url>https://github.com/apache/logging-log4j2/actions</url>
+ </ciManagement>
+
+ <distributionManagement>
+ <!-- `site` is only included to make `maven-site-plugin` stop complaining: -->
+ <site>
+ <id>www.example.com</id>
+ <url>scp://www.example.com/www/docs/project/</url>
+ </site>
+ <downloadUrl>https://logging.apache.org/log4j/2.x/download.html</downloadUrl>
+ <!-- `repository` from ASF parent POM (id: apache.releases.https) -->
+ <!-- `snapshotRepository` from ASF parent POM (id: apache.snapshots.https) -->
+ </distributionManagement>
<properties>
@@ -1284,8 +1355,8 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>${maven-bundle-plugin.version}</version>
- <inherited>true</inherited>
<extensions>true</extensions>
+ <inherited>true</inherited>
<executions>
<execution>
<goals>
@@ -1471,10 +1542,10 @@
</configuration>
<executions>
<execution>
- <phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
+ <phase>verify</phase>
</execution>
</executions>
</plugin>
@@ -1521,14 +1592,6 @@
<plugin>
<groupId>com.diffplug.spotless</groupId>
<artifactId>spotless-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>default-spotless</id>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<ratchetFrom>HEAD~31</ratchetFrom>
<java>
@@ -1551,6 +1614,14 @@
</sortPom>
</pom>
</configuration>
+ <executions>
+ <execution>
+ <id>default-spotless</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -1574,14 +1645,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
<configuration>
<systemPropertyVariables>
<java.awt.headless>true</java.awt.headless>
@@ -1591,6 +1654,14 @@
<reuseForks>false</reuseForks>
<encoding>UTF-8</encoding>
</configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>integration-test</goal>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
<plugin>
@@ -1645,10 +1716,10 @@
<executions>
<execution>
<id>define-currentYear-property</id>
- <phase>pre-site</phase>
<goals>
<goal>timestamp-property</goal>
</goals>
+ <phase>pre-site</phase>
<configuration>
<name>currentYear</name>
<pattern>yyyy</pattern>
@@ -1661,27 +1732,26 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-site-javadoc</id>
- <phase>pre-site</phase>
- <goals>
- <goal>javadoc-no-fork</goal>
- </goals>
- </execution>
- </executions>
<configuration combine.self="override">
<!-- `notimestamp` avoids `diff` noise and is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
<notimestamp>true</notimestamp>
<skip>${javadoc.skip}</skip>
- <bottom><![CDATA[
- <p align="center">
+ <bottom><![CDATA[<p align="center">
Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved.<br/>
Apache Logging, Apache Log4j, Log4j, Apache, the Apache feather logo, the Apache Logging project logo, and the Apache Log4j logo are trademarks of The Apache Software Foundation.
</p>]]></bottom>
<failOnError>false</failOnError>
</configuration>
+ <executions>
+ <execution>
+ <id>generate-site-javadoc</id>
+ <goals>
+ <goal>javadoc-no-fork</goal>
+ </goals>
+ <phase>pre-site</phase>
+ </execution>
+ </executions>
</plugin>
<!-- Export AsciiDoc-formatted sources to `target/generated-sources/site/asciidoc/release-notes` -->
@@ -1708,12 +1778,12 @@
<executions>
<!-- Copy `src/site` to `target/generated-sources/site` -->
<execution>
- <inherited>false</inherited>
<id>copy-site</id>
- <phase>pre-site</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>pre-site</phase>
+ <inherited>false</inherited>
<configuration>
<outputDirectory>${project.build.directory}/generated-sources/site</outputDirectory>
<resources>
@@ -1730,10 +1800,10 @@
<!-- Copy `target/site/apidocs` to the parent module's `target/site/javadoc/<artifactId>` folder -->
<execution>
<id>copy-javadoc</id>
- <phase>site</phase>
<goals>
<goal>copy-resources</goal>
</goals>
+ <phase>site</phase>
<configuration>
<skip>${javadoc.skip}</skip>
<outputDirectory>${log4jParentDir}/target/site/javadoc/${project.artifactId}</outputDirectory>
@@ -1789,77 +1859,6 @@
</build>
- <distributionManagement>
- <downloadUrl>https://logging.apache.org/log4j/2.x/download.html</downloadUrl>
- <!-- `site` is only included to make `maven-site-plugin` stop complaining: -->
- <site>
- <id>www.example.com</id>
- <url>scp://www.example.com/www/docs/project/</url>
- </site>
- <!-- `repository` from ASF parent POM (id: apache.releases.https) -->
- <!-- `snapshotRepository` from ASF parent POM (id: apache.snapshots.https) -->
- </distributionManagement>
-
- <!-- Modules in alphabetical order: -->
- <modules>
- <module>log4j-1.2-api</module>
- <module>log4j-api</module>
- <module>log4j-api-test</module>
- <module>log4j-appserver</module>
- <module>log4j-bom</module>
- <module>log4j-cassandra</module>
- <module>log4j-core</module>
- <module>log4j-core-its</module>
- <module>log4j-core-test</module>
- <module>log4j-couchdb</module>
- <module>log4j-csv</module>
- <!-- `log4j-distribution` is excluded to speed up the build.
- It is only needed while creating a release.
- It is enabled by the `apache-release` profile defined below. -->
- <module>log4j-docker</module>
- <module>log4j-flume-ng</module>
- <module>log4j-gctests</module>
- <module>log4j-iostreams</module>
- <module>log4j-jakarta-web</module>
- <module>log4j-jcl</module>
- <module>log4j-jdbc</module>
- <module>log4j-jdbc-dbcp2</module>
- <module>log4j-jeromq</module>
- <module>log4j-jms</module>
- <module>log4j-jmx-gui</module>
- <module>log4j-jndi</module>
- <module>log4j-jndi-test</module>
- <module>log4j-jpa</module>
- <module>log4j-jpl</module>
- <module>log4j-jul</module>
- <module>log4j-kafka</module>
- <module>log4j-kubernetes</module>
- <module>log4j-layout-jackson</module>
- <module>log4j-layout-jackson-json</module>
- <module>log4j-layout-jackson-xml</module>
- <module>log4j-layout-jackson-yaml</module>
- <module>log4j-layout-template-json</module>
- <module>log4j-layout-template-json-test</module>
- <module>log4j-liquibase</module>
- <module>log4j-mongodb3</module>
- <module>log4j-mongodb4</module>
- <module>log4j-osgi</module>
- <module>log4j-perf</module>
- <module>log4j-plugin-processor</module>
- <module>log4j-plugins</module>
- <module>log4j-plugins-test</module>
- <module>log4j-script</module>
- <module>log4j-slf4j2-impl</module>
- <module>log4j-slf4j-impl</module>
- <module>log4j-smtp</module>
- <module>log4j-spring-boot</module>
- <module>log4j-spring-cloud-config</module>
- <module>log4j-taglib</module>
- <module>log4j-to-jul</module>
- <module>log4j-to-slf4j</module>
- <module>log4j-web</module>
- </modules>
-
<profiles>
<!-- Shortcut to populate `src/changelog/<releaseVersion>` from `src/changelog/.<releaseVersionMajor>.x.x` -->
@@ -1872,6 +1871,9 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-changelog-maven-plugin</artifactId>
<inherited>false</inherited>
+ <configuration>
+ <releaseVersion>${log4jReleaseVersion}</releaseVersion>
+ </configuration>
<executions>
<execution>
<id>changelog-release</id>
@@ -1880,9 +1882,6 @@
</goals>
</execution>
</executions>
- <configuration>
- <releaseVersion>${log4jReleaseVersion}</releaseVersion>
- </configuration>
</plugin>
</plugins>
</build>
@@ -1891,6 +1890,9 @@
<!-- shortcut to enable `log4j-distribution` module creating the release distribution containing artifacts, sources, etc. -->
<profile>
<id>apache-release</id>
+ <modules>
+ <module>log4j-distribution</module>
+ </modules>
<build>
<plugins>
<plugin>
@@ -1906,9 +1908,6 @@
</plugin>
</plugins>
</build>
- <modules>
- <module>log4j-distribution</module>
- </modules>
</profile>
<profile>
[logging-log4j2] 01/02: Add basic `sortPom` configuration
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d4ef99a1b9f960950d8de6870ad8f1ac9de1324d
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Sat Mar 4 15:32:34 2023 +0100
Add basic `sortPom` configuration
The configuration only enforces whitspace and the order of the main
`<project>` elements. The order of dependencies and plugins is not
enforced.
---
log4j-bom/pom.xml | 31 ++++++++++++++++++++++++++++---
pom.xml | 5 +++++
2 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml
index 0a84d135ca..f8f9eefd7b 100644
--- a/log4j-bom/pom.xml
+++ b/log4j-bom/pom.xml
@@ -16,19 +16,23 @@
limitations under the license.
-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.logging</groupId>
<artifactId>logging-parent</artifactId>
<version>7</version>
<relativePath/>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <name>Apache Log4j BOM</name>
- <description>Apache Log4j Bill of Materials</description>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-bom</artifactId>
<version>3.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <name>Apache Log4j BOM</name>
+ <description>Apache Log4j Bill of Materials</description>
+
+ <scm>
+ <tag>log4j-2.20.1-rc1</tag>
+ </scm>
<properties>
<!-- reproducible build setting -->
@@ -36,6 +40,7 @@
<maven.site.skip>true</maven.site.skip>
<maven.site.deploy.skip>true</maven.site.deploy.skip>
<project.build.outputTimestamp>0</project.build.outputTimestamp>
+ <spotless-maven-plugin.version>2.27.2</spotless-maven-plugin.version>
</properties>
<dependencyManagement>
@@ -325,6 +330,26 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>com.diffplug.spotless</groupId>
+ <artifactId>spotless-maven-plugin</artifactId>
+ <version>${spotless-maven-plugin.version}</version>
+ <configuration>
+ <pom>
+ <sortPom>
+ <expandEmptyElements>false</expandEmptyElements>
+ </sortPom>
+ </pom>
+ </configuration>
+ <executions>
+ <execution>
+ <id>default-spotless</id>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index 27adb18baa..0c34cc3c4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1545,6 +1545,11 @@
<order>java,org,com,\#</order>
</importOrder>
</java>
+ <pom>
+ <sortPom>
+ <expandEmptyElements>false</expandEmptyElements>
+ </sortPom>
+ </pom>
</configuration>
</plugin>