September 2010 - Maven-license-plugin-commits

r1832 - in trunk: . src/it src/it/add-third-party/no-deps src/it/add-third-party/with-deps src/it/evol-818/excluded-included src/it/evol-818/multimodule-filters src/it/evol-818/multimodule-filters/child1 src/it/evol-818/multimodule-filters/child2 src/it/evol-884 src/it/evol-884/update-file-header src/it/evol-884/update-file-header/src src/it/evol-884/update-file-header/src/files src/it/evol-884/update-file-header/src/files/apt src/it/evol-884/update-file-header/src/files/prope
by ymartel＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: ymartel Date: 2010-09-29 15:49:21 +0200 (Wed, 29 Sep 2010) New Revision: 1832 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1832 Log: [evol 884] Add auto detection of the headers to update on UpdateFileHeader Mojo Become version 2.4 Added: trunk/src/it/evol-884/ trunk/src/it/evol-884/update-file-header-specific/ trunk/src/it/evol-884/update-file-header-specific/LICENSE.txt trunk/src/it/evol-884/update-file-header-specific/README.txt trunk/src/it/evol-884/update-file-header-specific/changelog.txt trunk/src/it/evol-884/update-file-header-specific/invoker.properties trunk/src/it/evol-884/update-file-header-specific/pom.xml trunk/src/it/evol-884/update-file-header-specific/src/ trunk/src/it/evol-884/update-file-header-specific/src/files/ trunk/src/it/evol-884/update-file-header-specific/src/files/apt/ trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index.apt trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index2.apt trunk/src/it/evol-884/update-file-header-specific/src/files/other/ trunk/src/it/evol-884/update-file-header-specific/src/files/other/athabaska.jpg trunk/src/it/evol-884/update-file-header-specific/src/files/other/other.txt trunk/src/it/evol-884/update-file-header-specific/src/files/properties/ trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test.properties trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test2.properties trunk/src/it/evol-884/update-file-header-specific/src/files/rst/ trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index.rst trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index2.rst trunk/src/it/evol-884/update-file-header-specific/src/files/xml/ trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test.xml trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test2.xml trunk/src/it/evol-884/update-file-header-specific/src/main/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean.java trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean2.java trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean3.java trunk/src/it/evol-884/update-file-header-specific/verify.groovy trunk/src/it/evol-884/update-file-header/ trunk/src/it/evol-884/update-file-header/LICENSE.txt trunk/src/it/evol-884/update-file-header/README.txt trunk/src/it/evol-884/update-file-header/changelog.txt trunk/src/it/evol-884/update-file-header/invoker.properties trunk/src/it/evol-884/update-file-header/pom.xml trunk/src/it/evol-884/update-file-header/src/ trunk/src/it/evol-884/update-file-header/src/files/ trunk/src/it/evol-884/update-file-header/src/files/apt/ trunk/src/it/evol-884/update-file-header/src/files/apt/index.apt trunk/src/it/evol-884/update-file-header/src/files/apt/index2.apt trunk/src/it/evol-884/update-file-header/src/files/properties/ trunk/src/it/evol-884/update-file-header/src/files/properties/test.properties trunk/src/it/evol-884/update-file-header/src/files/properties/test2.properties trunk/src/it/evol-884/update-file-header/src/files/rst/ trunk/src/it/evol-884/update-file-header/src/files/rst/index.rst trunk/src/it/evol-884/update-file-header/src/files/rst/index2.rst trunk/src/it/evol-884/update-file-header/src/files/xml/ trunk/src/it/evol-884/update-file-header/src/files/xml/test.xml trunk/src/it/evol-884/update-file-header/src/files/xml/test2.xml trunk/src/it/evol-884/update-file-header/src/main/ trunk/src/it/evol-884/update-file-header/src/main/java/ trunk/src/it/evol-884/update-file-header/src/main/java/org/ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java trunk/src/it/evol-884/update-file-header/verify.groovy trunk/src/it/evol-884/update-project-license/ trunk/src/it/evol-884/update-project-license/LICENSE.txt trunk/src/it/evol-884/update-project-license/README.txt trunk/src/it/evol-884/update-project-license/changelog.txt trunk/src/it/evol-884/update-project-license/invoker.properties trunk/src/it/evol-884/update-project-license/pom.xml trunk/src/it/evol-884/update-project-license/src/ trunk/src/it/evol-884/update-project-license/src/main/ trunk/src/it/evol-884/update-project-license/src/main/java/ trunk/src/it/evol-884/update-project-license/src/main/java/org/ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean.java trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean2.java trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean3.java trunk/src/it/evol-884/update-project-license/verify.groovy Modified: trunk/LICENSE.txt trunk/README.txt trunk/changelog.txt trunk/pom.xml trunk/src/it/add-third-party/no-deps/invoker.properties trunk/src/it/add-third-party/no-deps/pom.xml trunk/src/it/add-third-party/no-deps/verify.groovy trunk/src/it/add-third-party/with-deps/invoker.properties trunk/src/it/add-third-party/with-deps/pom.xml trunk/src/it/add-third-party/with-deps/verify.groovy trunk/src/it/evol-818/excluded-included/invoker.properties trunk/src/it/evol-818/excluded-included/pom.xml trunk/src/it/evol-818/excluded-included/verify.groovy trunk/src/it/evol-818/multimodule-filters/child1/pom.xml trunk/src/it/evol-818/multimodule-filters/child2/pom.xml trunk/src/it/evol-818/multimodule-filters/invoker.properties trunk/src/it/evol-818/multimodule-filters/pom.xml trunk/src/it/evol-818/multimodule-filters/verify.groovy trunk/src/it/settings.xml trunk/src/it/update-file-header/LICENSE.txt trunk/src/it/update-file-header/README.txt trunk/src/it/update-file-header/changelog.txt trunk/src/it/update-file-header/invoker.properties trunk/src/it/update-file-header/pom.xml trunk/src/it/update-file-header/src/files/apt/index.apt trunk/src/it/update-file-header/src/files/apt/index2.apt trunk/src/it/update-file-header/src/files/properties/test.properties trunk/src/it/update-file-header/src/files/properties/test2.properties trunk/src/it/update-file-header/src/files/rst/index.rst trunk/src/it/update-file-header/src/files/rst/index2.rst trunk/src/it/update-file-header/src/files/xml/test.xml trunk/src/it/update-file-header/src/files/xml/test2.xml trunk/src/it/update-file-header/src/license/project.xml trunk/src/it/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java trunk/src/it/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java trunk/src/it/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java trunk/src/it/update-file-header/verify.groovy trunk/src/it/update-project-license/LICENSE.txt trunk/src/it/update-project-license/README.txt trunk/src/it/update-project-license/changelog.txt trunk/src/it/update-project-license/invoker.properties trunk/src/it/update-project-license/pom.xml trunk/src/it/update-project-license/src/license/project.xml trunk/src/it/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean.java trunk/src/it/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean2.java trunk/src/it/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean3.java trunk/src/it/update-project-license/verify.groovy trunk/src/license/project.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseWithDescriptorMojo.java trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/CommentStyleListMojo.java trunk/src/main/java/org/nuiton/license/plugin/LicenseListMojo.java trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java trunk/src/main/java/org/nuiton/license/plugin/UpdateProjectLicenseMojo.java trunk/src/main/java/org/nuiton/license/plugin/header/FileHeader.java trunk/src/main/java/org/nuiton/license/plugin/header/FileHeaderFilter.java trunk/src/main/java/org/nuiton/license/plugin/header/FileHeaderProcessor.java trunk/src/main/java/org/nuiton/license/plugin/header/FileHeaderProcessorConfiguration.java trunk/src/main/java/org/nuiton/license/plugin/header/InvalideFileHeaderException.java trunk/src/main/java/org/nuiton/license/plugin/header/UpdateFileHeaderFilter.java trunk/src/main/java/org/nuiton/license/plugin/header/package.html trunk/src/main/java/org/nuiton/license/plugin/header/transformer/AbstractFileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/AptFileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/FileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/JavaFileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/PropertiesFileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/RstFileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformer.java trunk/src/main/java/org/nuiton/license/plugin/header/transformer/package.html trunk/src/main/java/org/nuiton/license/plugin/model/License.java trunk/src/main/java/org/nuiton/license/plugin/model/LicenseRepository.java trunk/src/main/java/org/nuiton/license/plugin/model/LicenseStore.java trunk/src/main/java/org/nuiton/license/plugin/model/descriptor/package.html trunk/src/main/java/org/nuiton/license/plugin/model/package.html trunk/src/main/java/org/nuiton/license/plugin/package.html trunk/src/main/mdo/descriptor.mdo trunk/src/main/resources/META-INF/licenses/agpl_v3/header.txt trunk/src/main/resources/META-INF/licenses/agpl_v3/license.txt trunk/src/main/resources/META-INF/licenses/apache_v2/header.txt trunk/src/main/resources/META-INF/licenses/apache_v2/license.txt trunk/src/main/resources/META-INF/licenses/cddl_v1/header.txt trunk/src/main/resources/META-INF/licenses/cddl_v1/license.txt trunk/src/main/resources/META-INF/licenses/fdl_v1_3/header.txt trunk/src/main/resources/META-INF/licenses/fdl_v1_3/license.txt trunk/src/main/resources/META-INF/licenses/gpl_v1/header.txt trunk/src/main/resources/META-INF/licenses/gpl_v1/license.txt trunk/src/main/resources/META-INF/licenses/gpl_v2/header.txt trunk/src/main/resources/META-INF/licenses/gpl_v2/license.txt trunk/src/main/resources/META-INF/licenses/gpl_v3/header.txt trunk/src/main/resources/META-INF/licenses/gpl_v3/license.txt trunk/src/main/resources/META-INF/licenses/lgpl_v2_1/header.txt trunk/src/main/resources/META-INF/licenses/lgpl_v2_1/license.txt trunk/src/main/resources/META-INF/licenses/lgpl_v3/header.txt trunk/src/main/resources/META-INF/licenses/lgpl_v3/license.txt trunk/src/main/resources/META-INF/licenses/licenses.properties trunk/src/main/resources/META-INF/licenses/mit/header.txt trunk/src/main/resources/META-INF/licenses/mit/license.txt trunk/src/main/resources/META-INF/plexus/components.xml trunk/src/main/resources/log4j.properties trunk/src/site/apt/descriptor.apt trunk/src/site/apt/header.apt trunk/src/site/apt/index.apt trunk/src/site/apt/usage.apt trunk/src/site/fr/apt/descriptor.apt trunk/src/site/fr/apt/header.apt trunk/src/site/fr/apt/index.apt trunk/src/site/fr/apt/usage.apt trunk/src/site/resources/licenseProjectDescriptor-1.0.0.xsd trunk/src/site/site_en.xml trunk/src/site/site_fr.xml trunk/src/test/java/org/nuiton/license/plugin/UpdateFileHeaderMojoTest.java trunk/src/test/java/org/nuiton/license/plugin/UpdateProjectLicenseMojoTest.java trunk/src/test/java/org/nuiton/license/plugin/header/transformer/AbstractFileHeaderTransformerTest.java trunk/src/test/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformerTest.java trunk/src/test/java/org/nuiton/license/plugin/model/LicenseRepositoryTest.java trunk/src/test/java/org/nuiton/license/plugin/model/LicenseStoreTest.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/addLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/addLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/addLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Add.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Fail.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Ignore.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Update.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/failLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/failLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/failLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/ignoreLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/ignoreLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/ignoreLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/skip.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/updateLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/updateLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/updateLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/addLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/addLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/addLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/ignoreLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/ignoreLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/ignoreLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/skip.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/updateLicense.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/updateLicense/project.xml trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/updateLicense/src/MyBean.java trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/licenseOne.txt trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/licenseTwo.txt trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/projectOne.xml trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/projectTwo.xml trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/skip.xml trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/testOne.xml trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/testTwo.xml Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/pom.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -38,7 +38,7 @@ </parent> <artifactId>maven-license-plugin</artifactId> - <version>2.3.2-SNAPSHOT</version> + <version>2.4-SNAPSHOT</version> <dependencies> @@ -449,12 +449,15 @@ <pomInclude>add-third-party/with-deps/pom.xml</pomInclude> <pomInclude>update-file-header/pom.xml</pomInclude> <pomInclude>update-project-license/pom.xml</pomInclude> + <pomInclude>evol-884/update-project-license/pom.xml</pomInclude> + <pomInclude>evol-884/update-file-header/pom.xml</pomInclude> + <pomInclude>evol-884/update-file-header-specific/pom.xml</pomInclude> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> <settingsFile>src/it/settings.xml</settingsFile> <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> -  + <debug>${maven.verbose}</debug> </configuration> <executions> <execution> Property changes on: trunk/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/add-third-party/no-deps/invoker.properties ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/add-third-party/no-deps/pom.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/add-third-party/no-deps/verify.groovy ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/add-third-party/with-deps/invoker.properties ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/add-third-party/with-deps/pom.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/add-third-party/with-deps/verify.groovy ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/excluded-included/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/excluded-included/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/excluded-included/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/multimodule-filters/child1/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/multimodule-filters/child2/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/multimodule-filters/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/multimodule-filters/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/it/evol-818/multimodule-filters/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/LICENSE.txt =================================================================== --- trunk/src/it/evol-884/update-file-header/LICENSE.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header/LICENSE.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/src/it/evol-884/update-file-header/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/README.txt =================================================================== --- trunk/src/it/evol-884/update-file-header/README.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header/README.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,2 @@ +To test parserJava on a new project (says a project with no i18n translations) +At the end we should have in target/generated-sources/i18n getters detected. Property changes on: trunk/src/it/evol-884/update-file-header/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/changelog.txt =================================================================== --- trunk/src/it/evol-884/update-file-header/changelog.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header/changelog.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/invoker.properties =================================================================== --- trunk/src/it/evol-884/update-file-header/invoker.properties (rev 0) +++ trunk/src/it/evol-884/update-file-header/invoker.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean compile + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-fast + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Property changes on: trunk/src/it/evol-884/update-file-header/invoker.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/pom.xml =================================================================== --- trunk/src/it/evol-884/update-file-header/pom.xml (rev 0) +++ trunk/src/it/evol-884/update-file-header/pom.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-update-file-header</artifactId> + <version>@pom.version@</version> + + <name>License Test :: update-file-header</name> + + <inceptionYear>2012</inceptionYear> + + <organization> + <name>License Test</name> + </organization> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <licenseName>gpl_v3</licenseName> + </properties> + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + <addSvnKeyWords>true</addSvnKeyWords> + </configuration> + <executions> + <execution> + <id>first</id> + <goals> + <goal>update-file-header</goal> + </goals> + <phase>process-sources</phase> + </execution> + <execution> +  + <id>second</id> + <goals> + <goal>update-file-header</goal> + </goals> + <phase>compile</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Property changes on: trunk/src/it/evol-884/update-file-header/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/apt/index.apt =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/apt/index.apt (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/apt/index.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +My file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/apt/index2.apt =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/apt/index2.apt (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/apt/index2.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,25 @@ +~~~ +~~ #%L +~~ License Test :: update-file-header +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2012 License Test +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Public License for more details. +~~ +~~ You should have received a copy of the GNU General Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/gpl-3.0.html>. +~~ #L% +~~~ +My file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/apt/index2.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/properties/test.properties =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/properties/test.properties (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/properties/test.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +my.key=true \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/properties/test.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/properties/test2.properties =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/properties/test2.properties (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/properties/test2.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,26 @@ +### +# #%L +# License Test :: update-file-header +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 License Test +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +my.key=true \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/properties/test2.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/rst/index.rst =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/rst/index.rst (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/rst/index.rst 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +My File \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/rst/index.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/rst/index2.rst =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/rst/index2.rst (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/rst/index2.rst 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,26 @@ +My file + +.. - +.. * #%L +.. * Maven License Plugin +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2008 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/rst/index2.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/xml/test.xml =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/xml/test.xml (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/xml/test.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<yo/> \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/xml/test.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/files/xml/test2.xml =================================================================== --- trunk/src/it/evol-884/update-file-header/src/files/xml/test2.xml (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/files/xml/test2.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8'?> + + +<yo/> \ No newline at end of file Property changes on: trunk/src/it/evol-884/update-file-header/src/files/xml/test2.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java =================================================================== --- trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,10 @@ +package org.nuiton.license.plugin.test; + +/** + * this class has no license, a new default one will be added. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +public class MyBean { +} Property changes on: trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java =================================================================== --- trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,20 @@ +/* + * #%L + * License Test :: do NOT update! + * %% + * Copyright (C) 2010 Tony + * %% + * Fake to be removed! + * #L% + */ + +/** + * this class owns a header, only license will be updated. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +package org.nuiton.license.plugin.test; + +public class MyBean2 { +} Property changes on: trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java =================================================================== --- trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java (rev 0) +++ trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,18 @@ +/* + * %%Ignore-License + * + * yet another license + * + * Copyright (C) 2000 Codelutin Do not update! + */ + +/** + * this class owns a ignore license header and will not be updated. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +package org.nuiton.license.plugin.test; + +public class MyBean3 { +} Property changes on: trunk/src/it/evol-884/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header/verify.groovy =================================================================== --- trunk/src/it/evol-884/update-file-header/verify.groovy (rev 0) +++ trunk/src/it/evol-884/update-file-header/verify.groovy 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,111 @@ + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean.java'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C) 2012 License Test' ); + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean2.java'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C) 2010 Tony' ); +assert content.contains( 'do NOT update!' ); +assert !content.contains( 'Fake to be removed!' ); + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean3.java'); +assert file.exists(); + +content = file.text; +assert content.contains( ' * %%Ignore-License' ); +assert content.contains( ' * yet another license' ); +assert content.contains( ' * Copyright (C) 2000 Codelutin Do not update!' ); + +file = new File(basedir, 'src/files/apt/index.apt'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '~~ #%L' ); +assert content.contains( '~~ #L%' ); +assert content.contains( '$Id' ); +assert ! content.contains( '~~ ~~'); + + +file = new File(basedir, 'src/files/apt/index2.apt'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '~~ #%L' ); +assert content.contains( '~~ #L%' ); +assert content.contains( '$Id' ); +assert ! content.contains( '~~ ~~'); + + +file = new File(basedir, 'src/files/rst/index.rst'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '.. * #%L' ); +assert content.contains( '.. * #L%' ); +assert content.contains( '$Id' ); +assert ! content.contains( '.. * .. *'); + + +file = new File(basedir, 'src/files/rst/index2.rst'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '.. * #%L' ); +assert content.contains( '.. * #L%' ); +assert content.contains( '$Id' ); +assert ! content.contains( '.. * .. *'); + + +file = new File(basedir, 'src/files/xml/test.xml'); +assert file.exists(); + +content = file.text; +assert content.startsWith( "<?xml version='1.0' encoding='UTF-8'?>" ); +assert content.contains( 'Copyright (C)' ); +assert content.contains( '#%L' ); +assert content.contains( '#L%' ); +assert content.contains( '$Id' ); + + +file = new File(basedir, 'src/files/xml/test2.xml'); +assert file.exists(); + +content = file.text; +assert content.startsWith( "<?xml version='1.0' encoding='UTF-8'?>" ); +assert content.contains( 'Copyright (C)' ); +assert content.contains( '#%L' ); +assert content.contains( '#L%' ); +assert content.contains( '$Id' ); + +file = new File(basedir, 'src/files/properties/test.properties'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '# #%L' ); +assert content.contains( '# #L%' ); +assert !content.contains( '# # \n' ); +assert content.contains( '$Id' ); + + +file = new File(basedir, 'src/files/properties/test2.properties'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '# #%L' ); +assert content.contains( '# #L%' ); +assert content.contains( '# #%L' ); +assert !content.contains( '# # \n' ); +assert content.contains( '$Id' ); + +return true; Property changes on: trunk/src/it/evol-884/update-file-header/verify.groovy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/src/it/evol-884/update-file-header-specific/LICENSE.txt =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/LICENSE.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/LICENSE.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/src/it/evol-884/update-file-header-specific/README.txt =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/README.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/README.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,2 @@ +To test parserJava on a new project (says a project with no i18n translations) +At the end we should have in target/generated-sources/i18n getters detected. Added: trunk/src/it/evol-884/update-file-header-specific/changelog.txt =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/changelog.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/changelog.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/invoker.properties =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/invoker.properties (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/invoker.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=clean compile + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-fast + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/src/it/evol-884/update-file-header-specific/pom.xml =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/pom.xml (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/pom.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-update-file-header-specific</artifactId> + <version>@pom.version@</version> + + <name>License Test :: update-file-header-specific</name> + + <inceptionYear>2012</inceptionYear> + + <organization> + <name>License Test</name> + </organization> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + <configuration> + <verbose>true</verbose> + <addSvnKeyWords>true</addSvnKeyWords> + </configuration> + <executions> + <execution> + <id>first</id> + <goals> + <goal>update-file-header</goal> + </goals> + <phase>process-sources</phase> + <configuration> + <licenseName>gpl_v3</licenseName> + <roots> + <param>src/main/java</param> + <param>src/files</param> + </roots> + <excludes> + <param>**/*.rst</param> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> + + Added: trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index.apt =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index.apt (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +My file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index2.apt =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index2.apt (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/apt/index2.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,25 @@ +~~~ +~~ #%L +~~ License Test :: update-file-header +~~ +~~ $Id: index2.apt 1752 2010-04-15 19:00:41Z tchemit $ +~~ $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/it/update-file-hea… $ +~~ %% +~~ Copyright (C) 2012 License Test +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Public License for more details. +~~ +~~ You should have received a copy of the GNU General Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/gpl-3.0.html>. +~~ #L% +~~~ +My file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/other/athabaska.jpg =================================================================== (Binary files differ) Property changes on: trunk/src/it/evol-884/update-file-header-specific/src/files/other/athabaska.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/it/evol-884/update-file-header-specific/src/files/other/other.txt =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/other/other.txt (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/other/other.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +simple txt file. \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test.properties =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test.properties (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +my.key=true \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test2.properties =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test2.properties (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/properties/test2.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,26 @@ +### +# #%L +# License Test :: update-file-header +# +# $Id: test2.properties 1752 2010-04-15 19:00:41Z tchemit $ +# $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/it/update-file-hea… $ +# %% +# Copyright (C) 2012 License Test +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +my.key=true \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index.rst =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index.rst (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index.rst 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +My File \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index2.rst =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index2.rst (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/rst/index2.rst 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,26 @@ +My file + +.. - +.. * #%L +.. * Maven License Plugin +.. * +.. * $Id: index2.rst 1752 2010-04-15 19:00:41Z tchemit $ +.. * $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/it/update-file-hea… $ +.. * %% +.. * Copyright (C) 2008 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test.xml =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test.xml (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<yo/> \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test2.xml =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test2.xml (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/files/xml/test2.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8'?> + + +<yo/> \ No newline at end of file Added: trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean.java =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean.java (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,10 @@ +package org.nuiton.license.plugin.test; + +/** + * this class has no license, a new default one will be added. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +public class MyBean { +} Added: trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean2.java =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean2.java (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean2.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,20 @@ +/* + * #%L + * License Test :: do NOT update! + * %% + * Copyright (C) 2010 Tony + * %% + * Fake to be removed! + * #L% + */ + +/** + * this class owns a header, only license will be updated. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +package org.nuiton.license.plugin.test; + +public class MyBean2 { +} Added: trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean3.java =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean3.java (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/src/main/java/org/nuiton/license/plugin/test/MyBean3.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,18 @@ +/* + * %%Ignore-License + * + * yet another license + * + * Copyright (C) 2000 Codelutin Do not update! + */ + +/** + * this class owns a ignore license header and will not be updated. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +package org.nuiton.license.plugin.test; + +public class MyBean3 { +} Added: trunk/src/it/evol-884/update-file-header-specific/verify.groovy =================================================================== --- trunk/src/it/evol-884/update-file-header-specific/verify.groovy (rev 0) +++ trunk/src/it/evol-884/update-file-header-specific/verify.groovy 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,65 @@ + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean.java'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C) 2012 License Test' ); + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean2.java'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C) 2010 Tony' ); +assert content.contains( 'do NOT update!' ); +assert !content.contains( 'Fake to be removed!' ); + +file = new File(basedir, 'src/main/java/org/nuiton/license/plugin/test/MyBean3.java'); +assert file.exists(); + +content = file.text; +assert content.contains( ' * %%Ignore-License' ); +assert content.contains( ' * yet another license' ); +assert content.contains( ' * Copyright (C) 2000 Codelutin Do not update!' ); + +file = new File(basedir, 'src/files/apt/index.apt'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '~~ #%L' ); +assert content.contains( '~~ #L%' ); +assert content.contains( '$Id' ); +assert ! content.contains( '~~ ~~'); + +file = new File(basedir, 'src/files/rst/index.rst'); +assert file.exists(); + +content = file.text; +assert !content.contains( 'Copyright (C)' ); +assert !content.contains( '.. * #%L' ); +assert !content.contains( '.. * #L%' ); +assert !content.contains( '$Id' ); +assert ! content.contains( '.. * .. *'); + +file = new File(basedir, 'src/files/xml/test.xml'); +assert file.exists(); + +content = file.text; +assert content.startsWith( "<?xml version='1.0' encoding='UTF-8'?>" ); +assert content.contains( 'Copyright (C)' ); +assert content.contains( '#%L' ); +assert content.contains( '#L%' ); +assert content.contains( '$Id' ); + +file = new File(basedir, 'src/files/properties/test.properties'); +assert file.exists(); + +content = file.text; +assert content.contains( 'Copyright (C)' ); +assert content.contains( '# #%L' ); +assert content.contains( '# #L%' ); +assert !content.contains( '# # \n' ); +assert content.contains( '$Id' ); + + +return true; Added: trunk/src/it/evol-884/update-project-license/LICENSE.txt =================================================================== --- trunk/src/it/evol-884/update-project-license/LICENSE.txt (rev 0) +++ trunk/src/it/evol-884/update-project-license/LICENSE.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,167 @@ +;; This line will be removed! + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Added: trunk/src/it/evol-884/update-project-license/README.txt =================================================================== --- trunk/src/it/evol-884/update-project-license/README.txt (rev 0) +++ trunk/src/it/evol-884/update-project-license/README.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,2 @@ +To test parserJava on a new project (says a project with no i18n translations) +At the end we should have in target/generated-sources/i18n getters detected. Added: trunk/src/it/evol-884/update-project-license/changelog.txt =================================================================== --- trunk/src/it/evol-884/update-project-license/changelog.txt (rev 0) +++ trunk/src/it/evol-884/update-project-license/changelog.txt 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1 @@ +see the changelog of org.nuiton:i18n project. \ No newline at end of file Added: trunk/src/it/evol-884/update-project-license/invoker.properties =================================================================== --- trunk/src/it/evol-884/update-project-license/invoker.properties (rev 0) +++ trunk/src/it/evol-884/update-project-license/invoker.properties 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=license:update-project-license + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-fast + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/src/it/evol-884/update-project-license/pom.xml =================================================================== --- trunk/src/it/evol-884/update-project-license/pom.xml (rev 0) +++ trunk/src/it/evol-884/update-project-license/pom.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.license.test</groupId> + <artifactId>test-update-project-license-without-conf</artifactId> + <version>@pom.version@</version> + + <name>License Test :: update-project-license-without-conf</name> + + <packaging>jar</packaging> + + <inceptionYear>2012</inceptionYear> + + <organization> + <name>License Test</name> + </organization> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <license.generateBundle>true</license.generateBundle> + <license.bundleLicensePath>META-INF/bundleLicense.txt</license.bundleLicensePath> + <license.verbose>true</license.verbose> + <licenseName>gpl_v3</licenseName> + </properties> + + <build> + + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + </plugin> + </plugins> + </pluginManagement> + </build> + +</project> + + Added: trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean.java =================================================================== --- trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean.java (rev 0) +++ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,10 @@ +package org.nuiton.license.plugin.test; + +/** + * this class has no license, a new default one will be added. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +public class MyBean { +} Added: trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean2.java =================================================================== --- trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean2.java (rev 0) +++ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean2.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,20 @@ +/* + * #%L + * License Test :: do NOT update! + * %% + * Copyright (C) 2010 Tony + * %% + * Fake to be removed! + * #L% + */ + +/** + * this class owns a header, only license will be updated. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +package org.nuiton.license.plugin.test; + +public class MyBean2 { +} Added: trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean3.java =================================================================== --- trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean3.java (rev 0) +++ trunk/src/it/evol-884/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean3.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,18 @@ +/* + * %%Ignore-License + * + * yet another license + * + * Copyright (C) 2000 Codelutin Do not update! + */ + +/** + * this class owns a ignore license header and will not be updated. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.1 + */ +package org.nuiton.license.plugin.test; + +public class MyBean3 { +} Added: trunk/src/it/evol-884/update-project-license/verify.groovy =================================================================== --- trunk/src/it/evol-884/update-project-license/verify.groovy (rev 0) +++ trunk/src/it/evol-884/update-project-license/verify.groovy 2010-09-29 13:49:21 UTC (rev 1832) @@ -0,0 +1,26 @@ + +file = new File(basedir, 'LICENSE.txt'); +assert file.exists(); + +content = file.text; +assert !content.contains( ';; This line will be removed!' ); +assert !content.contains( 'GNU LESSER GENERAL PUBLIC LICENSE' ); +assert content.contains( 'GNU GENERAL PUBLIC LICENSE' ); + +file = new File(basedir, 'target/generated-sources/license/LICENSE.txt'); +assert file.exists(); + +content = file.text; +assert !content.contains( ';; This line will be removed!' ); +assert !content.contains( 'GNU LESSER GENERAL PUBLIC LICENSE' ); +assert content.contains( 'GNU GENERAL PUBLIC LICENSE' ); + +file = new File(basedir, 'target/generated-sources/license/META-INF/bundleLicense.txt'); +assert file.exists(); + +content = file.text; +assert !content.contains( ';; This line will be removed!' ); +assert !content.contains( 'GNU LESSER GENERAL PUBLIC LICENSE' ); +assert content.contains( 'GNU GENERAL PUBLIC LICENSE' ); + +return true; Property changes on: trunk/src/it/settings.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/invoker.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/apt/index2.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/properties/test.properties ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/properties/test2.properties ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/rst/index.rst ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/rst/index2.rst ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/xml/test.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/files/xml/test2.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean2.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/src/main/java/org/nuiton/license/plugin/test/MyBean3.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-file-header/verify.groovy ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/LICENSE.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/README.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/changelog.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/invoker.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/pom.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean2.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/src/main/java/org/nuiton/license/plugin/test/MyBean3.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/it/update-project-license/verify.groovy ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/license/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseWithDescriptorMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseWithDescriptorMojo.java 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseWithDescriptorMojo.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -41,9 +41,11 @@ import java.io.File; import java.io.FileReader; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.Calendar; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -102,12 +104,54 @@ */ private Map<String, FileHeaderTransformer> transformers; + /** + * Name of the license to use for files. + * + * @parameter expression="${licenseName}" + * @since 2.4 + */ + protected String licenseName; + + /** + * To specify the base dir from which we apply the license. + * Should be on form "root1,root2,rootn". + * By default, the main root is "src". + * + * @parameter expression="${license.roots}" + * @since 2.4 + */ + protected String[] roots; + + /** + * Specific files to includes, separated by a comma. By default, it is "** /*". + * + * @parameter expression="${license.includes}" + * @since 2.4 + */ + protected String[] includes; + + /** + * Specific files to excludes, separated by a comma. + * By default, thoses file type are excluded: + * <ul> + * <li>modelisation</li> + * <li>images</li> + * <li>i18n properties</li> + * </ul> + * + * @parameter expression="${license.excludes}" + * @since 2.4 + */ + protected String[] excludes; + /** store of licenses */ private LicenseStore licenseStore; /** descriptor of project */ private LicenseProjectDescriptor licenseProjectDescriptor; + /** Map that contains each files indexed by their CommentStyle **/ + Map<String, List<File>> universe; /** * When is sets to {@code true}, will skip execution. * <p/> @@ -131,10 +175,6 @@ getLog().info("skip flag is on, will skip goal."); return false; } - if (!getDescriptor().exists()) { - getLog().warn("skip - could not find descriptor " + getDescriptor()); - return false; - } return super.checkSkip(); } @@ -173,11 +213,48 @@ } if (!descriptorFile.exists()) { -// throw new MojoFailureException( -// "could not find descriptor " + descriptorFile); + // No descriptor File: use no descriptor + + // Map that will contain all the files, grouped by root directory + Map<File, String[]> filesToTreat = new HashMap<File, String[]>(); + + // Init default value for roots and includes + if (roots == null || roots.length == 0) { + roots = new String[]{"src"}; + } + List<String> rootsList = Arrays.asList(getRoots()); + + if (includes == null || includes.length == 0) { + includes = new String[]{"**/*"}; + } + + if (excludes == null || excludes.length == 0) { + excludes = new String[]{ + "**/*.zargo","**/*.uml","**/*.umldi","**/*.xmi", /* modelisation */ + "**/*.img","**/*.png","**/*.jpg","**/*.jpeg","**/*.gif", /* images */ + "**/i18n/*.properties" + }; + } + + // Get all files ordered by roots + getFilesToTreateForRoots(includes, excludes, rootsList, + filesToTreat, null); + + // we got all files: treat them + treatFilesByCommentStyle(filesToTreat, + licenseStore, + getTransformers()); + + return; } + getLog().warn("\n"); + getLog().warn("----------------------------------------------------------"); + getLog().warn("The use of Descriptor File will be obsolete from version 3"); + getLog().warn("----------------------------------------------------------"); + getLog().warn("\n"); + getLog().info("Loading descriptor " + descriptorFile); LicenseProjectDescriptor licenseProject = null; FileReader reader = new FileReader(descriptorFile); @@ -221,6 +298,22 @@ return transformers; } + public String getLicenseName() { + return licenseName; + } + + public String[] getRoots() { + return roots; + } + + public String[] getIncludes() { + return includes; + } + + public String[] getExcludes() { + return excludes; + } + public String getLicenseResolver() { return licenseResolver; } @@ -233,6 +326,10 @@ return licenseProjectDescriptor; } + public Map<String, List<File>> getUniverse() { + return universe; + } + public void setKeepBackup(boolean keepBackup) { this.keepBackup = keepBackup; } @@ -250,6 +347,34 @@ this.transformers = transformers; } + public void setLicenseName(String licenseName) { + this.licenseName = licenseName; + } + + public void setRoots(String[] roots) { + this.roots = roots; + } + + public void setRoots(String roots) { + this.roots = roots.split(","); + } + + public void setIncludes(String[] includes) { + this.includes = includes; + } + + public void setIncludes(String includes) { + this.includes = includes.split(","); + } + + public void setExcludes(String[] excludes) { + this.excludes = excludes; + } + + public void setExcludes(String excludes) { + this.excludes = excludes.split(","); + } + public void setLicenseStore(LicenseStore licenseStore) { this.licenseStore = licenseStore; } @@ -260,18 +385,25 @@ this.licenseProjectDescriptor = licenseProjectDescriptor; } + public void setUniverse(Map<String, List<File>> universe) { + this.universe = universe; + } + public License getMainLicense() throws IllegalArgumentException, IllegalStateException { LicenseProjectDescriptor licenseProject = getLicenseProjectDescriptor(); - if (licenseProject == null) { + if (licenseProject != null) { + licenseName = licenseProject.getMainLicense(); + } + if (licenseName == null) { throw new IllegalStateException("No license project initialized!"); } - String mainLicenseName = licenseProject.getMainLicense(); - if (StringUtils.isEmpty(mainLicenseName)) { + + if (StringUtils.isEmpty(licenseName)) { throw new IllegalArgumentException( "main license name can not be null, nor empty"); } - License mainLicense = getLicense(mainLicenseName); + License mainLicense = getLicense(licenseName); return mainLicense; } @@ -438,4 +570,56 @@ } } + protected void treatFilesByCommentStyle( + Map<File, String[]> filesToTreat, + LicenseStore licenseStore, + Map<String, FileHeaderTransformer> transformers) { + + universe = new HashMap<String, List<File>>(); + + for (Map.Entry<File, String[]> entry: filesToTreat.entrySet()) { + File root = entry.getKey(); + String[] filesPath = entry.getValue(); + + // Foreach file, sort them by CS + for (String path: filesPath) { + String[] splitPath = path.split("\\."); + String extension = splitPath[splitPath.length -1]; + File file = new File(root, path); + String commentStyle = getCommentStyle(extension); + + if (commentStyle != null && !commentStyle.isEmpty()) { + List<File> files = universe.get(commentStyle); + if (files == null) { + files = new ArrayList<File>(); + universe.put(commentStyle, files); + } + files.add(file); + } + + } + } + + } + + protected String getCommentStyle(String extension) { + if ("java".equals(extension)) { + return "java"; + } + if ("xml".equals(extension)) { + return "xml"; + } + if ("apt".equals(extension)) { + return "apt"; + } + if ("properties".equals(extension)) { + return "properties"; + } + if ("rst".equals(extension)) { + return "rst"; + } + + return null; + } + } Property changes on: trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseWithDescriptorMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/CommentStyleListMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/LicenseListMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -324,9 +324,20 @@ try { - for (Header header : getLicenseProjectDescriptor().getHeaders()) { + // No headers, use treat by CommentStyle ! + if (getLicenseProjectDescriptor() == null) { + for (Map.Entry<String, List<File>> commentStyleFiles : getUniverse().entrySet()) { + String commentStyle = commentStyleFiles.getKey(); + List<File> files = commentStyleFiles.getValue(); - processHeader(header); + processCommentStyle(commentStyle, files); + } + } else { + List<Header> headers = getLicenseProjectDescriptor().getHeaders(); + for (Header header : headers) { + + processHeader(header); + } } } finally { @@ -372,11 +383,12 @@ String licenseName = header.getLicenseName(); License license = getLicense(licenseName); - getLog().info("Process header '" + header.getCommentStyle() + "'"); + String commentStyle = header.getCommentStyle(); + getLog().info("Process header '" + commentStyle + "'"); getLog().info(" - using " + license.getDescription()); // use header transformer according to comment style given in header - setTransformer(getTransformer(header.getCommentStyle())); + setTransformer(getTransformer(commentStyle)); // file header to use if no header is found on a file FileHeader defaultFileHeader = buildDefaultFileHeader( @@ -426,7 +438,7 @@ for (Map.Entry<File, String[]> entry : filestoTreate.entrySet()) { - // treate all files of entry + // treat all files of entry processFileEntry(entry.getKey(), entry.getValue()); } } finally { @@ -435,6 +447,80 @@ } } + protected void processCommentStyle(String commentStyle, + List<File> filesToTreat) throws IOException { + + // obtain license from definition + String licenseName = getLicenseName(); + License license = getLicense(licenseName); + + getLog().info("Process header '" + commentStyle + "'"); + getLog().info(" - using " + license.getDescription()); + + // use header transformer according to comment style given in header + setTransformer(getTransformer(commentStyle)); + + // file header to use if no header is found on a file + FileHeader defaultFileHeader = buildDefaultFileHeader( + license, + getProjectName(), + getInceptionYear(), + getOrganizationName(), + isAddSvnKeyWords(), + getEncoding() + ); + + // change default license header in processor + setHeader(defaultFileHeader); + + // update processor filter + getProcessor().populateFilter(); + + for (File file: filesToTreat) { + prepareProcessFile(file); + } + filesToTreat.clear(); + } + + + protected void prepareProcessFile(File file) throws IOException { + + if (getProcessedFiles().contains(file)) { + getLog().info(" - skip already processed file " + file); + return; + } + + // output file + File processFile = + new File(file.getAbsolutePath() + "_" + getTimestamp()); + boolean doFinalize = false; + try { + doFinalize = processFile(file, processFile); + } catch (Exception e) { + getLog().warn("skip failed file : " + + e.getMessage() + + (e.getCause() == null ? "" : + " Cause : " + e.getCause().getMessage()), e + ); + FileState.fail.addFile(file, getResult()); + doFinalize = false; + } finally { + + // always clean processor internal states + getProcessor().reset(); + + // whatever was the result, this file is treated. + getProcessedFiles().add(file); + + if (doFinalize) { + finalizeFile(file, processFile); + } else { + deleteFile(processFile); + } + } + + } + protected void processFileEntry(File entryBasedir, String[] paths) throws IOException { @@ -483,7 +569,7 @@ * * @param file the file to process * @param processFile the ouput processed file - * @return {@code true} if processFile can be finalize, otherwise need to be delete + * @return {@code true} if prepareProcessFile can be finalize, otherwise need to be delete * @throws IOException if any pb while treatment */ protected boolean processFile(File file, Property changes on: trunk/src/main/java/org/nuiton/license/plugin/UpdateFileHeaderMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/UpdateProjectLicenseMojo.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Modified: trunk/src/main/java/org/nuiton/license/plugin/header/FileHeader.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/header/FileHeader.java 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/main/java/org/nuiton/license/plugin/header/FileHeader.java 2010-09-29 13:49:21 UTC (rev 1832) @@ -28,7 +28,7 @@ /** * Contract of a file header. * <p/> - * A header has thre sections like in this example : + * A header has three sections like in this example : * <p/> * <pre> * Description Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/FileHeader.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/FileHeaderFilter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/FileHeaderProcessor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/FileHeaderProcessorConfiguration.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/InvalideFileHeaderException.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/UpdateFileHeaderFilter.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/AbstractFileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/AptFileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/FileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/JavaFileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/PropertiesFileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/RstFileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformer.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/header/transformer/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/model/License.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/model/LicenseRepository.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/model/LicenseStore.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/model/descriptor/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/model/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/java/org/nuiton/license/plugin/package.html ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/mdo/descriptor.mdo ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/agpl_v3/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/agpl_v3/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/apache_v2/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/apache_v2/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/cddl_v1/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/cddl_v1/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/fdl_v1_3/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/fdl_v1_3/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/gpl_v1/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/gpl_v1/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/gpl_v2/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/gpl_v2/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/gpl_v3/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/gpl_v3/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/lgpl_v2_1/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/lgpl_v2_1/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/lgpl_v3/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/lgpl_v3/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/licenses.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/mit/header.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/licenses/mit/license.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/META-INF/plexus/components.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/main/resources/log4j.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/site/apt/descriptor.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/apt/header.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/apt/usage.apt ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Modified: trunk/src/site/fr/apt/descriptor.apt =================================================================== --- trunk/src/site/fr/apt/descriptor.apt 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/site/fr/apt/descriptor.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -2,8 +2,8 @@ ~~ #%L ~~ Maven License Plugin ~~ -~~ $Id: descriptor.apt 1754 2010-04-16 10:47:43Z tchemit $ -~~ $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/site/apt/descripto… $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% Property changes on: trunk/src/site/fr/apt/descriptor.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/fr/apt/header.apt =================================================================== --- trunk/src/site/fr/apt/header.apt 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/site/fr/apt/header.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -2,8 +2,8 @@ ~~ #%L ~~ Maven License Plugin ~~ -~~ $Id: header.apt 1754 2010-04-16 10:47:43Z tchemit $ -~~ $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/site/apt/header.apt $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% Property changes on: trunk/src/site/fr/apt/header.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/fr/apt/index.apt =================================================================== --- trunk/src/site/fr/apt/index.apt 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/site/fr/apt/index.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -2,8 +2,8 @@ ~~ #%L ~~ Maven License Plugin ~~ -~~ $Id: index.apt 1754 2010-04-16 10:47:43Z tchemit $ -~~ $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/site/apt/index.apt $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% Property changes on: trunk/src/site/fr/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/src/site/fr/apt/usage.apt =================================================================== --- trunk/src/site/fr/apt/usage.apt 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/site/fr/apt/usage.apt 2010-09-29 13:49:21 UTC (rev 1832) @@ -2,8 +2,8 @@ ~~ #%L ~~ Maven License Plugin ~~ -~~ $Id: usage.apt 1754 2010-04-16 10:47:43Z tchemit $ -~~ $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/site/apt/usage.apt $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% Property changes on: trunk/src/site/fr/apt/usage.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/site/resources/licenseProjectDescriptor-1.0.0.xsd ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-09-29 12:33:39 UTC (rev 1831) +++ trunk/src/site/site_fr.xml 2010-09-29 13:49:21 UTC (rev 1832) @@ -2,8 +2,8 @@ <!-- #%L Maven License Plugin - $Id: site_en.xml 1751 2010-04-15 13:57:24Z tchemit $ - $HeadURL: http://svn.nuiton.org/svn/maven-license-plugin/trunk/src/site/site_en.xml $ + $Id$ + $HeadURL$ %% Copyright (C) 2008 - 2010 CodeLutin %% Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/license/plugin/UpdateFileHeaderMojoTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/license/plugin/UpdateProjectLicenseMojoTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/license/plugin/header/transformer/AbstractFileHeaderTransformerTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/license/plugin/header/transformer/XmlFileHeaderTransformerTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/license/plugin/model/LicenseRepositoryTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/java/org/nuiton/license/plugin/model/LicenseStoreTest.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/addLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/addLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/addLicense.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Add.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Fail.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Ignore.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all/src/Update.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/all.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/failLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/failLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/failLicense.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/ignoreLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/ignoreLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/ignoreLicense.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/skip.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/updateLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/updateLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateFileHeaderMojoTest/updateLicense.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/addLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/addLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/addLicense.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/ignoreLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/ignoreLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/ignoreLicense.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/skip.xml ___________________________________________________________________ Modified: svn:keywords - "Author Date Id Revision HeadURL + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/updateLicense/project.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/updateLicense/src/MyBean.java ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateLicenseMojoTest/updateLicense.xml ___________________________________________________________________ Modified: svn:keywords - HeadURL Id Date Revision Author + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/licenseOne.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/licenseTwo.txt ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/projectOne.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/projectTwo.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/skip.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/testOne.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL Property changes on: trunk/src/test/resources/org/nuiton/license/plugin/updateProjectLicenseMojoTest/testTwo.xml ___________________________________________________________________ Modified: svn:keywords - Author Date Id URL Rev + Author Date Id Revision HeadURL

1 0

r1831 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 14:33:39 +0200 (Wed, 29 Sep 2010) New Revision: 1831 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1831 Log: add developpeurs in pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-29 08:10:54 UTC (rev 1830) +++ trunk/pom.xml 2010-09-29 12:33:39 UTC (rev 1831) @@ -297,13 +297,23 @@ </roles> </developer> <developer> + <name>Yannick Martel</name> + <id>ymartel</id> + <email>martel(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> <name>Jean Couteau</name> <id>jcouteau</id> <email>couteau(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> - <role>Développeur</role> + <role>Technical writer</role> </roles> </developer> </developers>

1 0

r1830 - trunk
by tchemit＠users.nuiton.org 29 Sep '10

29 Sep '10

Author: tchemit Date: 2010-09-29 10:10:54 +0200 (Wed, 29 Sep 2010) New Revision: 1830 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1830 Log: Utilisation de mavenpom4redmine 2.2.6 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-27 08:35:03 UTC (rev 1829) +++ trunk/pom.xml 2010-09-29 08:10:54 UTC (rev 1830) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.5</version> + <version>2.2.6</version> </parent> <artifactId>maven-license-plugin</artifactId>

1 0

r1829 - trunk/src/it/evol-818
by tchemit＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: tchemit Date: 2010-09-27 10:35:03 +0200 (Mon, 27 Sep 2010) New Revision: 1829 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1829 Log: alls it of evo-818 to the same root directory Added: trunk/src/it/evol-818/excluded-included/ trunk/src/it/evol-818/multimodule-filters/ Removed: trunk/src/it/evol-818/evo-818-excluded-included/ trunk/src/it/evol-818/evo-818-multimodule-filters/

1 0

r1828 - in trunk: . src/it src/it/evol-818
by tchemit＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: tchemit Date: 2010-09-27 10:29:48 +0200 (Mon, 27 Sep 2010) New Revision: 1828 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1828 Log: alls it of evo-818 to the same root directory Added: trunk/src/it/evol-818/evo-818-excluded-included/ trunk/src/it/evol-818/evo-818-multimodule-filters/ Removed: trunk/src/it/evo-818-excluded-included/ trunk/src/it/evo-818-multimodule-filters/ Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-27 08:27:56 UTC (rev 1827) +++ trunk/pom.xml 2010-09-27 08:29:48 UTC (rev 1828) @@ -429,8 +429,8 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>evo-818-excluded-included</pomInclude> - <pomInclude>evo-818-multimodule-filters/pom.xml</pomInclude> + <pomInclude>evol-818/excluded-included</pomInclude> + <pomInclude>evol-818/multimodule-filters/pom.xml</pomInclude> <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude>

1 0

r1827 - trunk/src/it
by tchemit＠users.nuiton.org 27 Sep '10

27 Sep '10

Author: tchemit Date: 2010-09-27 10:27:56 +0200 (Mon, 27 Sep 2010) New Revision: 1827 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1827 Log: alls it of evo-818 to the same root directory Added: trunk/src/it/evol-818/

1 0

r1826 - in trunk/src/it: add-third-party/merge-licenses add-third-party/no-deps add-third-party/no-encoding add-third-party/with-deps aggregate-add-third-party ano-816 update-file-header update-project-license
by tchemit＠users.nuiton.org 26 Sep '10

26 Sep '10

Author: tchemit Date: 2010-09-26 22:06:27 +0200 (Sun, 26 Sep 2010) New Revision: 1826 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1826 Log: fail-fast Modified: trunk/src/it/add-third-party/merge-licenses/invoker.properties trunk/src/it/add-third-party/no-deps/invoker.properties trunk/src/it/add-third-party/no-encoding/invoker.properties trunk/src/it/add-third-party/with-deps/invoker.properties trunk/src/it/aggregate-add-third-party/invoker.properties trunk/src/it/ano-816/invoker.properties trunk/src/it/update-file-header/invoker.properties trunk/src/it/update-project-license/invoker.properties Modified: trunk/src/it/add-third-party/merge-licenses/invoker.properties =================================================================== --- trunk/src/it/add-third-party/merge-licenses/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/merge-licenses/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/add-third-party/no-deps/invoker.properties =================================================================== --- trunk/src/it/add-third-party/no-deps/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/no-deps/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/add-third-party/no-encoding/invoker.properties =================================================================== --- trunk/src/it/add-third-party/no-encoding/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/no-encoding/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/add-third-party/with-deps/invoker.properties =================================================================== --- trunk/src/it/add-third-party/with-deps/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/add-third-party/with-deps/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/aggregate-add-third-party/invoker.properties =================================================================== --- trunk/src/it/aggregate-add-third-party/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/aggregate-add-third-party/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/ano-816/invoker.properties =================================================================== --- trunk/src/it/ano-816/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/ano-816/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/update-file-header/invoker.properties =================================================================== --- trunk/src/it/update-file-header/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/update-file-header/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success Modified: trunk/src/it/update-project-license/invoker.properties =================================================================== --- trunk/src/it/update-project-license/invoker.properties 2010-09-24 15:37:52 UTC (rev 1825) +++ trunk/src/it/update-project-license/invoker.properties 2010-09-26 20:06:27 UTC (rev 1826) @@ -12,7 +12,7 @@ #invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m # Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" -invoker.failureBehavior=fail-at-end +invoker.failureBehavior=fail-fast # The expected result of the build, possible values are "success" (default) and "failure" #invoker.buildResult=success

1 0

r1825 - trunk/src/site/apt
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 17:37:52 +0200 (Fri, 24 Sep 2010) New Revision: 1825 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1825 Log: Update maven doc about filters for THIRD-PARTY Modified: trunk/src/site/apt/usage.apt Modified: trunk/src/site/apt/usage.apt =================================================================== --- trunk/src/site/apt/usage.apt 2010-09-24 14:14:01 UTC (rev 1824) +++ trunk/src/site/apt/usage.apt 2010-09-24 15:37:52 UTC (rev 1825) @@ -240,6 +240,205 @@ (The Apache Software License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) ------------------------------------------------------------------------------- +* Filter the dependencies + + <Since version 2.3>, we can consolidate the THIRD-PARTY file with filters on + artifacts and groups, in excluding or only including some of them. + + * Include ArtifactIds or GroupIds + + Include property is useful to refer in THIRD-PARTY file only some artifacts, + given by their artifactIds and those that are in the given groupIds. + + * Exclude ArtifactIds or GroupIds + + Exclude property is useful to not refer in THIRD-PARTY file only some artifacts, + given by their artifactIds and those that are in the given groupIds. + + * Include - Exclude : priority + + Note that the exclude filter is predominant on include filter. So, if we include + an artifact but exclude its groupId, it will not be referred in THIRD-PARTY file. + +** exclude groupIds + + While using configuration's property <<excludeGroupIds>> on third-party goals, + it will remove all the dependencies came from the given groupIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.excludedGroups=com\.jhla.*>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) +------------------------------------------------------------------------------- + +** exclude artifactIds + + While using configuration's property <<excludeArtifactIds>> on third-party goals, + it will remove all the dependencies came from the given artifactsIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.excludedArtifacts=javaproj>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (Apache License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) +------------------------------------------------------------------------------- + +** include groupIds + + While using configuration's property <<includeGroupIds>> on third-party goals, + it will include only the dependencies came from the given groupIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.includedGroups=com\.jhlabs>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (Apache License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) + (The Apache Software License, Version 2.0) JHlabs Java Projection Library (com.jhlabs:javaproj:1.0 - http://www.jhlabs.com/java/maps/proj/index.html) +------------------------------------------------------------------------------- + +** include artifactIds + + While using configuration's property <<excludeArtifactIds>> on third-party goals, + it will remove include onlu the dependencies came from the given artifactIds fom the + THIRD-PARTY file. + +*** Example + + Given a pom with these dependencies : + +------------------------------------------------------------------------------- + + <dependencies> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + <version>2.0.235</version> + </dependency> + + <dependency> + <groupId>com.jhlabs</groupId> + <artifactId>javaproj</artifactId> + <version>1.0</version> + </dependency< + + </dependencies> +------------------------------------------------------------------------------- + + While executing <mvn add-third-party -Dlicense.includedArtifacts=filters>, + we obtain the following <<THIRD-PARTY>> file : + +------------------------------------------------------------------------------- +List of 2 third-party dependencies. + + (Apache License, Version 2.0) JHLabs Image Processing Filters (com.jhlabs:filters:2.0.235 - http://www.jhlabs.com/ip/index.html) +------------------------------------------------------------------------------- + + Get informations * license-list goal

1 0

r1824 - in trunk: . src/it src/it/evo-818-multimodule-filters src/it/evo-818-multimodule-filters/child1 src/it/evo-818-multimodule-filters/child2 src/main/java/org/nuiton/license/plugin
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 16:14:01 +0200 (Fri, 24 Sep 2010) New Revision: 1824 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1824 Log: Add integration test about filters on thirdParty aggregation in multimodule Added: trunk/src/it/evo-818-multimodule-filters/ trunk/src/it/evo-818-multimodule-filters/child1/ trunk/src/it/evo-818-multimodule-filters/child1/pom.xml trunk/src/it/evo-818-multimodule-filters/child2/ trunk/src/it/evo-818-multimodule-filters/child2/pom.xml trunk/src/it/evo-818-multimodule-filters/invoker.properties trunk/src/it/evo-818-multimodule-filters/pom.xml trunk/src/it/evo-818-multimodule-filters/verify.groovy Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-24 12:09:25 UTC (rev 1823) +++ trunk/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -429,7 +429,8 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>evo-818-excluded-included/pom.xml</pomInclude> + <pomInclude>evo-818-excluded-included</pomInclude> + <pomInclude>evo-818-multimodule-filters/pom.xml</pomInclude> <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude> Added: trunk/src/it/evo-818-multimodule-filters/child1/pom.xml =================================================================== --- trunk/src/it/evo-818-multimodule-filters/child1/pom.xml (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/child1/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton.license.test</groupId> + <artifactId>evo-818-multimodule</artifactId> + <version>1.0</version> + </parent> + <artifactId>evo-818-multimodule-child1</artifactId> + + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>1.2.3</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> + +</project> + + Added: trunk/src/it/evo-818-multimodule-filters/child2/pom.xml =================================================================== --- trunk/src/it/evo-818-multimodule-filters/child2/pom.xml (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/child2/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.nuiton.license.test</groupId> + <artifactId>evo-818-multimodule</artifactId> + <version>1.0</version> + </parent> + <artifactId>evo-818-multimodule-child2</artifactId> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <license.generateBundle>true</license.generateBundle> + <license.verbose>true</license.verbose> + </properties> + + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> + </dependencies> + +</project> + + Added: trunk/src/it/evo-818-multimodule-filters/invoker.properties =================================================================== --- trunk/src/it/evo-818-multimodule-filters/invoker.properties (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/invoker.properties 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,21 @@ +# A comma or space separated list of goals/phases to execute, may +# specify an empty list to execute the default goal of the IT project +invoker.goals=license:aggregate-add-third-party + +# Optionally, a list of goals to run during further invocations of Maven +#invoker.goals.2=${project.groupId}:${project.artifactId}:${project.version}:run + +# A comma or space separated list of profiles to activate +#invoker.profiles=run-all run-once + +# The value for the environment variable MAVEN_OPTS +#invoker.mavenOpts=-Dfile.encoding=UTF-16 -Xms32m -Xmx256m + +# Possible values are "fail-fast" (default), "fail-at-end" and "fail-never" +invoker.failureBehavior=fail-at-end + +# The expected result of the build, possible values are "success" (default) and "failure" +#invoker.buildResult=success + +# A boolean value controlling the -N flag, defaults to "false" +#invoker.nonRecursive=false Added: trunk/src/it/evo-818-multimodule-filters/pom.xml =================================================================== --- trunk/src/it/evo-818-multimodule-filters/pom.xml (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/pom.xml 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>org.nuiton.license.test</groupId> + <artifactId>evo-818-multimodule</artifactId> + <version>1.0</version> + + <modules> + <module>child1</module> + <module>child2</module> + </modules> + + <name>Evo 818 : test MultiModule</name> + + <packaging>pom</packaging> + + <url>no-url</url> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <license.verbose>true</license.verbose> + <license.includedGroups>org\.nuiton.*</license.includedGroups> + <license.includedArtifacts>junit</license.includedArtifacts> + <license.excludedArtifacts>nuiton-utils</license.excludedArtifacts> + </properties> + + <build> + + <pluginManagement> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <version>@pom.version@</version> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>group-filter</id> + <goals> + <goal>aggregate-add-third-party</goal> + </goals> + <phase>verify</phase> + </execution> + </executions> + </plugin> + </plugins> + + </build> + +</project> + + Added: trunk/src/it/evo-818-multimodule-filters/verify.groovy =================================================================== --- trunk/src/it/evo-818-multimodule-filters/verify.groovy (rev 0) +++ trunk/src/it/evo-818-multimodule-filters/verify.groovy 2010-09-24 14:14:01 UTC (rev 1824) @@ -0,0 +1,11 @@ + +file = new File(basedir, 'target/generated-sources/license/THIRD-PARTY.txt'); +assert file.exists(); +content = file.text; +assert !content.contains( 'the project has no dependencies.' ); +assert !content.contains( 'commons-logging:commons-logging:1.1.1' ); +assert !content.contains( 'org.nuiton:nuiton-utils:1.4' ); +assert content.contains( 'org.nuiton.i18n:nuiton-i18n:1.2.2' ); +assert content.contains( 'junit:junit'); + +return true Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 14:14:01 UTC (rev 1824) @@ -142,19 +142,19 @@ } String id = getArtifactId(artifact); - MavenProject project = addArtifact(id, artifact); // Check if the project should be included // If there is no specified artifacts and group to include, include all boolean isToInclude = haveNoIncludedArtifacts && haveNoIncludedGroups - || isIncludable(project, includedGroupPattern, includedArtifactPattern); + || isIncludable(artifact, includedGroupPattern, includedArtifactPattern); // Check if the project should be excluded boolean isToExclude = isToInclude && haveExclusions - && isExcludable(project, excludedGroupPattern, excludedArtifactPattern); + && isExcludable(artifact, excludedGroupPattern, excludedArtifactPattern); if (isToInclude && !isToExclude) { + MavenProject project = addArtifact(id, artifact); licenseMap.addLicense(project, project.getLicenses()); } } @@ -285,7 +285,7 @@ } - protected boolean isIncludable(MavenProject project, + protected boolean isIncludable(Artifact project, Pattern includedGroupPattern, Pattern includedArtifactPattern) { @@ -331,7 +331,7 @@ } - protected boolean isExcludable(MavenProject project, + protected boolean isExcludable(Artifact project, Pattern excludedGroupPattern, Pattern excludedArtifactPattern) {

1 0

r1823 - in trunk: . src/it src/main/java/org/nuiton/license/plugin
by ymartel＠users.nuiton.org 24 Sep '10

24 Sep '10

Author: ymartel Date: 2010-09-24 14:09:25 +0200 (Fri, 24 Sep 2010) New Revision: 1823 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1823 Log: Remove usage of "projectFilter" parameter, now use only included/exluded Groups/Artifacts Removed: trunk/src/it/evol-818/ Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/pom.xml 2010-09-24 12:09:25 UTC (rev 1823) @@ -429,8 +429,7 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <pomInclude>excluded-included/pom.xml</pomInclude> - <pomInclude>evol-818/pom.xml</pomInclude> + <pomInclude>evo-818-excluded-included/pom.xml</pomInclude> <pomInclude>ano-816/pom.xml</pomInclude> <pomInclude>add-third-party/no-encoding/pom.xml</pomInclude> <pomInclude>aggregate-add-third-party/pom.xml</pomInclude> Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -158,14 +158,6 @@ protected boolean groupByLicense; /** - * A filter for projects licenses. - * - * @parameter expression="${license.projectFilter}" default-value="" - * @since 2.3.2 - */ - protected String projectFilter; - - /** * A filter to exclude some GroupIds * * @parameter expression="${license.excludedGroups}" default-value="" @@ -548,14 +540,6 @@ this.doGenerateBundle = doGenerateBundle; } - public String getProjectFilter() { - return projectFilter; - } - - public void setProjectFilter(String projectFilter) { - this.projectFilter = projectFilter; - } - public String getExcludedGroups() { return excludedGroups; } Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -102,7 +102,7 @@ protected LicenseMap createLicenseMap() throws ProjectBuildingException { Log log = getLog(); - LicenseMap licenseMap = new LicenseMap(this.getProjectFilter()); + LicenseMap licenseMap = new LicenseMap(); licenseMap.setLog(log); boolean haveNoIncludedGroups = StringUtils.isEmpty(includedGroups); Modified: trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -83,7 +83,7 @@ protected LicenseMap createLicenseMap() throws ProjectBuildingException { Log log = getLog(); - LicenseMap licenseMap = new LicenseMap(this.getProjectFilter()); + LicenseMap licenseMap = new LicenseMap(); licenseMap.setLog(log); SortedMap<String, MavenProject> artifacts = getArtifactCache(); Modified: trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-09-24 11:56:14 UTC (rev 1822) +++ trunk/src/main/java/org/nuiton/license/plugin/LicenseMap.java 2010-09-24 12:09:25 UTC (rev 1823) @@ -62,17 +62,12 @@ private static final long serialVersionUID = 864199843545688069L; private transient Log log; - private String licenseFilterPattern; public static final String unknownLicenseMessage = "Unknown license"; public LicenseMap() { } - public LicenseMap(String someLicenseFilterPattern) { - licenseFilterPattern = someLicenseFilterPattern; - } - public void setLog(Log log) { this.log = log; } @@ -90,31 +85,6 @@ return; } - if (StringUtils.isNotEmpty(licenseFilterPattern)) { - // we have some defined license filters - try { - Pattern pattern = Pattern.compile(licenseFilterPattern); - Matcher matchGroupId = pattern.matcher(project.getGroupId()); - if (matchGroupId.find()) { - if (log.isDebugEnabled()) { - log.debug("Exclude " + project.getGroupId()); - } - return; - } - Matcher matchArtifactId = pattern.matcher(project.getArtifactId()); - if (matchArtifactId.find()) { - if (log.isDebugEnabled()) { - log.debug("Exclude " + project.getGroupId() + ":" + - project.getArtifactId()); - } - return; - } - } - catch (PatternSyntaxException e) { - getLog().warn("The pattern specified by expression <" + licenseFilterPattern + "> seems to be invalid."); - } - } - if (CollectionUtils.isEmpty(licenses)) { // no license found for the dependency

1 0