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 1be544d128ea5df25c180e08f28b6390cd185e77 Author: Volkan Yazıcı <[email protected]> AuthorDate: Mon Nov 27 15:39:46 2023 +0100 Remove deprecated `log4j-distribution` et al. --- log4j-distribution/src/assembly/bin.xml | 56 ----------------------- log4j-distribution/src/assembly/src.xml | 80 --------------------------------- src/assembly/site.xml | 31 ------------- 3 files changed, 167 deletions(-) diff --git a/log4j-distribution/src/assembly/bin.xml b/log4j-distribution/src/assembly/bin.xml deleted file mode 100644 index 2c691abed4..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.adoc</source> - <outputDirectory>.</outputDirectory> - <destName>RELEASE-NOTES.adoc</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/src/assembly/site.xml b/src/assembly/site.xml deleted file mode 100644 index 88292eb292..0000000000 --- a/src/assembly/site.xml +++ /dev/null @@ -1,31 +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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd";> - <id>site</id> - <formats> - <format>zip</format> - </formats> - <fileSets> - <fileSet> - <directory>${stagingSiteURL}</directory> - <outputDirectory>${stagingSiteURL}</outputDirectory> - </fileSet> - </fileSets> -</assembly>
