This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch MASFRES-17 in repository https://gitbox.apache.org/repos/asf/maven-apache-resources.git
commit 22f67ec2be05f979f9525c6f6f9cfa906999be05 Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Sun Dec 8 15:04:41 2024 -0500 wip --- source-release/src/main/resources/assemblies/source-shared.xml | 6 ++++++ .../java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java | 4 ++++ .../src/test/resources/maven-projects/build-output-dir/empty.jar | 0 3 files changed, 10 insertions(+) diff --git a/source-release/src/main/resources/assemblies/source-shared.xml b/source-release/src/main/resources/assemblies/source-shared.xml index 7363b74..cec16f0 100644 --- a/source-release/src/main/resources/assemblies/source-shared.xml +++ b/source-release/src/main/resources/assemblies/source-shared.xml @@ -74,6 +74,12 @@ <!-- flatten-maven-plugin --> <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.flattened-pom\.xml]</exclude> + + <!-- binary archives --> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.zip]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.jar]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.tar]</exclude> + <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.tar.gz]</exclude> </excludes> </fileSet> <!-- license, readme, etc. calculated at build time --> diff --git a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java index 5158cc7..5b15bc9 100644 --- a/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java +++ b/source-release/src/test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java @@ -68,6 +68,10 @@ public class IT_001_ExcludeBuildOutputDirectory { banned.add(archivePathFromProject(BASENAME, VERSION, "/target/")); banned.add(archivePathFromChild(BASENAME, VERSION, "child1", "/target/")); banned.add(archivePathFromChild(BASENAME, VERSION, "child2", "/target/")); + String childPath = "/target/"; + + String archivePathFromChild = ( BASENAME + "-" + VERSION + "/" + BASENAME + "-" + "empty.jar" + childPath ); + banned.add( archivePathFromChild ); assertZipContents(required, banned, assembly); } diff --git a/source-release/src/test/resources/maven-projects/build-output-dir/empty.jar b/source-release/src/test/resources/maven-projects/build-output-dir/empty.jar new file mode 100644 index 0000000..e69de29