This is an automated email from the ASF dual-hosted git repository. vy pushed a commit to branch release/2.21.0 in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 26ce332c49bf2ed25496a228b00e4ceccf4cc9c9 Author: Volkan Yazıcı <[email protected]> AuthorDate: Wed Oct 4 13:00:24 2023 +0200 Remove `log4j-distribution` in favor of `logging-parent` --- log4j-distribution/pom.xml | 526 -------------------------------- log4j-distribution/src/assembly/bin.xml | 56 ---- log4j-distribution/src/assembly/src.xml | 80 ----- pom.xml | 12 +- 4 files changed, 3 insertions(+), 671 deletions(-) diff --git a/log4j-distribution/pom.xml b/log4j-distribution/pom.xml deleted file mode 100644 index d50b7b3a64..0000000000 --- a/log4j-distribution/pom.xml +++ /dev/null @@ -1,526 +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> - </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> - </properties> - <dependencies> - <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> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api-test</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api-test</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-cassandra</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-cassandra</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-couchdb</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-couchdb</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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-flume-ng</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-flume-ng</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jakarta-smtp</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jakarta-smtp</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jakarta-web</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jakarta-web</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jpa</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jpa</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <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> - <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> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-mongodb3</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-mongodb3</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <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> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j-impl</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-boot</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-boot</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-cloud-config-client</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-spring-cloud-config-client</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - <exclusions> - <exclusion> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-taglib</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-taglib</artifactId> - <version>${project.version}</version> - <classifier>sources</classifier> - </dependency> - <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> - <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> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-web</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-web</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-distribution/src/assembly/bin.xml b/log4j-distribution/src/assembly/bin.xml deleted file mode 100644 index c961e59a4b..0000000000 --- a/log4j-distribution/src/assembly/bin.xml +++ /dev/null @@ -1,56 +0,0 @@ -<!-- - 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. ---> -<assembly> - <id>bin</id> - <formats> - <format>tar.gz</format> - <format>zip</format> - </formats> - <baseDirectory>apache-log4j-${project.version}-bin</baseDirectory> - <includeSiteDirectory>false</includeSiteDirectory> - <moduleSets> - <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - </moduleSet> - </moduleSets> - <dependencySets> - <dependencySet> - <includes> - <include>org.apache.logging.log4j:log4j-*</include> - </includes> - <outputDirectory></outputDirectory> - <unpack>false</unpack> - </dependencySet> - </dependencySets> - - <fileSets> - <fileSet> - <directory>..</directory> - <includes> - <include>LICENSE.txt</include> - <include>NOTICE.txt</include> - </includes> - </fileSet> - </fileSets> - <files> - <file> - <source>../RELEASE-NOTES.md</source> - <outputDirectory>.</outputDirectory> - <destName>RELEASE-NOTES.md</destName> - </file> - </files> -</assembly> diff --git a/log4j-distribution/src/assembly/src.xml b/log4j-distribution/src/assembly/src.xml deleted file mode 100644 index 058ed56820..0000000000 --- a/log4j-distribution/src/assembly/src.xml +++ /dev/null @@ -1,80 +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. ---> - -<assembly> - <id>src</id> - <formats> - <format>zip</format> - <format>tar.gz</format> - </formats> - <baseDirectory>apache-log4j-${project.version}-src</baseDirectory> - <fileSets> - <!-- main project directory structure --> - <fileSet> - <directory>..</directory> - <outputDirectory>/</outputDirectory> - <useDefaultExcludes>true</useDefaultExcludes> - <excludes> - <exclude>**/flume-og/**</exclude> - <!-- build output --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude> - - <!-- NOTE: Most of the following excludes should not be required - if the standard release process is followed. This is because the - release plugin checks out project sources into a location like - target/checkout, then runs the build from there. The result is - a source-release archive that comes from a pretty clean directory - structure. - - HOWEVER, if the release plugin is configured to run extra goals - or generate a project website, it's definitely possible that some - of these files will be present. So, it's safer to exclude them. - --> - - <!-- IDEs --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.idea(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?Vagrantfile(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?Dockerfile(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> - - <!-- misc --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]</exclude> - - <!-- release-plugin temp files --> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> - <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> - </excludes> - </fileSet> - <!-- license, readme, etc. calculated at build time - <fileSet> - <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory> - <outputDirectory>/</outputDirectory> - </fileSet> --> - </fileSets> -</assembly> diff --git a/pom.xml b/pom.xml index 8d5ed803cd..bd63d72afb 100644 --- a/pom.xml +++ b/pom.xml @@ -228,9 +228,6 @@ <module>log4j-core-its</module> <module>log4j-core-test</module> <module>log4j-couchdb</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-iostreams</module> @@ -296,7 +293,6 @@ <log4jReleaseVersion>2.20.0</log4jReleaseVersion> <log4jReleaseVersionJava7>2.12.4</log4jReleaseVersionJava7> <log4jReleaseVersionJava6>2.3.2</log4jReleaseVersionJava6> - <log4jSigningUserName>[email protected]</log4jSigningUserName> <revision>2.21.0-SNAPSHOT</revision> <!-- ================= @@ -1374,9 +1370,6 @@ <exclude>src/site/resources/js/jquery.js</exclude> <exclude>src/site/resources/js/jquery.min.js</exclude> <!-- Generated files --> - <exclude>log4j-distribution/target/**/*</exclude> - <exclude>log4j-distribution/.project</exclude> - <exclude>log4j-distribution/.settings/**</exclude> <exclude>**/.toDelete</exclude> <exclude>velocity.log</exclude> <!-- Other --> @@ -1522,7 +1515,7 @@ <outputDirectory>${project.build.directory}/generated-sources/site</outputDirectory> <resources> <resource> - <directory>${log4jParentDir}/src/site</directory> + <directory>${project.basedir}/src/site</directory> <excludes> <exclude>/resources/glyphicons-halflings-2-1.zip</exclude> <exclude>/resources/logo/**/*</exclude> @@ -1540,7 +1533,7 @@ <phase>site</phase> <configuration> <skip>${javadoc.skip}</skip> - <outputDirectory>${log4jParentDir}/target/site/javadoc/${project.artifactId}</outputDirectory> + <outputDirectory>${project.basedir}/target/site/javadoc/${project.artifactId}</outputDirectory> <resources> <resource> <directory>${project.build.directory}/site/apidocs</directory> @@ -1550,6 +1543,7 @@ </execution> </executions> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-project-info-reports-plugin</artifactId>
