From 7b3870d1997480beac4c9b14d1e93f1e00e472cb Mon Sep 17 00:00:00 2001
From: Konrad Windszus <kwin@apache.org>
Date: Mon, 30 Mar 2026 18:41:20 +0200
Subject: [PATCH] Do not exclude ".gitignore" and ".cvsignore" by default

This closes #312
---
 .../org/codehaus/plexus/util/AbstractScanner.java  |  6 ++----
 .../codehaus/plexus/util/DirectoryScannerTest.java | 14 ++++++++++++++
 .../directory-scanner-default-excludes/.cvsignore  |  1 +
 .../.gitattributes                                 |  1 +
 .../directory-scanner-default-excludes/.gitignore  |  1 +
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 src/test/resources/directory-scanner-default-excludes/.cvsignore
 create mode 100644 src/test/resources/directory-scanner-default-excludes/.gitattributes
 create mode 100644 src/test/resources/directory-scanner-default-excludes/.gitignore

diff --git a/src/main/java/org/codehaus/plexus/util/AbstractScanner.java b/src/main/java/org/codehaus/plexus/util/AbstractScanner.java
index d650c6df..eb3ffb60 100644
--- a/src/main/java/org/codehaus/plexus/util/AbstractScanner.java
+++ b/src/main/java/org/codehaus/plexus/util/AbstractScanner.java
@@ -29,7 +29,7 @@ public abstract class AbstractScanner implements Scanner {
      * Patterns which should be excluded by default, like SCM files
      * <ul>
      * <li>Misc: &#42;&#42;/&#42;~, &#42;&#42;/#&#42;#, &#42;&#42;/.#&#42;, &#42;&#42;/%&#42;%, &#42;&#42;/._&#42;</li>
-     * <li>CVS: &#42;&#42;/CVS, &#42;&#42;/CVS/&#42;&#42;, &#42;&#42;/.cvsignore</li>
+     * <li>CVS: &#42;&#42;/CVS, &#42;&#42;/CVS/&#42;&#42;</li>
      * <li>RCS: &#42;&#42;/RCS, &#42;&#42;/RCS/&#42;&#42;</li>
      * <li>SCCS: &#42;&#42;/SCCS, &#42;&#42;/SCCS/&#42;&#42;</li>
      * <li>VSSercer: &#42;&#42;/vssver.scc</li>
@@ -41,7 +41,7 @@ public abstract class AbstractScanner implements Scanner {
      * <li>Mac: &#42;&#42;/.DS_Store</li>
      * <li>Serena Dimension: &#42;&#42;/.metadata, &#42;&#42;/.metadata/&#42;&#42;</li>
      * <li>Mercurial: &#42;&#42;/.hg, &#42;&#42;/.hg/&#42;&#42;</li>
-     * <li>Git: &#42;&#42;/.git, &#42;&#42;/.git/&#42;&#42;, &#42;&#42;/.gitignore</li>
+     * <li>Git: &#42;&#42;/.git, &#42;&#42;/.git/&#42;&#42;</li>
      * <li>Bitkeeper: &#42;&#42;/BitKeeper, &#42;&#42;/BitKeeper/&#42;&#42;, &#42;&#42;/ChangeSet,
      * &#42;&#42;/ChangeSet/&#42;&#42;</li>
      * <li>Darcs: &#42;&#42;/_darcs, &#42;&#42;/_darcs/&#42;&#42;, &#42;&#42;/.darcsrepo,
@@ -61,7 +61,6 @@ public abstract class AbstractScanner implements Scanner {
         // CVS
         "**/CVS",
         "**/CVS/**",
-        "**/.cvsignore",
 
         // RCS
         "**/RCS",
@@ -106,7 +105,6 @@ public abstract class AbstractScanner implements Scanner {
         // git
         "**/.git",
         "**/.git/**",
-        "**/.gitignore",
 
         // BitKeeper
         "**/BitKeeper",
diff --git a/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java b/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java
index fa5ed661..303c7115 100644
--- a/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java
+++ b/src/test/java/org/codehaus/plexus/util/DirectoryScannerTest.java
@@ -536,6 +536,20 @@ void isParentSymbolicLink() throws Exception {
                 ds.isParentSymbolicLink(new File(directory, "symLinkToDirOnTheOutside"), "FileInDirOnTheOutside.txt"));
     }
 
+    @Test
+    void defaultExcludes() throws Exception {
+        DirectoryScanner ds = new DirectoryScanner();
+        // work in src directory as target has filtering already applied with outdated default excludes
+        // (https://maven.apache.org/plugins/maven-resources-plugin/resources-mojo.html#addDefaultExcludes)
+        ds.setBasedir(new File("src/test/resources/directory-scanner-default-excludes").getCanonicalFile());
+
+        ds.addDefaultExcludes();
+        ds.scan();
+
+        assertInclusionsAndExclusions(
+                ds.getIncludedFiles(), new String[] {}, ".gitignore", ".gitattributes", ".cvsignore");
+    }
+
     private void printTestHeader() {
         StackTraceElement ste = new Throwable().getStackTrace()[1];
         System.out.println("Test: " + ste.getMethodName());
diff --git a/src/test/resources/directory-scanner-default-excludes/.cvsignore b/src/test/resources/directory-scanner-default-excludes/.cvsignore
new file mode 100644
index 00000000..6dc1c9df
--- /dev/null
+++ b/src/test/resources/directory-scanner-default-excludes/.cvsignore
@@ -0,0 +1 @@
+# must not be excluded, otherwise the project will not work
\ No newline at end of file
diff --git a/src/test/resources/directory-scanner-default-excludes/.gitattributes b/src/test/resources/directory-scanner-default-excludes/.gitattributes
new file mode 100644
index 00000000..41674463
--- /dev/null
+++ b/src/test/resources/directory-scanner-default-excludes/.gitattributes
@@ -0,0 +1 @@
+# must not be excluded
\ No newline at end of file
diff --git a/src/test/resources/directory-scanner-default-excludes/.gitignore b/src/test/resources/directory-scanner-default-excludes/.gitignore
new file mode 100644
index 00000000..41674463
--- /dev/null
+++ b/src/test/resources/directory-scanner-default-excludes/.gitignore
@@ -0,0 +1 @@
+# must not be excluded
\ No newline at end of file