This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit aa581bd862180fb5a2790162f7ac602f3fb6d149 Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Nov 27 15:46:01 2023 +0100 Sync `pom.xml`s with the ones in `2.x` --- log4j-1.2-api/pom.xml | 2 - log4j-appserver/pom.xml | 2 - log4j-core-its/pom.xml | 2 - log4j-csv/pom.xml | 2 - log4j-distribution/pom.xml | 576 ------------------------------- log4j-docker/pom.xml | 2 - log4j-flume-ng/pom.xml | 2 - log4j-gctests/pom.xml | 2 - log4j-iostreams/pom.xml | 2 - log4j-jcl/pom.xml | 2 - log4j-jdbc-dbcp2/pom.xml | 2 - log4j-jdbc/pom.xml | 2 - log4j-jndi-test/pom.xml | 2 - log4j-jndi/pom.xml | 2 - log4j-kubernetes/pom.xml | 2 - log4j-layout-jackson-xml/pom.xml | 2 - log4j-layout-jackson/pom.xml | 2 - log4j-layout-template-json-test/pom.xml | 2 - log4j-layout-template-json/pom.xml | 2 - log4j-mongodb4/pom.xml | 2 - log4j-osgi/pom.xml | 2 - log4j-plugin-processor/pom.xml | 2 - log4j-plugins-test/pom.xml | 2 - log4j-plugins/pom.xml | 2 - log4j-slf4j-impl/pom.xml | 2 - log4j-slf4j2-impl/pom.xml | 2 - log4j-spring-cloud-config-client/pom.xml | 2 - log4j-to-jul/pom.xml | 2 - log4j-to-slf4j/pom.xml | 2 - pom.xml | 53 ++- 30 files changed, 49 insertions(+), 636 deletions(-) diff --git a/log4j-1.2-api/pom.xml b/log4j-1.2-api/pom.xml index 15ec761ae2..95ff919fd6 100644 --- a/log4j-1.2-api/pom.xml +++ b/log4j-1.2-api/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j 1.x Compatibility API</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j 1.2 Documentation</docLabel> - <projectDir>/log4j12-api</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-appserver/pom.xml b/log4j-appserver/pom.xml index 2b1e62704d..6e50f9d2e8 100644 --- a/log4j-appserver/pom.xml +++ b/log4j-appserver/pom.xml @@ -31,8 +31,6 @@ <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Web Documentation</docLabel> - <projectDir>/log4j-appserver</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-core-its/pom.xml b/log4j-core-its/pom.xml index 3c13a7b914..46edbf02b8 100644 --- a/log4j-core-its/pom.xml +++ b/log4j-core-its/pom.xml @@ -30,8 +30,6 @@ <description>Integration Tests for the Apache Log4j Implementation</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Core Integration Tests Documentation</docLabel> - <projectDir>/log4j-core-its</projectDir> <bnd.baseline.skip>true</bnd.baseline.skip> <maven.deploy.skip>true</maven.deploy.skip> <maven.install.skip>true</maven.install.skip> diff --git a/log4j-csv/pom.xml b/log4j-csv/pom.xml index 0815eba586..d9efac8623 100644 --- a/log4j-csv/pom.xml +++ b/log4j-csv/pom.xml @@ -29,8 +29,6 @@ <description>Apache Log4j CSV Layout.</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j CSV Documentation</docLabel> - <projectDir>/log4j-csv</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml deleted file mode 100644 index 4cccca9db4..0000000000 --- a/log4j-distribution/pom.xml +++ /dev/null @@ -1,576 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES 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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j</artifactId> - <version>${revision}</version> - <relativePath>../log4j-parent</relativePath> - </parent> - - <artifactId>log4j-distribution</artifactId> - <packaging>pom</packaging> - <name>Log4j Distribution</name> - <description>The Apache Log4j distribution archives.</description> - <properties> - <maven.deploy.skip>true</maven.deploy.skip> - <maven.install.skip>true</maven.install.skip> - <maven.test.skip>true</maven.test.skip> - <spotless.check.skip>true</spotless.check.skip> - <httpclient.version>4.5.13</httpclient.version> - <httpcore.version>4.4.12</httpcore.version> - <slf4j.version>1.7.36</slf4j.version> - <snappy.version>1.1.10.5</snappy.version> - <spring-cloud.version>3.1.7</spring-cloud.version> - </properties> - <dependencyManagement> - <!-- Note that none of the dependencies listed here really matter. Only the Log4j jars will be included - in the distribution archive file --> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${httpcore.version}</version> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${httpclient.version}</version> - </dependency> - <dependency> - <groupId>org.xerial.snappy</groupId> - <artifactId>snappy-java</artifactId> - <version>${snappy.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> - <!-- log4j-1.2-api --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-1.2-api</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-api --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-appserver --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-appserver</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-appserver</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-core --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core-test</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core-test</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-csv --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-csv</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-csv</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-docker</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-docker</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-flume-ng --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-flume-ng</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-flume-ng</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <exclusions> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- log4j-iostreams --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-iostreams</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-iostreams</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-jcl --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-jdbc --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jdbc</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jdbc</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-jdbc-dbcp2 --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jdbc-dbcp2</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jdbc-dbcp2</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-jndi --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jndi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jndi</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-jpl --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jpl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jpl</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-jul --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jul</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jul</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-kubernetes --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-kubernetes</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-kubernetes</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-layout-jackson --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-jackson</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-jackson</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-layout-jackson-xml --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-jackson-xml</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-jackson-xml</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-layout-template-json --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-template-json</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-layout-template-json</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-mongodb4 --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-mongodb4</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-mongodb4</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-osgi --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-osgi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-osgi</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-plugin-processor --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugin-processor</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugin-processor</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-plugins --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugins</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-plugins</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-script --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-script</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-script</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-sfl4j-impl --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- log4j-slf4j2-impl --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j2-impl</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j2-impl</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <!-- log4j-spring-cloud-config-client --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-cloud-config-client</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-cloud-config-client</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-to-jul --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-jul</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-jul</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <!-- log4j-to-slf4j --> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-to-slf4j</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - </dependencies> - <build> - <plugins> - <!-- calculate checksums of source release for Apache dist area --> - <plugin> - <groupId>net.nicoulaj.maven.plugins</groupId> - <artifactId>checksum-maven-plugin</artifactId> - <executions> - <execution> - <id>calculate-checksums</id> - <goals> - <goal>files</goal> - </goals> - <!-- execute prior to maven-gpg-plugin:sign due to https://github.com/nicoulaj/checksum-maven-plugin/issues/112 --> - <phase>post-integration-test</phase> - <configuration> - <algorithms> - <algorithm>SHA-256</algorithm> - <algorithm>SHA-512</algorithm> - </algorithms> - <!-- https://maven.apache.org/apache-resource-bundles/#source-release-assembly-descriptor --> - <fileSets> - <fileSet> - <directory>${project.build.directory}</directory> - <includes> - <include>apache-log4j-${project.version}-src.zip</include> - <include>apache-log4j-${project.version}-src.tar.gz</include> - <include>apache-log4j-${project.version}-bin.zip</include> - <include>apache-log4j-${project.version}-bin.tar.gz</include> - </includes> - </fileSet> - </fileSets> - <csvSummary>false</csvSummary> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>post-integration-test</phase> - <configuration> - <target> - <property name="spaces" value=" " /> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.zip.sha256" append="yes">${spaces}apache-log4j-${project.version}-src.zip</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.zip.sha512" append="yes">${spaces}apache-log4j-${project.version}-src.zip</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.tar.gz.sha256" append="yes">${spaces}apache-log4j-${project.version}-src.tar.gz</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-src.tar.gz.sha512" append="yes">${spaces}apache-log4j-${project.version}-src.tar.gz</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.zip.sha256" append="yes">${spaces}apache-log4j-${project.version}-bin.zip</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.zip.sha512" append="yes">${spaces}apache-log4j-${project.version}-bin.zip</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.tar.gz.sha256" append="yes">${spaces}apache-log4j-${project.version}-bin.tar.gz</concat> - <concat destfile="${project.build.directory}/apache-log4j-${project.version}-bin.tar.gz.sha512" append="yes">${spaces}apache-log4j-${project.version}-bin.tar.gz</concat> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>log4j2-source-release-assembly</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <finalName>apache-log4j-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/src.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - </execution> - <execution> - <id>binary</id> - <configuration> - <finalName>apache-log4j-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/bin.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - </execution> - <!-- <execution> - <id>osgi-binary</id> - <configuration> - <finalName>apache-log4j-${project.version}</finalName> - <descriptors> - <descriptor>src/assembly/osgi-bin.xml</descriptor> - </descriptors> - <tarLongFileMode>gnu</tarLongFileMode> - </configuration> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - </execution> --> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-gpg-plugin</artifactId> - <executions> - <execution> - <id>sign-release-artifacts</id> - <goals> - <goal>sign</goal> - </goals> - <configuration> - <keyname>${log4jSigningUserName}</keyname> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> diff --git a/log4j-docker/pom.xml b/log4j-docker/pom.xml index 9f5f86e466..1fc0d595ff 100644 --- a/log4j-docker/pom.xml +++ b/log4j-docker/pom.xml @@ -30,8 +30,6 @@ <description>Apache Log4j Docker Support</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j Docker Library Documentation</docLabel> - <projectDir>/docker</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-flume-ng/pom.xml b/log4j-flume-ng/pom.xml index 835a22011c..6541bf104c 100644 --- a/log4j-flume-ng/pom.xml +++ b/log4j-flume-ng/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j Flume Appender</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Flume Documentation</docLabel> - <projectDir>/flume-ng</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-gctests/pom.xml b/log4j-gctests/pom.xml index 2272c50a03..a461b5fff7 100644 --- a/log4j-gctests/pom.xml +++ b/log4j-gctests/pom.xml @@ -30,8 +30,6 @@ <description>Apache Log4j Implementation GC Tests</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Core Documentation</docLabel> - <projectDir>/core</projectDir> <maven.deploy.skip>true</maven.deploy.skip> <maven.install.skip>true</maven.install.skip> </properties> diff --git a/log4j-iostreams/pom.xml b/log4j-iostreams/pom.xml index 5d61d3ca9e..f2a90a3823 100644 --- a/log4j-iostreams/pom.xml +++ b/log4j-iostreams/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j streams to log event converters</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Streaming Documentation</docLabel> - <projectDir>/log4j-iostreams</projectDir> </properties> <dependencies> <dependency> diff --git a/log4j-jcl/pom.xml b/log4j-jcl/pom.xml index 34f8dc8624..75f4225347 100644 --- a/log4j-jcl/pom.xml +++ b/log4j-jcl/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j Commons Logging Adapter</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>JCL Bridge Documentation</docLabel> - <projectDir>/jcl-bridge</projectDir> <bnd-extra-module-options> <!-- Use module name returned by `jar -d` --> commons.logging;substitute="commons-logging" diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml index 07e05e5ff6..302ea20ac5 100644 --- a/log4j-jdbc-dbcp2/pom.xml +++ b/log4j-jdbc-dbcp2/pom.xml @@ -29,8 +29,6 @@ <description>Connection source for the JDBC Appender using Apache Commons DBCP2.</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j JDBC DBCP 2 Documentation</docLabel> - <projectDir>/log4j-jdbc-dbcp2</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-jdbc/pom.xml b/log4j-jdbc/pom.xml index 7335aa8e16..5b247493e1 100644 --- a/log4j-jdbc/pom.xml +++ b/log4j-jdbc/pom.xml @@ -29,8 +29,6 @@ <description>Apache Log4j Java Database Connectivity (JDBC).</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j JDBC Documentation</docLabel> - <projectDir>/log4j-jdbc</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-jndi-test/pom.xml b/log4j-jndi-test/pom.xml index eaaa4d0f09..a8a610db70 100644 --- a/log4j-jndi-test/pom.xml +++ b/log4j-jndi-test/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j JNDI Test Support</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>JNDI Documentation</docLabel> - <projectDir>/log4j-jndi-test</projectDir> <module.name>org.apache.logging.log4j.jndi.test</module.name> </properties> <dependencies> diff --git a/log4j-jndi/pom.xml b/log4j-jndi/pom.xml index 815d909ad0..fe20c57a27 100644 --- a/log4j-jndi/pom.xml +++ b/log4j-jndi/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j JNDI Support</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>JNDI Documentation</docLabel> - <projectDir>/log4j-jndi</projectDir> <module.name>org.apache.logging.log4j.jndi</module.name> </properties> <dependencies> diff --git a/log4j-kubernetes/pom.xml b/log4j-kubernetes/pom.xml index f7f7151799..0f0730f2f0 100644 --- a/log4j-kubernetes/pom.xml +++ b/log4j-kubernetes/pom.xml @@ -30,8 +30,6 @@ <description>Apache Log4j Kubernetes Support</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j Kubernetes Library Documentation</docLabel> - <projectDir>/kubernetes</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-layout-jackson-xml/pom.xml b/log4j-layout-jackson-xml/pom.xml index 241bc93034..fc6be11c8a 100644 --- a/log4j-layout-jackson-xml/pom.xml +++ b/log4j-layout-jackson-xml/pom.xml @@ -29,8 +29,6 @@ <description>Apache Log4j Layout for Jackson XML.</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j Layout for Jackson XML Documentation</docLabel> - <projectDir>/log4j-layout-xml</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-layout-jackson/pom.xml b/log4j-layout-jackson/pom.xml index 058baab4de..20decf368a 100644 --- a/log4j-layout-jackson/pom.xml +++ b/log4j-layout-jackson/pom.xml @@ -29,8 +29,6 @@ <description>Apache Log4j Layout for Jackson.</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j Layout for Jackson Documentation</docLabel> - <projectDir>/log4j-layout-jackson</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-layout-template-json-test/pom.xml b/log4j-layout-template-json-test/pom.xml index c4084624ee..7a24826ad0 100644 --- a/log4j-layout-template-json-test/pom.xml +++ b/log4j-layout-template-json-test/pom.xml @@ -29,8 +29,6 @@ <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Tests for the JSON Template Layout of Apache Log4j</docLabel> - <projectDir>/log4j-layout-template-json-test</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-layout-template-json/pom.xml b/log4j-layout-template-json/pom.xml index 310c7632f0..651512771e 100644 --- a/log4j-layout-template-json/pom.xml +++ b/log4j-layout-template-json/pom.xml @@ -31,8 +31,6 @@ <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j Layout for JSON Template Documentation</docLabel> - <projectDir>/log4j-layout-template-json</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-mongodb4/pom.xml b/log4j-mongodb4/pom.xml index 250217357e..7aae766411 100644 --- a/log4j-mongodb4/pom.xml +++ b/log4j-mongodb4/pom.xml @@ -29,8 +29,6 @@ <description>MongoDB appender for Log4j using the MongoDB 4 driver API.</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>MongoDB 4 Documentation</docLabel> - <projectDir>/log4j-mongodb4</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-osgi/pom.xml b/log4j-osgi/pom.xml index f9fbeabfeb..fb2472fbdb 100644 --- a/log4j-osgi/pom.xml +++ b/log4j-osgi/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j OSGi tests</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>OSGi Documentation</docLabel> - <projectDir>/osgi</projectDir> <module.name>org.apache.logging.log4j.osgi</module.name> <skipTests>true</skipTests> <bnd.baseline.skip>true</bnd.baseline.skip> diff --git a/log4j-plugin-processor/pom.xml b/log4j-plugin-processor/pom.xml index 2cb732ead2..4c20538441 100644 --- a/log4j-plugin-processor/pom.xml +++ b/log4j-plugin-processor/pom.xml @@ -30,8 +30,6 @@ <description>Log4j Plugin Annotation Processor</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Plugin Documentation</docLabel> - <projectDir>/plugins</projectDir> </properties> <dependencies> <dependency> diff --git a/log4j-plugins-test/pom.xml b/log4j-plugins-test/pom.xml index 65ee6226db..6fce895866 100644 --- a/log4j-plugins-test/pom.xml +++ b/log4j-plugins-test/pom.xml @@ -30,8 +30,6 @@ <description>Log4j Plugin Test Support</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Plugin Documentation</docLabel> - <projectDir>/plugins</projectDir> </properties> <dependencies> <dependency> diff --git a/log4j-plugins/pom.xml b/log4j-plugins/pom.xml index 86566fe740..ac1f8d3012 100644 --- a/log4j-plugins/pom.xml +++ b/log4j-plugins/pom.xml @@ -30,8 +30,6 @@ <description>Log4j Plugin Support</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Plugin Documentation</docLabel> - <projectDir>/plugins</projectDir> </properties> <dependencies> <dependency> diff --git a/log4j-slf4j-impl/pom.xml b/log4j-slf4j-impl/pom.xml index c2f883b300..b62388ad3e 100644 --- a/log4j-slf4j-impl/pom.xml +++ b/log4j-slf4j-impl/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j SLF4J API binding to Log4j 2 Core</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>SLF4J Documentation</docLabel> - <projectDir>/slf4j-impl</projectDir> <slf4j.version>1.7.25</slf4j.version> <!-- diff --git a/log4j-slf4j2-impl/pom.xml b/log4j-slf4j2-impl/pom.xml index 8001c8980e..cba8d4610f 100644 --- a/log4j-slf4j2-impl/pom.xml +++ b/log4j-slf4j2-impl/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j SLF4J 2.0 API binding to Log4j 2 Core</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>SLF4J Documentation</docLabel> - <projectDir>/slf4j2-impl</projectDir> <!-- Override parent's default --> <slf4j.version>2.0.6</slf4j.version> diff --git a/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config-client/pom.xml index 0650fde9ab..94ccedbe9e 100644 --- a/log4j-spring-cloud-config-client/pom.xml +++ b/log4j-spring-cloud-config-client/pom.xml @@ -30,8 +30,6 @@ <description>Apache Log4j Spring Cloud Config Client Support</description> <properties> <log4jParentDir>${basedir}/../..</log4jParentDir> - <docLabel>Log4j Spring Cloud Config Client Documentation</docLabel> - <projectDir>/log4j-spring-cloud-config-client</projectDir> <!-- ~ OSGi and JPMS options diff --git a/log4j-to-jul/pom.xml b/log4j-to-jul/pom.xml index 5946652fbd..576366f795 100644 --- a/log4j-to-jul/pom.xml +++ b/log4j-to-jul/pom.xml @@ -31,8 +31,6 @@ <inceptionYear>2022</inceptionYear> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>Log4j to JUL Documentation</docLabel> - <projectDir>/log4j-to-jul</projectDir> </properties> <dependencies> <dependency> diff --git a/log4j-to-slf4j/pom.xml b/log4j-to-slf4j/pom.xml index 4062d11abb..c0334118ae 100644 --- a/log4j-to-slf4j/pom.xml +++ b/log4j-to-slf4j/pom.xml @@ -30,8 +30,6 @@ <description>The Apache Log4j binding between Log4j 2 API and SLF4J.</description> <properties> <log4jParentDir>${basedir}/..</log4jParentDir> - <docLabel>SLF4J Documentation</docLabel> - <projectDir>/log4j-to-slf4j</projectDir> <!-- ~ OSGi and JPMS options diff --git a/pom.xml b/pom.xml index bdd7b04d1c..431abc6bbf 100644 --- a/pom.xml +++ b/pom.xml @@ -312,9 +312,15 @@ <maven.compiler.target>${maven.compiler.release}</maven.compiler.target> <!-- JDK version of the main Maven process (used in ASF parent POM) --> <minimalJavaBuildVersion>[11,12)</minimalJavaBuildVersion> - <docLabel>Site Documentation</docLabel> - <projectDir /> <module.name /> + + <!-- `project.build.outputTimestamp` is required to be present for reproducible builds. + We actually inherit one from the `org.apache:apache` through our parent `org.apache.logging:logging-parent`. + Though inheriting this property has two undesired consequences: + 1. `artifact:compare` dumps an `ERROR` log stating that this `property should not be inherited but defined` (apache/logging-parent#50) + 2. This value is employed in various places while creating the distribution + To mitigate these, we define a *dummy* value here and let the CI replace it during a release. + Hence, *DO NOT MANUALLY EDIT THIS VALUE*! --> <project.build.outputTimestamp>2023-10-23T19:03:40Z</project.build.outputTimestamp> <!-- ======================== @@ -329,6 +335,7 @@ It is manually enabled only for this root module below. --> <maven.site.skip>true</maven.site.skip> <maven.site.deploy.skip>true</maven.site.deploy.skip> + </properties> <dependencyManagement> @@ -412,12 +419,12 @@ <version>${project.version}</version> </dependency> - <!-- JNDI --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jndi</artifactId> <version>${project.version}</version> </dependency> + <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jndi-test</artifactId> @@ -533,6 +540,26 @@ <plugins> + <!-- `cyclonedx-maven-plugin` doesn't exclude not installed/deployed modules: https://github.com/CycloneDX/cyclonedx-maven-plugin/issues/409 + This `generate-sbom` execution override configures such exclusions. --> + <plugin> + <groupId>org.cyclonedx</groupId> + <artifactId>cyclonedx-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-sbom</id> + <configuration combine.self="append"> + <excludeArtifactId>log4j-core-its</excludeArtifactId> + <excludeArtifactId>log4j-jndi-test</excludeArtifactId> + <excludeArtifactId>log4j-layout-template-json-test</excludeArtifactId> + <excludeArtifactId>log4j-osgi-test</excludeArtifactId> + <excludeArtifactId>log4j-perf-test</excludeArtifactId> + <excludeArtifactId>log4j-plugins-test</excludeArtifactId> + </configuration> + </execution> + </executions> + </plugin> + <!-- Enable BOM flattening --> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -595,6 +622,19 @@ </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <forkCount>1C</forkCount> + <reuseForks>false</reuseForks> + <runOrder>alphabetical</runOrder> + <systemPropertyVariables> + <java.awt.headless>true</java.awt.headless> + </systemPropertyVariables> + </configuration> + </plugin> + <!-- ███████ ████████ █████ ██████ ████████ ███████ ██ ████████ ███████ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ██ ███████ ██ ███████ ██████ ██ ███████ ██ ██ █████ @@ -638,7 +678,10 @@ <!-- This execution must be inherited and enabled by modules publishing javadocs: `-api` and `-core`. Such modules enable this execution via `maven.javadoc.skip` property. Hence, don't insert a `<inherited>false</inherited>`, please! --> - <configuration> + <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>${maven.javadoc.skip}</skip> <bottom><