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
The following commit(s) were added to refs/heads/MASFRES-17 by this push: new a71acf0 Exclude zip tar tar.gz and jar files a71acf0 is described below commit a71acf01df8f5ccce60b4cc1655020c7c27f9b90 Author: Elliotte Rusty Harold <elh...@ibiblio.org> AuthorDate: Sun Dec 8 15:19:19 2024 -0500 Exclude zip tar tar.gz and jar files --- .../test/java/org/apache/its/IT_001_ExcludeBuildOutputDirectory.java | 4 ++-- source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java | 5 ++++- .../src/test/resources/maven-projects/ide-excludes/empty.tar | 0 .../src/test/resources/maven-projects/ide-excludes/empty.tar.gz | 0 .../src/test/resources/maven-projects/ide-excludes/empty.zip | 0 5 files changed, 6 insertions(+), 3 deletions(-) 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 5b15bc9..b8adcb2 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 @@ -70,8 +70,8 @@ public class IT_001_ExcludeBuildOutputDirectory { banned.add(archivePathFromChild(BASENAME, VERSION, "child2", "/target/")); String childPath = "/target/"; - String archivePathFromChild = ( BASENAME + "-" + VERSION + "/" + BASENAME + "-" + "empty.jar" + childPath ); - banned.add( archivePathFromChild ); + String archivePathFromChild = (BASENAME + "-" + VERSION + "/" + BASENAME + "-" + "empty.jar" + childPath); + banned.add(archivePathFromChild); assertZipContents(required, banned, assembly); } diff --git a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java index b3e8411..9d38c35 100644 --- a/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java +++ b/source-release/src/test/java/org/apache/its/IT_004_IdeExcludes.java @@ -57,7 +57,10 @@ public class IT_004_IdeExcludes { Set<String> banned = new HashSet<>(); - banned.add(archivePathFromProject(BASENAME, VERSION, "/.empty.jar")); + banned.add(archivePathFromProject(BASENAME, VERSION, "/empty.jar")); + banned.add(archivePathFromProject(BASENAME, VERSION, "/empty.zip")); + banned.add(archivePathFromProject(BASENAME, VERSION, "/empty.tar")); + banned.add(archivePathFromProject(BASENAME, VERSION, "/empty.tar.gz")); banned.add(archivePathFromProject(BASENAME, VERSION, "/.classpath")); banned.add(archivePathFromProject(BASENAME, VERSION, "/.project")); banned.add(archivePathFromProject(BASENAME, VERSION, "/maven-eclipse.xml")); diff --git a/source-release/src/test/resources/maven-projects/ide-excludes/empty.tar b/source-release/src/test/resources/maven-projects/ide-excludes/empty.tar new file mode 100644 index 0000000..e69de29 diff --git a/source-release/src/test/resources/maven-projects/ide-excludes/empty.tar.gz b/source-release/src/test/resources/maven-projects/ide-excludes/empty.tar.gz new file mode 100644 index 0000000..e69de29 diff --git a/source-release/src/test/resources/maven-projects/ide-excludes/empty.zip b/source-release/src/test/resources/maven-projects/ide-excludes/empty.zip new file mode 100644 index 0000000..e69de29