svn commit: r1680411 - /creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java

[pottlinger]

Author: pottlinger
Date: Tue May 19 22:24:20 2015
New Revision: 1680411

URL: http://svn.apache.org/r1680411
Log:
RAT-179: Make merging configurable for Ant task.

* The ant task can be configured as well and disables the 
  license merge if 'addDefaultLicenseMatchers' is set to false.

Modified:
    
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java

Modified: 
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
URL: 
http://svn.apache.org/viewvc/creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java?rev=1680411&r1=1680410&r2=1680411&view=diff
==============================================================================
--- 
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
 (original)
+++ 
creadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java
 Tue May 19 22:24:20 2015
@@ -252,7 +252,7 @@ public class Report extends Task {
         final ReportConfiguration configuration = new ReportConfiguration();
         configuration.setHeaderMatcher(new 
HeaderMatcherMultiplexer(getLicenseMatchers()));
         configuration.setApprovedLicenseNames(getApprovedLicenseNames());
-        configuration.setApproveDefaultLicenses(true);
+        configuration.setApproveDefaultLicenses(addDefaultLicenseMatchers);
         
         if 
(AddLicenseHeaders.FORCED.equalsIgnoreCase(addLicenseHeaders.getValue())) {
             configuration.setAddingLicenses(true);