Author: pottlinger
Date: Thu Mar 26 11:56:51 2015
New Revision: 1669332
URL: http://svn.apache.org/r1669332
Log:
RAT-197: Improve default exclusions when mvn>=3.3.1 (exclude .mvn).
Modified:
creadur/rat/trunk/RELEASE_NOTES.txt
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
Modified: creadur/rat/trunk/RELEASE_NOTES.txt
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/RELEASE_NOTES.txt?rev=1669332&r1=1669331&r2=1669332&view=diff
==============================================================================
--- creadur/rat/trunk/RELEASE_NOTES.txt (original)
+++ creadur/rat/trunk/RELEASE_NOTES.txt Thu Mar 26 11:56:51 2015
@@ -31,6 +31,8 @@ Rat 0.12 (SNAPSHOT)
* [RAT-186] - BinaryGuesser should recognize PSD files as images
* [RAT-187] - Add 'SAR', 'HAR', 'WSR' as archives which should be ignored.
(thanks to Karl Heinz Marbaise)
+ * [RAT-197] - Improve exclusion defaults when working with Maven 3.3.1
(exclude .mvn).
+ (thanks to Karl Heinz Marbaise)
* [RAT-198] - Upgrade to plexus-utils 3.0.20.
(thanks to Karl Heinz Marbaise)
Modified:
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java?rev=1669332&r1=1669331&r2=1669332&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/ExclusionHelper.java
Thu Mar 26 11:56:51 2015
@@ -41,6 +41,7 @@ public final class ExclusionHelper {
"cobertura.ser", //
"release.properties", //
".repository", // Used by Jenkins when a Maven job uses a
private repository that is "Local to the workspace"
+ ".mvn", // Project configuration since Maven 3.3.1 which
contains maven.config, jvm.config, extensions.xml
"pom.xml.releaseBackup"));
/**
Modified:
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java?rev=1669332&r1=1669331&r2=1669332&view=diff
==============================================================================
---
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
(original)
+++
creadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/ExclusionHelperTest.java
Thu Mar 26 11:56:51 2015
@@ -49,7 +49,7 @@ public class ExclusionHelperTest {
ECLIPSE_DEFAULT_EXCLUDES.size());
assertEquals("Did you change the number of idea excludes?", 4,
IDEA_DEFAULT_EXCLUDES.size());
- assertEquals("Did you change the number of mvn excludes?", 5,
+ assertEquals("Did you change the number of mvn excludes?", 6,
MAVEN_DEFAULT_EXCLUDES.size());
}
@@ -81,9 +81,9 @@ public class ExclusionHelperTest {
addMavenDefaults(log, false, exclusion);
assertTrue(exclusion.isEmpty());
addMavenDefaults(log, true, exclusion);
- assertEquals(5, exclusion.size());
+ assertEquals(6, exclusion.size());
addMavenDefaults(log, true, exclusion);
- assertEquals(5, exclusion.size());
+ assertEquals(6, exclusion.size());
}
@Test
