Author: tchemit Date: 2010-04-10 17:59:19 +0200 (Sat, 10 Apr 2010) New Revision: 863 Log: - remove license.licenseName property - update doc (new profile update-license + remove deprecated profiles) Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4labs/src/license/project.xml trunk/pom.xml trunk/src/site/apt/profiles.apt trunk/src/site/apt/properties.apt trunk/src/site/en/apt/profiles.apt trunk/src/site/en/apt/properties.apt Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/mavenpom4labs/pom.xml 2010-04-10 15:59:19 UTC (rev 863) @@ -58,15 +58,15 @@ <name>Mavenpom4labs</name> - <description>Ancestor of all projects of Code Lutin based on a labs - environnement + <description> + Ancestor of all projects of Code Lutin based on a labs environnement </description> <inceptionYear>2010</inceptionYear> <licenses> <license> - <name>General Public License (GPL)</name> + <name>General Public License (GPL) v 3.0</name> <url>${maven.license.file}</url> <distribution>local</distribution> </license> @@ -123,8 +123,8 @@ <labs.list.host>lists.${platform}</labs.list.host> - <!-- default license to use --> - <license.licenseName>gpl_v3</license.licenseName> + <!--default license to use--> + <!--<license.licenseName>gpl_v3</license.licenseName>--> <platform>labs.libre-entreprise.org</platform> Modified: trunk/mavenpom4labs/src/license/project.xml =================================================================== --- trunk/mavenpom4labs/src/license/project.xml 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/mavenpom4labs/src/license/project.xml 2010-04-10 15:59:19 UTC (rev 863) @@ -29,10 +29,9 @@ <project xmlns="http://maven-site.nuiton.org/maven-license-plugin/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven-site.nuiton.org/maven-license-plugin/1.0.0 http://maven-site.nuiton.org/maven-license-plugin/licenseProject-1.0.0.xsd"> - <mainLicense>lgpl_v3</mainLicense> + <mainLicense>gpl_v3</mainLicense> <licenseSets> <licenseSet> - <!--<licenseName>lgpl_v3</licenseName>--> <fileSets> <fileSet> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/pom.xml 2010-04-10 15:59:19 UTC (rev 863) @@ -59,7 +59,7 @@ <licenses> <license> - <name>Lesser General Public License (LGPL)</name> + <name>Lesser General Public License (LGPL) v 3.0</name> <url>${maven.license.file}</url> <distribution>local</distribution> </license> @@ -276,7 +276,7 @@ <listId>${projectId}</listId> <!-- default license to use --> - <license.licenseName>lgpl_v3</license.licenseName> + <!--<license.licenseName>lgpl_v3</license.licenseName>--> <!-- java level is 1.6 --> <maven.compile.source>1.6</maven.compile.source> @@ -342,7 +342,6 @@ <maven.version>2.2.1</maven.version> <maven-plugin-tools-javadoc.version>2.5.1</maven-plugin-tools-javadoc.version> - <!--<plexus-javadoc.version>1.0</plexus-javadoc.version>--> <plexus-component-javadoc.version>1.3.0</plexus-component-javadoc.version> <helper.version>1.2.3-SNAPSHOT</helper.version> @@ -1150,185 +1149,6 @@ </build> </profile> - <!-- ce profile permet de generer les entetes de licenses pour les - fichiers java --> - <!--profile> - <id>update-java-header</id> - <activation> - <property> - <name>updateJavaHeader</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>process-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>update-java-header</id> - <goals> - <goal>update-header</goal> - </goals> - <phase>process-resources</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile--> - - <!-- ce profile permet de generer les entetes de licenses pour les - fichiers JAXX --> - <!--profile> - <id>update-jaxx-header</id> - <activation> - <property> - <name>updateJaxxHeader</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>process-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>update-jaxx-header</id> - <goals> - <goal>update-header</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <generatorName>license-xml</generatorName> - <includes>**/*.jaxx</includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile--> - - <!-- ce profile permet de generer les entetes de licenses pour les - fichiers css JAXX --> - <!--profile> - <id>update-jaxx-css-header</id> - <activation> - <property> - <name>updateJaxxCssHeader</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>process-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>update-jaxx-css-header</id> - <goals> - <goal>update-header</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <generatorName>license-java</generatorName> - <includes>**/*.css</includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile--> - - <!-- ce profile permet de generer les entetes de licenses pour les - fichiers properties --> - <!--profile> - <id>update-properties-header</id> - <activation> - <property> - <name>updatePropertiesHeader</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>process-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>update-properties-header</id> - <goals> - <goal>update-header</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <generatorName>license-properties</generatorName> - <compileSourceRoots>${basedir}/src/main/resources</compileSourceRoots> - <testSourceRoots>${basedir}/src/test/resources</testSourceRoots> - <includes>**/*.properties</includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile--> - - <!--profile> - <id>update-site-header</id> - <activation> - <property> - <name>updateSiteHeader</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>process-resources</defaultGoal> - <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>update-site-xml-header</id> - <goals> - <goal>update-header</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <compileSourceRoots>${basedir}/src/site</compileSourceRoots> - <generatorName>license-xml</generatorName> - <includes>**/*.xml</includes> - </configuration> - </execution> - <execution> - <id>update-site-apt-header</id> - <goals> - <goal>update-header</goal> - </goals> - <phase>process-resources</phase> - <configuration> - <compileSourceRoots>${basedir}/src/site</compileSourceRoots> - <generatorName>license-apt</generatorName> - <includes>**/*.apt</includes> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile--> - <!-- just add to build the webstart --> <profile> <id>webstart-profile</id> Modified: trunk/src/site/apt/profiles.apt =================================================================== --- trunk/src/site/apt/profiles.apt 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/src/site/apt/profiles.apt 2010-04-10 15:59:19 UTC (rev 863) @@ -65,14 +65,6 @@ *----------------------------------+------------------------------+ | {{update-license}} | <<updateLicense>> | *----------------------------------+------------------------------+ -| {{update-java-header}} | <<updateJavaHeader>> | -*----------------------------------+------------------------------+ -| {{update-properties-header}} | <<updatePropertiesHeader>> | -*----------------------------------+------------------------------+ -| {{update-jaxx-header}} | <<updateJaxxHeader>> | -*----------------------------------+------------------------------+ -| {{update-jaxx-css-header}} | <<updateJaxxCssHeader>> | -*----------------------------------+------------------------------+ | {{staging-site-profile}} | <<stagingSite>> | *----------------------------------+------------------------------+ | {{internal}} | <<internal>> | @@ -212,7 +204,8 @@ * {update-license} Ce profile permet la mise à jour des entêtes de tous les fichiers d'un - projet en utilisant le nouveau goal <update-license> (depuis maven-license-plugin 2.1). + projet en utilisant le nouveau goal <update-license> + (depuis maven-license-plugin 2.1). Il faut avoir définit un fichier @@ -234,66 +227,6 @@ mvn -DupdateLicense -------------------------------------------------------------------------------- -* {update-java-header} - - Ce profile permet la mise à jour des entêtes de tous les fichiers java d'un - projet. - --------------------------------------------------------------------------------- -mvn -Pupdate-java-header --------------------------------------------------------------------------------- - - ou - --------------------------------------------------------------------------------- -mvn -DupdateJavaHeader --------------------------------------------------------------------------------- - -* {update-properties-header} - - Ce profile permet la mise à jour des entêtes de tous les fichiers properties - d'un projet. - --------------------------------------------------------------------------------- -mvn -Pupdate-properties-header --------------------------------------------------------------------------------- - - or - --------------------------------------------------------------------------------- -mvn -DupdatePropertiesHeader --------------------------------------------------------------------------------- - -* {update-jaxx-header} - - Ce profile permet la mise à jour des entêtes de tous les fichiers JAXX d'un - projet. - --------------------------------------------------------------------------------- -mvn -Pupdate-jaxx-header --------------------------------------------------------------------------------- - - ou - --------------------------------------------------------------------------------- -mvn -DupdateJaxxHeader --------------------------------------------------------------------------------- - -* {update-jaxx-css-header} - - Ce profile permet la mise à jour des entêtes de tous les fichiers css JAXX - d'un projet. - --------------------------------------------------------------------------------- -mvn -Pupdate-jaxx-css-header --------------------------------------------------------------------------------- - - or - --------------------------------------------------------------------------------- -mvn -DupdateJaxxCssHeader --------------------------------------------------------------------------------- - * {staging-site-profile} Ce profile permet de deployer un site en local, pratique pour tester les Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/src/site/apt/properties.apt 2010-04-10 15:59:19 UTC (rev 863) @@ -51,8 +51,6 @@ *----------------------------------------------+--------------------------------------------------------+ | {{listId}} | <<${projectId}>> | *----------------------------------------------+--------------------------------------------------------+ -| {{license.licenseName}} | <<lgpl_v3>> | -*----------------------------------------------+--------------------------------------------------------+ | {{maven.compile.source}} | <<1.6>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.compile.target}} | <<1.6>> | @@ -143,13 +141,6 @@ L'url de dépôt maven de type release de Code Lutin. Cette propriété est utilisée dans les sites pour les liens de téléchargement. -* {license.licenseName} - - La license utilisée par le projet (par défaut <<lgpl_v3>>) - - <Note :> Pour connaitre les différentes licenses compatibles, voir - {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin}}. - * {maven.compile.source} Le niveau de java utilisé dans les sources (par défaut <<1.6>>) Modified: trunk/src/site/en/apt/profiles.apt =================================================================== --- trunk/src/site/en/apt/profiles.apt 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/src/site/en/apt/profiles.apt 2010-04-10 15:59:19 UTC (rev 863) @@ -66,14 +66,8 @@ *----------------------------------+---------------------------+ | {{run}} | <<->> | *----------------------------------+---------------------------+ -| {{update-java-header}} | <<updateJavaHeader>> | +| {{update-license}} | <<updateLicense>> | *----------------------------------+---------------------------+ -| {{update-properties-header}} | <<updatePropertiesHeader>>| -*----------------------------------+---------------------------+ -| {{update-jaxx-header}} | <<updateJaxxHeader>> | -*----------------------------------+---------------------------+ -| {{update-jaxx-css-header}} | <<updateJaxxCssHeader>> | -*----------------------------------+---------------------------+ | {{staging-site-profile}} | <<stagingSite>> | *----------------------------------+---------------------------+ | {{internal}} | <<UTF-8>> | @@ -229,62 +223,22 @@ mvn package -PdoLocalWebstart -------------------------------------------------------------------------------- -* {update-java-header} +* {update-license} - This profile update the license header on all java files in a project. + This profile update the license header on all files in a project using the new + license project descriptor introduced in + {{{http://maven-site.nuiton.org/maven-license-plugin}}maven-license-plugin 2.1}. -------------------------------------------------------------------------------- -mvn -Pupdate-java-header +mvn -Pupdate-license -------------------------------------------------------------------------------- or -------------------------------------------------------------------------------- -mvn -DupdateJavaHeader +mvn -DupdateLicense -------------------------------------------------------------------------------- -* {update-properties-header} - - This profile update the license header on all properties files in a project. - --------------------------------------------------------------------------------- -mvn -Pupdate-properties-header --------------------------------------------------------------------------------- - - or - --------------------------------------------------------------------------------- -mvn -DupdatePropertiesHeader --------------------------------------------------------------------------------- - -* {update-jaxx-header} - - This profile update the license header on all JAXX files in a project. - --------------------------------------------------------------------------------- -mvn -Pupdate-jaxx-header --------------------------------------------------------------------------------- - - or - --------------------------------------------------------------------------------- -mvn -DupdateJaxxHeader --------------------------------------------------------------------------------- - -* {update-jaxx-css-header} - - This profile update the license header on all JAXX css files in a project. - --------------------------------------------------------------------------------- -mvn -Pupdate-jaxx-css-header --------------------------------------------------------------------------------- - - or - --------------------------------------------------------------------------------- -mvn -DupdateJaxxCssHeader --------------------------------------------------------------------------------- - * {staging-site-profile} This profile allows you to deploy a site in a staging directory. Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2010-04-10 14:52:00 UTC (rev 862) +++ trunk/src/site/en/apt/properties.apt 2010-04-10 15:59:19 UTC (rev 863) @@ -50,8 +50,6 @@ *----------------------------------------------+--------------------------------------------------------+ | {{listId}} | <<${projectId}>> | *----------------------------------------------+--------------------------------------------------------+ -| {{license.licenseName}} | <<lgpl_v3>> | -*----------------------------------------------+--------------------------------------------------------+ | {{maven.compile.source}} | <<1.6>> | *----------------------------------------------+--------------------------------------------------------+ | {{maven.compile.target}} | <<1.6>> | @@ -137,13 +135,6 @@ The maven repository url -* {license.licenseName} - - The license to use (by default <<lgpl_v3>>) - - <Note :> To know all available licenses, see - {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}}. - * {maven.compile.source} The java's level of source files (by default <<1.6>>)