Repository: logging-log4j-kotlin Updated Branches: refs/heads/master 5f3a09a72 -> 7f9760bea
Fix source assemblies Signed-off-by: Matt Sicker <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/commit/7f9760be Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/tree/7f9760be Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/diff/7f9760be Branch: refs/heads/master Commit: 7f9760bea48be155b70b0b1f727858f123bfbfca Parents: 5f3a09a Author: Matt Sicker <[email protected]> Authored: Sat Nov 3 15:02:06 2018 -0500 Committer: Matt Sicker <[email protected]> Committed: Sat Nov 3 15:02:06 2018 -0500 ---------------------------------------------------------------------- log4j-api-kotlin/pom.xml | 5 +- log4j-api-kotlin/src/assembly/bin.xml | 53 ++++++++++++++++++++ log4j-api-kotlin/src/assembly/src.xml | 80 ++++++++++++++++++++++++++++++ 3 files changed, 134 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7f9760be/log4j-api-kotlin/pom.xml ---------------------------------------------------------------------- diff --git a/log4j-api-kotlin/pom.xml b/log4j-api-kotlin/pom.xml index 7982c20..b777302 100644 --- a/log4j-api-kotlin/pom.xml +++ b/log4j-api-kotlin/pom.xml @@ -128,10 +128,7 @@ </goals> <configuration> <finalName>apache-${project.artifactId}-${Log4jKotlinVersion}</finalName> - <descriptorRefs> - <descriptorRef>src</descriptorRef> - <descriptorRef>bin</descriptorRef> - </descriptorRefs> + <descriptorSourceDirectory>src/assembly</descriptorSourceDirectory> </configuration> </execution> </executions> http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7f9760be/log4j-api-kotlin/src/assembly/bin.xml ---------------------------------------------------------------------- diff --git a/log4j-api-kotlin/src/assembly/bin.xml b/log4j-api-kotlin/src/assembly/bin.xml new file mode 100644 index 0000000..0793a78 --- /dev/null +++ b/log4j-api-kotlin/src/assembly/bin.xml @@ -0,0 +1,53 @@ +<?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/ASSEMBLY/2.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd";> + <id>bin</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + <format>tar.bz2</format> + </formats> + <baseDirectory>apache-${project.artifactId}-${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> + <unpack>false</unpack> + </dependencySet> + </dependencySets> + + <fileSets> + <fileSet> + <directory>..</directory> + <includes> + <include>LICENSE.txt</include> + <include>NOTICE.txt</include> + </includes> + </fileSet> + </fileSets> +</assembly> http://git-wip-us.apache.org/repos/asf/logging-log4j-kotlin/blob/7f9760be/log4j-api-kotlin/src/assembly/src.xml ---------------------------------------------------------------------- diff --git a/log4j-api-kotlin/src/assembly/src.xml b/log4j-api-kotlin/src/assembly/src.xml new file mode 100644 index 0000000..534fc42 --- /dev/null +++ b/log4j-api-kotlin/src/assembly/src.xml @@ -0,0 +1,80 @@ +<?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/ASSEMBLY/2.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd";> + <id>src</id> + <formats> + <format>zip</format> + <format>tar.gz</format> + <format>tar.bz2</format> + </formats> + <baseDirectory>apache-${project.artifactId}-${project.version}-src</baseDirectory> + <fileSets> + <!-- main project directory structure --> + <fileSet> + <directory>..</directory> + <outputDirectory>/</outputDirectory> + <useDefaultExcludes>true</useDefaultExcludes> + <excludes> + <!-- 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/)(.*/)?\.externalToolBuilders(/.*)?] + </exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]</exclude> + + <!-- release-plugin temp files --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]</exclude> + + <!-- unnecessary files --> + <exclude>.travis.yml</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>
