Ignore .gitignore and .gitatributes file types from packaging

akurtakov · akurtakov · commit 60203bb12941 · 2022-05-19T07:15:44.000+03:00
Caused by codehaus-plexus/plexus-utils#174 . Fixes eclipse-tycho#966 .
diff --git a/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java b/tycho-packaging-plugin/src/main/java/org/eclipse/tycho/packaging/AbstractTychoPackagingMojo.java
@@ -103,6 +103,10 @@ protected FileSet getFileSet(File basedir, List<String> includes, List<String> e
         }
         if (useDefaultExcludes) {
             allExcludes.addAll(Arrays.asList(AbstractScanner.DEFAULTEXCLUDES));
+			// keep ignoring the following files after
+			// https://github.com/codehaus-plexus/plexus-utils/pull/174
+			allExcludes.add("**/.gitignore");
+			allExcludes.add("**/.gitattributes");
         }
 
         fileSet.setExcludes(allExcludes.toArray(new String[allExcludes.size()]));
diff --git a/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java b/tycho-source-plugin/src/main/java/org/eclipse/tycho/source/SourceFeatureMojo.java
@@ -662,6 +662,9 @@ protected FileSet getFileSet(File basedir, List<String> includes, List<String> e
         }
         if (useDefaultExcludes) {
             allExcludes.addAll(Arrays.asList(AbstractScanner.DEFAULTEXCLUDES));
+            // keep ignoring the following files after https://github.com/codehaus-plexus/plexus-utils/pull/174
+            allExcludes.add("**/.gitignore");
+            allExcludes.add("**/.gitattributes");
         }
 
         fileSet.setExcludes(allExcludes.toArray(new String[allExcludes.size()]));

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,10 @@ protected FileSet getFileSet(File basedir, List<String> includes, List<String> e`
`103`	`103`	`}`
`104`	`104`	`if (useDefaultExcludes) {`
`105`	`105`	`allExcludes.addAll(Arrays.asList(AbstractScanner.DEFAULTEXCLUDES));`
	`106`	`+ // keep ignoring the following files after`
	`107`	`+ // https://github.com/codehaus-plexus/plexus-utils/pull/174`
	`108`	`+ allExcludes.add("**/.gitignore");`
	`109`	`+ allExcludes.add("**/.gitattributes");`
`106`	`110`	`}`
`107`	`111`
`108`	`112`	`fileSet.setExcludes(allExcludes.toArray(new String[allExcludes.size()]));`
Original file line number	Diff line number	Diff line change
`@@ -662,6 +662,9 @@ protected FileSet getFileSet(File basedir, List<String> includes, List<String> e`
`662`	`662`	`}`
`663`	`663`	`if (useDefaultExcludes) {`
`664`	`664`	`allExcludes.addAll(Arrays.asList(AbstractScanner.DEFAULTEXCLUDES));`
	`665`	`+ // keep ignoring the following files after https://github.com/codehaus-plexus/plexus-utils/pull/174`
	`666`	`+ allExcludes.add("**/.gitignore");`
	`667`	`+ allExcludes.add("**/.gitattributes");`
`665`	`668`	`}`
`666`	`669`
`667`	`670`	`fileSet.setExcludes(allExcludes.toArray(new String[allExcludes.size()]));`