tree f934d86350d8b0b62b25695cbc64bf4d85918f98
parent e0633f5e6ff0ffc3541eb9c09d7489e1bbc6e533
author Philipp Ottlinger <pottlinger@apache.org> 1431724755 +0000
committer Philipp Ottlinger <pottlinger@apache.org> 1431724755 +0000

AT-179: Maven plugin is able to merge approved licenses with adhoc defined ones

* Maven DefaultPolicy was not able merge with default approved licenses but 
  either took all licenses given or the defaults.
* Since maven default is that addDefaultLicenses is enabled, ReportConfiguration
  enables defaults and merges with any given extra licenses.
* Ant task and CLI merges by default as well.  
* Upgraded to latest - mockito 1.10.19
* Extracted AddLicenseHeader configuration options into an enum (similar to ant).
* Resources: Unit tests cannot be run from within IntelliJ since they do not 
  find test resources properly. Added comment and extracted resource directory.
* Defaults: Added default license family names to match default matchers:
** OLD:
 MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0,
        MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE,
        MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT,
        MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT,
        MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE,
        MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT,
        MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1,
** NEW:        
MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT, //
                    MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_W3C_SOFTWARE_COPYRIGHT


git-svn-id: https://svn.apache.org/repos/asf/creadur/rat/trunk@1679649 13f79535-47bb-0310-9956-ffa450edef68