/[Apache-SVN]
ViewVC logotype

Revision 1679649


Jump to revision: Previous Next
Author: pottlinger
Date: Fri May 15 21:19:15 2015 UTC (9 years ago)
Changed paths: 22
Log Message:
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



Changed paths

Path Details
Directorycreadur/rat/trunk/RELEASE_NOTES.txt modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/pom.xml modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Defaults.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/Report.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/ReportConfiguration.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/AddLicenseHeaders.java added
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/config/ConfigurationUtil.java added
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocumentAnalyser.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/license/ILicenseFamily.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/main/java/org/apache/rat/report/xml/XmlReportFactory.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/ReportTest.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/config/ConfigurationUtilTest.java added
Directorycreadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-core/src/test/java/org/apache/rat/test/utils/Resources.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-plugin/src/it/it5_RAT-179/ added
Directorycreadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/AbstractRatMojo.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/RatCheckMojo.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/util/ConfigurationHelper.java added
Directorycreadur/rat/trunk/apache-rat-plugin/src/test/java/org/apache/rat/mp/RatCheckMojoTest.java modified , text changed
Directorycreadur/rat/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/Report.java modified , text changed
Directorycreadur/rat/trunk/pom.xml modified , text changed

infrastructure at apache.org
ViewVC Help
Powered by ViewVC 1.1.26