Author: tchemit Date: 2010-06-26 11:27:52 +0200 (Sat, 26 Jun 2010) New Revision: 1780 Url: http://nuiton.org/repositories/revision/maven-license-plugin/1780 Log: - Evolution #717: Use build timestamp to check if files are up to date for third-party goals - improve documentation Modified: trunk/pom.xml trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java trunk/src/site/apt/usage.apt trunk/src/site/fr/apt/usage.apt trunk/src/site/site_en.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/pom.xml 2010-06-26 09:27:52 UTC (rev 1780) @@ -137,6 +137,13 @@ <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${maven.version}</version> <scope>provided</scope> Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractAddThirdPartyMojo.java 2010-06-26 09:27:52 UTC (rev 1780) @@ -167,17 +167,6 @@ protected abstract SortedProperties createUnsafeMapping() throws ProjectBuildingException, IOException; @Override - protected boolean checkSkip() { - if (!isDoGenerate() && - !isDoGenerateBundle()) { - - getLog().info("All files are up to date, skip goal execution."); - return false; - } - return super.checkSkip(); - } - - @Override protected void init() throws Exception { Log log = getLog(); @@ -192,17 +181,26 @@ setThirdPartyFile(file); - setDoGenerate(isForce() || !file.exists() || !isFileNewerThanPomFile(file)); + long buildTimestamp = getBuildTimestamp(); + if (isVerbose()) { + log.info("Build start at : " + buildTimestamp); + log.info("third-party file : " + file.lastModified()); + } + + setDoGenerate(isForce() || !file.exists() || buildTimestamp > file.lastModified()); + if (isGenerateBundle()) { File bundleFile = PluginHelper.getFile(getOutputDirectory(), getBundleThirdPartyPath()); + if (isVerbose()) { + log.info("bundle third-party file : " + bundleFile.lastModified()); + } setDoGenerateBundle(isForce() || !bundleFile.exists() || - !isFileNewerThanPomFile(bundleFile) || - file.lastModified() > bundleFile.lastModified()); + buildTimestamp > bundleFile.lastModified()); } else { // not generating bundled file Modified: trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/main/java/org/nuiton/license/plugin/AbstractLicenseMojo.java 2010-06-26 09:27:52 UTC (rev 1780) @@ -25,6 +25,7 @@ package org.nuiton.license.plugin; +import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.nuiton.license.plugin.model.LicenseStore; @@ -41,6 +42,16 @@ public abstract class AbstractLicenseMojo extends AbstractPlugin { /** + * current maven session. + * + * @parameter expression="${session}" + * @required + * @readonly + * @since 2.3 + */ + private MavenSession session; + + /** * Dependance du projet. * * @parameter default-value="${project}" @@ -94,6 +105,17 @@ this.encoding = encoding; } + public final MavenSession getSession() { + return session; + } + + public final void setSession(MavenSession session) { + this.session = session; + } + + public final long getBuildTimestamp() { + return session.getStartTime().getTime(); + } protected LicenseStore createLicenseStore(String... extraResolver) throws MojoExecutionException { LicenseStore store; Modified: trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/main/java/org/nuiton/license/plugin/AddThirdPartyMojo.java 2010-06-26 09:27:52 UTC (rev 1780) @@ -137,12 +137,14 @@ @Override protected boolean checkSkip() { - if (!isDoGenerateMissing()) { + if (!isDoGenerate() && + !isDoGenerateBundle() && + !isDoGenerateMissing()) { getLog().info("All files are up to date, skip goal execution."); return false; } - return super.checkSkip(); + return true; } @Override Modified: trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java =================================================================== --- trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/main/java/org/nuiton/license/plugin/AggregatorAddThirdPartyMojo.java 2010-06-26 09:27:52 UTC (rev 1780) @@ -69,6 +69,17 @@ } @Override + protected boolean checkSkip() { + if (!isDoGenerate() && + !isDoGenerateBundle()) { + + getLog().info("All files are up to date, skip goal execution."); + return false; + } + return super.checkSkip(); + } + + @Override protected LicenseMap createLicenseMap() throws ProjectBuildingException { Log log = getLog(); Modified: trunk/src/site/apt/usage.apt =================================================================== --- trunk/src/site/apt/usage.apt 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/site/apt/usage.apt 2010-06-26 09:27:52 UTC (rev 1780) @@ -26,8 +26,10 @@ Usage ---- -Actions +License + The projects offers some goals to deal with license in a project. + * update-project-license goal This goal creates or updates the LICENSE.txt file and add it in build. @@ -45,6 +47,10 @@ for full detail see {{{./update-file-header-mojo.html}detail page}}. +Third-party + + The project offers some goals to deal with THIRD-PARTY files in a project. + * add-third-party goal This goal build the THIRD-PARTY.txt file and add it in build. @@ -66,6 +72,141 @@ for full detail see {{{./aggregate-add-third-party-mojo.html}detail page}}. + +* How to consolidate the THIRD-PARTY file + + It is possiblie to improve the THIRD-PARTY file : + + - Fill back missing license for dependencies. + + - Merge licenses (same license but named differently in dependencies poms). + +** Add missing licenses. + + while using configuration's property <<useMissingfile>> on third-party goals, + it will create (or read for aggregate) a file located from property <<missingFfile>> + (by default <<src/license/THIRD-PARTY.properties>>). + + In this file, we find dependencies with no license, you just have to fill + correct licenses. + + Once the file filled, just relaunch the goal to integrate your modifications + in the generated <<THIRD-PARTY>> file. + + Here is a <<THIRD-PARTY>> file with unamed licenses : + +-------------------------------------------------------------------------------- +List of 18 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) + (BSD) jxlayer (org.swinglabs:jxlayer:3.0.3 - http://www.swinglabs.org/) + (Common Public License Version 1.0) JUnit (junit:junit:4.8.1 - http://junit.org) + (Lesser General Public License (LGPL) v 3.0) I18n :: Api (org.nuiton.i18n:nuiton-i18n:1.2.2 - http://maven-site.nuiton.org/i18n/nuiton-i18n) + (Lesser General Public License (LGPL) v 3.0) Nuiton Utils (org.nuiton:nuiton-utils:1.3.1 - http://maven-site.nuiton.org/nuiton-utils) + (Lesser General Public License (LGPL)) Swing Layout Extensions (org.swinglabs:swing-worker:1.1 - https://swingworker.dev.java.net/) + (Lesser General Public License (LGPL)) SwingX (org.swinglabs:swingx:1.6 - http://www.swinglabs.org/) + (The Apache Software License, Version 2.0) Apache Log4j (log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/) + (The Apache Software License, Version 2.0) Commons BeanUtils (commons-beanutils:commons-beanutils:1.8.2 - http://commons.apache.org/beanutils/) + (The Apache Software License, Version 2.0) Commons Collections (commons-collections:commons-collections:3.2.1 - http://commons.apache.org/collections/) + (The Apache Software License, Version 2.0) Commons IO (commons-io:commons-io:1.4 - http://commons.apache.org/io/) + (The Apache Software License, Version 2.0) Commons JXPath (commons-jxpath:commons-jxpath:1.3 - http://commons.apache.org/jxpath/) + (The Apache Software License, Version 2.0) Commons Lang (commons-lang:commons-lang:2.4 - http://commons.apache.org/lang/) + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) + (The OpenSymphony Software License 1.1) XWork (com.opensymphony:xwork:2.1.3 - http://www.opensymphony.com/xwork) + (Unknown license) JavaHelp API (javax.help:javahelp:2.0.02 - http://java.sun.com/products/javahelp/index.jsp) + (Unknown license) OGNL - Object Graph Navigation Library (opensymphony:ognl:2.6.11 - http://ognl.org) + (Unknown license) Unnamed - commons-primitives:commons-primitives:jar:1.0 (commons-primitives:commons-primitives:1.0 - no url defined) +-------------------------------------------------------------------------------- + + And the generated <<THIRD-PARTY.properties>> file : + +-------------------------------------------------------------------------------- +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License, Version 2.0 +# - BSD +# - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Jun 25 10:56:39 CEST 2010 +commons-primitives--commons-primitives--1.0= +javax.help--javahelp--2.0.02= +opensymphony--ognl--2.6.11= +-------------------------------------------------------------------------------- + + Fills the file : + +-------------------------------------------------------------------------------- +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License, Version 2.0 +# - BSD +# - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Jun 25 10:56:39 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 + -------------------------------------------------------------------------------- + + Finally, relaunch the goal to obtain new generated <<THIRD-PARTY.txt>> file : + +------------------------------------------------------------------------------- +List of 18 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) + (BSD) jxlayer (org.swinglabs:jxlayer:3.0.3 - http://www.swinglabs.org/) + (Common Public License Version 1.0) JUnit (junit:junit:4.8.1 - http://junit.org) + (Lesser General Public License (LGPL) v 3.0) I18n :: Api (org.nuiton.i18n:nuiton-i18n:1.2.2 - http://maven-site.nuiton.org/i18n/nuiton-i18n) + (Lesser General Public License (LGPL) v 3.0) Nuiton Utils (org.nuiton:nuiton-utils:1.3.1 - http://maven-site.nuiton.org/nuiton-utils) + (Lesser General Public License (LGPL)) Swing Layout Extensions (org.swinglabs:swing-worker:1.1 - https://swingworker.dev.java.net/) + (Lesser General Public License (LGPL)) SwingX (org.swinglabs:swingx:1.6 - http://www.swinglabs.org/) + (Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0) JavaHelp API (javax.help:javahelp:2.0.02 - http://java.sun.com/products/javahelp/index.jsp) + (The Apache Software License, Version 2.0) Apache Log4j (log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/) + (The Apache Software License, Version 2.0) Commons BeanUtils (commons-beanutils:commons-beanutils:1.8.2 - http://commons.apache.org/beanutils/) + (The Apache Software License, Version 2.0) Commons Collections (commons-collections:commons-collections:3.2.1 - http://commons.apache.org/collections/) + (The Apache Software License, Version 2.0) Commons IO (commons-io:commons-io:1.4 - http://commons.apache.org/io/) + (The Apache Software License, Version 2.0) Commons JXPath (commons-jxpath:commons-jxpath:1.3 - http://commons.apache.org/jxpath/) + (The Apache Software License, Version 2.0) Commons Lang (commons-lang:commons-lang:2.4 - http://commons.apache.org/lang/) + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) + (The Apache Software License, Version 2.0) Unnamed - commons-primitives:commons-primitives:jar:1.0 (commons-primitives:commons-primitives:1.0 - no url defined) + (The OpenSymphony Software License 1.1) OGNL - Object Graph Navigation Library (opensymphony:ognl:2.6.11 - http://ognl.org) + (The OpenSymphony Software License 1.1) XWork (com.opensymphony:xwork:2.1.3 - http://www.opensymphony.com/xwork) +------------------------------------------------------------------------------- + +** Merge licenses. + + to merge licenses added in <<THIRd-PARTY>> file, you have to add this configuration : + +------------------------------------------------------------------------------- + <configuration> + <mergeLicenses> + <mergeLicense> + Lesser General Public License (LGPL) v 3.0|Lesser General Public License (LGPL) + </mergeLicense> + </mergeLicenses> + </configuration> +------------------------------------------------------------------------------- + + Each entry of <<mergeLicenses>> describe a merge, the first license is the one to keep. + Get informations * license-list goal Modified: trunk/src/site/fr/apt/usage.apt =================================================================== --- trunk/src/site/fr/apt/usage.apt 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/site/fr/apt/usage.apt 2010-06-26 09:27:52 UTC (rev 1780) @@ -26,8 +26,11 @@ Usage ---- -Actions +License + Le projet offre des goals pour traiter les licenses d'un projet. + + * update-project-license goal Ce goal crée ou met à jour le fichier LICENSE.txt et l'ajoute au build. @@ -47,6 +50,10 @@ Pour plus d'informations, référez-vous à {{{./update-file-header-mojo.html}la page de détail}}. +Third-party + + Le projet offre des goals pour traiter les THIRD-PARTY d'un projet. + * add-third-party goal Ce goal construit le fichier THIRD-PARTY.txt et l'ajoute au build. @@ -69,6 +76,145 @@ Pour plus de détails, référez-vous à {{{./aggregate-add-third-party-mojo.html}la page de détail}}. +* Comment consolider le fichier THIRD-PARTY + + Il est possible de consolider le fichier THIRD-PARTY : + + - Renseigner les licenses manquantes pour une dépendence (si la license n'a + pas été renseignée dans le pom de la dépendance. + + - Fusionner des licenses identiques mais nommées différemment dans le pom des + dépendances. + +** Ajouter les licenses manquantes. + + En utilisant la propriété <<useMissingfile>> sur les deux goals, cela va + créée si nécessaire un fichier localisé par la propriété <<missingFfile>> + (par défaut <<src/license/THIRD-PARTY.properties>>). + + Dans ce fichier on y retrouve la liste des dépendances du projet sans license. + Il suffit alors de renseigner le fichier avec les bonnes licenses. + + Une fois le fichier complété, il suffit de relancer le goal, le nouveau + THIRD-PARTY généré intègrera les licenses complétées. + + Voici un fichier <<THIRD-PARTY.properties>> contenant des dépendances sans license + généré + +-------------------------------------------------------------------------------- +List of 18 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) + (BSD) jxlayer (org.swinglabs:jxlayer:3.0.3 - http://www.swinglabs.org/) + (Common Public License Version 1.0) JUnit (junit:junit:4.8.1 - http://junit.org) + (Lesser General Public License (LGPL) v 3.0) I18n :: Api (org.nuiton.i18n:nuiton-i18n:1.2.2 - http://maven-site.nuiton.org/i18n/nuiton-i18n) + (Lesser General Public License (LGPL) v 3.0) Nuiton Utils (org.nuiton:nuiton-utils:1.3.1 - http://maven-site.nuiton.org/nuiton-utils) + (Lesser General Public License (LGPL)) Swing Layout Extensions (org.swinglabs:swing-worker:1.1 - https://swingworker.dev.java.net/) + (Lesser General Public License (LGPL)) SwingX (org.swinglabs:swingx:1.6 - http://www.swinglabs.org/) + (The Apache Software License, Version 2.0) Apache Log4j (log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/) + (The Apache Software License, Version 2.0) Commons BeanUtils (commons-beanutils:commons-beanutils:1.8.2 - http://commons.apache.org/beanutils/) + (The Apache Software License, Version 2.0) Commons Collections (commons-collections:commons-collections:3.2.1 - http://commons.apache.org/collections/) + (The Apache Software License, Version 2.0) Commons IO (commons-io:commons-io:1.4 - http://commons.apache.org/io/) + (The Apache Software License, Version 2.0) Commons JXPath (commons-jxpath:commons-jxpath:1.3 - http://commons.apache.org/jxpath/) + (The Apache Software License, Version 2.0) Commons Lang (commons-lang:commons-lang:2.4 - http://commons.apache.org/lang/) + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) + (The OpenSymphony Software License 1.1) XWork (com.opensymphony:xwork:2.1.3 - http://www.opensymphony.com/xwork) + (Unknown license) JavaHelp API (javax.help:javahelp:2.0.02 - http://java.sun.com/products/javahelp/index.jsp) + (Unknown license) OGNL - Object Graph Navigation Library (opensymphony:ognl:2.6.11 - http://ognl.org) + (Unknown license) Unnamed - commons-primitives:commons-primitives:jar:1.0 (commons-primitives:commons-primitives:1.0 - no url defined) +-------------------------------------------------------------------------------- + + Et le fichier <<THIRD-PARTY.properties>> généré : + +-------------------------------------------------------------------------------- +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License, Version 2.0 +# - BSD +# - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Jun 25 10:56:39 CEST 2010 +commons-primitives--commons-primitives--1.0= +javax.help--javahelp--2.0.02= +opensymphony--ognl--2.6.11= +-------------------------------------------------------------------------------- + + On renseigne le fichier : + +-------------------------------------------------------------------------------- +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License, Version 2.0 +# - BSD +# - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) +# - Lesser General Public License (LGPL) v 3.0 +# - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +# - The Apache Software License, Version 2.0 +# - The OpenSymphony Software License 1.1 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Jun 25 10:56:39 CEST 2010 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +javax.help--javahelp--2.0.02=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 +opensymphony--ognl--2.6.11=The OpenSymphony Software License 1.1 + -------------------------------------------------------------------------------- + + En relançant le goal on obtient le nouveau fichier <<THIRD-PARTY.txt>> suivant : + +------------------------------------------------------------------------------- +List of 18 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) + (BSD) jxlayer (org.swinglabs:jxlayer:3.0.3 - http://www.swinglabs.org/) + (Common Public License Version 1.0) JUnit (junit:junit:4.8.1 - http://junit.org) + (Lesser General Public License (LGPL) v 3.0) I18n :: Api (org.nuiton.i18n:nuiton-i18n:1.2.2 - http://maven-site.nuiton.org/i18n/nuiton-i18n) + (Lesser General Public License (LGPL) v 3.0) Nuiton Utils (org.nuiton:nuiton-utils:1.3.1 - http://maven-site.nuiton.org/nuiton-utils) + (Lesser General Public License (LGPL)) Swing Layout Extensions (org.swinglabs:swing-worker:1.1 - https://swingworker.dev.java.net/) + (Lesser General Public License (LGPL)) SwingX (org.swinglabs:swingx:1.6 - http://www.swinglabs.org/) + (Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0) JavaHelp API (javax.help:javahelp:2.0.02 - http://java.sun.com/products/javahelp/index.jsp) + (The Apache Software License, Version 2.0) Apache Log4j (log4j:log4j:1.2.16 - http://logging.apache.org/log4j/1.2/) + (The Apache Software License, Version 2.0) Commons BeanUtils (commons-beanutils:commons-beanutils:1.8.2 - http://commons.apache.org/beanutils/) + (The Apache Software License, Version 2.0) Commons Collections (commons-collections:commons-collections:3.2.1 - http://commons.apache.org/collections/) + (The Apache Software License, Version 2.0) Commons IO (commons-io:commons-io:1.4 - http://commons.apache.org/io/) + (The Apache Software License, Version 2.0) Commons JXPath (commons-jxpath:commons-jxpath:1.3 - http://commons.apache.org/jxpath/) + (The Apache Software License, Version 2.0) Commons Lang (commons-lang:commons-lang:2.4 - http://commons.apache.org/lang/) + (The Apache Software License, Version 2.0) Commons Logging (commons-logging:commons-logging:1.1.1 - http://commons.apache.org/logging) + (The Apache Software License, Version 2.0) Unnamed - commons-primitives:commons-primitives:jar:1.0 (commons-primitives:commons-primitives:1.0 - no url defined) + (The OpenSymphony Software License 1.1) OGNL - Object Graph Navigation Library (opensymphony:ognl:2.6.11 - http://ognl.org) + (The OpenSymphony Software License 1.1) XWork (com.opensymphony:xwork:2.1.3 - http://www.opensymphony.com/xwork) +------------------------------------------------------------------------------- + +** Fusionner les licenses. + + Pour fusionner des licenses dans le fichier THIRd-PARTY, il faut utiliser + la configuration <<mergeLicenses>>, comme dans l'exemple suivant : + +------------------------------------------------------------------------------- + <configuration> + <mergeLicenses> + <mergeLicense> + Lesser General Public License (LGPL) v 3.0|Lesser General Public License (LGPL) + </mergeLicense> + </mergeLicenses> + </configuration> +------------------------------------------------------------------------------- + + Chaque entrée de <<mergeLicenses>> décrit une fusion, la première license + étant celle à conserver. + Obtenir des informations * license-list goal Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-06-25 17:57:39 UTC (rev 1779) +++ trunk/src/site/site_en.xml 2010-06-26 09:27:52 UTC (rev 1780) @@ -59,9 +59,11 @@ <item name="File header model" href="header.html"/> <item name="License project descriptor" href="descriptor.html"/> <item name="Usage" href="usage.html"> - <item name="Actions" href="usage.html#actions"> + <item name="License" href="usage.html#license"> <item name="update-project-license" href="update-project-license-mojo.html"/> <item name="update-file-header" href="update-file-header-mojo.html"/> + </item> + <item name="Third-party" href="usage.html#third-party"> <item name="add-third-party" href="add-third-party-mojo.html"/> <item name="aggregate-add-third-party" href="aggregate-add-third-party-mojo.html"/> </item>