Author: tchemit Date: 2009-10-09 16:10:16 +0200 (Fri, 09 Oct 2009) New Revision: 661 Modified: trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Log: - use helper 1.0.3 - avoid execution in pluginManagement - continue doc Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 08:22:08 UTC (rev 660) +++ trunk/pom.xml 2009-10-09 14:10:16 UTC (rev 661) @@ -230,16 +230,15 @@ <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> <!-- do not use 2.5 version, it is buggy (crazy aggregate mode !) --> - <javadoc.version>2.4</javadoc.version> + <javadoc.version>2.6</javadoc.version> <!-- pour ne pas generer la javadoc (quand on aura un javadoc 2.5) --> <maven.javadoc.skip>false</maven.javadoc.skip> <maven.version>2.2.1</maven.version> - <helper.version>1.1.0-SNAPSHOT</helper.version> + <helper.version>1.0.3</helper.version> <jredmine.version>1.0.0-SNAPSHOT</jredmine.version> - <!-- will be used in version 1.1.0 --> - <!--<license.version>2.0.0-SNAPSHOT</license.version>--> + <license.version>2.0.0-SNAPSHOT</license.version> <jrst.version>1.0.0</jrst.version> <!-- default license to use --> @@ -344,6 +343,7 @@ </configuration> </plugin> + <!-- TODO remove the execution from pluginManagment --> <plugin> <artifactId>maven-dependency-plugin</artifactId> <version>2.1</version> @@ -394,16 +394,7 @@ <plugin> <artifactId>maven-source-plugin</artifactId> - <version>2.1</version> - <inherited>true</inherited> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + <version>2.1</version> </plugin> <plugin> @@ -417,15 +408,7 @@ <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> <!-- uniquement a partir de javadoc 2.5 --> <!--skip>${maven.javadoc.skip}</skip--> - </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> + </configuration> </plugin> <plugin> @@ -604,6 +587,14 @@ <charset>${project.reporting.outputEncoding}</charset> <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> </plugin> <!-- changelog:changelog @@ -758,7 +749,7 @@ <!-- prerequisites --> <prerequisites> - <maven>[2.0.10,)</maven> + <maven>[2.1.0,)</maven> </prerequisites> <!--Distribution--> @@ -876,6 +867,9 @@ <executions> <execution> <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> </execution> </executions> </plugin> @@ -886,11 +880,14 @@ <executions> <execution> <id>attach-javadocs</id> + <goals> + <goal>jar</goal> + </goals> </execution> </executions> </plugin> - <!-- always add license and third-party files to classpath --> + <!-- TO REMOVE when using maven-helper-plugin 1.1.0 --> <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> @@ -1224,65 +1221,6 @@ </properties> </profile> - <!-- - a profile for maven-plugin projects (will add plugin-plugin invocation and reports) - - TODO : make this works ? - - To include this profile, use the follow code : - - <profiles> - <profile> - <id>plugin-profile</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - </profile> - </profiles> - --> - <!--profile> - <id>plugin-profile</id> - <build> - - <plugins> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - <pluginManagement> - <plugins> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>2.5</version> - </plugin> - - </plugins> - </pluginManagement> - - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> - </plugins> - </reporting> - - </profile--> - </profiles> </project> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2009-10-09 08:22:08 UTC (rev 660) +++ trunk/src/site/apt/index.apt 2009-10-09 14:10:16 UTC (rev 661) @@ -7,107 +7,181 @@ Présentation - Super pom de tous les projets {{{http://www.nuiton.org}nuiton}} et + Corporate pom de tous les projets {{{http://www.nuiton.org}nuiton}} et {{{http://www.chorem.org}chorem}}. Les propriétés définies -* platform + Voici la liste des propriétés disponibles et leur valeur par défaut. - La palteforme redmine utilisée : <<nuiton.org>> ou <<chorem.org>> +*----------------------------------------------+--------------------------------------------------------+ +| <<propriété>> | <<Valeur par défaut>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{platform}} | <<nuiton.org>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{projectId}} | <<${project.artifactId}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{listId}} | <<${projectId}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{license.licenseName}} | <<lgpl_v3>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.compile.source}} | <<1.6>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.compile.target}} | <<1.6>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.compile.encoding}} | <<UTF-8>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{project.reporting.outputEncoding}} | <<UTF-8>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.src.dir}} | <<${project.basedir}/src>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.gen.dir}} | <<${project.build.directory}/generated-sources>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.test.gen.dir}} | <<${\project.build.directory}/test-generated-sources>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.site.locales}} | <<fr>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.test.testFailureIgnore}} | <<false>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.test.skip}} | <<false>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.reports.dependencyDetailsEnabled}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.reports.dependencyLocationsEnabled}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.version}} | <<2.1.1>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{helper.version}} | <<1.0.3>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{jrst.version}} | <<1.0.0>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{jredmine.version}} | <<1.0.0>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{license.version}} | <<2.0.0-SNAPSHOT>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.url}} | <<http://www.${platform}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.serverId}} | <<redmine-${platform}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.projectId}} | <<${projectId}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.xmlPath}} | <<${maven.gen.dir}/changes/changes.xml>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.issueLinkTemplate}} | <<${redmine.url}/issues/show/%ISSUE%>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.versionLinkTemplate}} | <<${redmine.url}/versions/show/%VERSION%>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.collectedFiles}} | <<target/collect.properties>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.releaseFiles}} | - | +*----------------------------------------------+--------------------------------------------------------+ -* projectId +* {platform} + La plateforme redmine utilisée : <<nuiton.org>> ou <<chorem.org>> + +* {projectId} + L'identifiant du projet redmine associé (par défaut <<project.artifactId>>) <Note :> Sur un multi-module, la propriété doit être surchargé, sinon on se retrouve avec des valeurs héritiés sur les modules fils, ce qui n'est pas correct. -* listId +* {listId} Le préfixe utilisé pour les listes de diffusion. (par défaut <<projectId>>). -* repository.home.url +* {repository.home.url} L'url de dépôt maven de nuiton -* license.licenseName +* {license.licenseName} La license utilisée par le projet (par défaut <<lgpl_v3>>) <Note :> Pour connaitre les différentes licenses compatible, voir - {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}}. + {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin}}. -* maven.compile.source +* {maven.compile.source} Le niveau de java utilisé dans les sources (par défaut <<1.6>>) -* maven.compile.target +* {maven.compile.target} Le niveau de java utilisé dans le code compilé (par défaut <<1.6>>) -* maven.compile.encoding +* {maven.compile.encoding} Encoding à utiliser dans les sources (par défaut <<UTF-8>>) -* project.reporting.outputEncoding +* {project.reporting.outputEncoding} Encoding à utiliser dans le site (par défaut <<UTF-8>>) -* maven.src.dir +* {maven.src.dir} Répertoire des sources (par défaut <<${project.basedir}/src>>) -* maven.gen.dir +* {maven.gen.dir} Répertoire de génération (par défaut <<${project.basedir}/target/generated-sources>>) -* maven.test.gen.dir +* {maven.test.gen.dir} Répertoire de génération de tests (par défaut <<${project.basedir}/generate-test-sources>>) -* maven.site.locales +* {maven.site.locales} Locales utilisées pour la génération des sites (par défaut <<fr>>) -* maven.license.file +* {maven.license.file} Chemin vers la license utilisée dans le projet (par défaut <<${project.basedir}/LICENSE.txt>>) -* maven.test.testFailureIgnore +* {maven.test.testFailureIgnore} Un drapeau pour continuer même si les tests ont échoués (par défault <<false>>) -* maven.test.skip +* {maven.test.skip} Pour ne pas lancer les tests (par défaut <<false>>) -* maven.reports.generate +* {maven.reports.generate} Pour ne pas lancer la génération des rapport lors de la création du site (par défaut <<false>>) -* maven.reports.dependencyDetailsEnabled +* {maven.reports.dependencyDetailsEnabled} Pour générer ou non le détail des dépendances dans le rapport des dépendances -* maven.reports.dependencyLocationsEnabled +* {maven.reports.dependencyLocationsEnabled} Pour générer ou pas la location des dépendances sur les dépôts maven dans le rapport des dépendances. -* maven.version +* {maven.version} La version de l'api de maven utilisée (principalement dans les plugins maven) : <<2.2.1>> -* helper.version +* {helper.version} La version de {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}} utilisée -* jrst.version +* {jredmine.version} + La version de {{{http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin}maven-jredmine-plugin}} utilisée + +* {license.version} + + La version de {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin}} utilisée + +* {jrst.version} + La version de {{{http://maven-site.nuiton.org/jrst}jrst}} utilisée lors de la génération du site si on utilise jrst. @@ -115,6 +189,40 @@ construire <<jrst>> lui-même afin de ne pas avoir de ne pas introduire de dépendances cycliques. + +* {redmine.url} + + <<http://www.${platform}>> + +* {redmine.serverId} + + <<redmine-${platform}>> + +* {redmine.projectId} + + <<${projectId}>> + +* {redmine.xmlPath} + + <<${maven.gen.dir}/changes/changes.xml>> + +* {redmine.issueLinkTemplate} + + <<${redmine.url}/issues/show/%ISSUE%>> + +* {redmine.versionLinkTemplate} + + <<${redmine.url}/versions/show/%VERSION%>> + +* {redmine.collectedFiles} + + <<target/collect.properties>> + +* {redmine.releaseFiles} + + None. + + Vérification de conformité On effectue sur le pom des contrôles de conformités via Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2009-10-09 08:22:08 UTC (rev 660) +++ trunk/src/site/en/apt/index.apt 2009-10-09 14:10:16 UTC (rev 661) @@ -7,104 +7,170 @@ Abstract - Parent pom of all {{{http://www.nuiton.org}nuiton}} and + Corporate pom of all {{{http://www.nuiton.org}nuiton}} and {{{http://www.chorem.org}chorem}} projects. Defined properties -* platform + Here is the full list of availables properties with their default value. +*----------------------------------------------+--------------------------------------------------------+ +| <<property>> | <<Default- value>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{platform}} | <<nuiton.org>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{projectId}} | <<${project.artifactId}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{listId}} | <<${projectId}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{license.licenseName}} | <<lgpl_v3>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.compile.source}} | <<1.6>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.compile.target}} | <<1.6>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.compile.encoding}} | <<UTF-8>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{project.reporting.outputEncoding}} | <<UTF-8>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.src.dir}} | <<${project.basedir}/src>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.gen.dir}} | <<${project.build.directory}/generated-sources>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.test.gen.dir}} | <<${\project.build.directory}/test-generated-sources>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.site.locales}} | <<fr>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.test.testFailureIgnore}} | <<false>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.test.skip}} | <<false>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.reports.dependencyDetailsEnabled}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.reports.dependencyLocationsEnabled}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.version}} | <<2.1.1>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{helper.version}} | <<1.0.3>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{jrst.version}} | <<1.0.0>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{jredmine.version}} | <<1.0.0>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{license.version}} | <<2.0.0-SNAPSHOT>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.url}} | <<http://www.${platform}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.serverId}} | <<redmine-${platform}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.projectId}} | <<${projectId}>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.xmlPath}} | <<${maven.gen.dir}/changes/changes.xml>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.issueLinkTemplate}} | <<${redmine.url}/issues/show/%ISSUE%>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.versionLinkTemplate}} | <<${redmine.url}/versions/show/%VERSION%>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.collectedFiles}} | <<target/collect.properties>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{redmine.releaseFiles}} | - | +*----------------------------------------------+--------------------------------------------------------+ + +* {platform} + Redmine's platform <<nuiton.org>> or <<chorem.org>> -* projectId +* {projectId} The redmine project's id (by default <<project.artifactId>>) <Note :> On a multi-module, must be overriden, otherwise there is some problem with inheritance. -* listId +* {listId} The prefix of all lists (by default <<projectId>>) -* repository.home.url +* {repository.home.url} The maven repository url -* license.licenseName +* {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 +* {maven.compile.source} The java's level of source files (by default <<1.6>>) -* maven.compile.target +* {maven.compile.target} The java's level of compiled files (by default <<1.6>>) -* maven.compile.encoding +* {maven.compile.encoding} Encoding to use in sources (by default <<UTF-8>>) -* project.reporting.outputEncoding +* {project.reporting.outputEncoding} Encoding to use for site generation (by default <<UTF-8>>) -* maven.src.dir +* {maven.src.dir} Sources directory (by default <<${project.basedir}/src>>) -* maven.gen.dir +* {maven.gen.dir} Generation directory (by default <<${project.basedir}/target/generated-sources>>) -* maven.test.gen.dir +* {maven.test.gen.dir} Where to generate stuff for tests (by default <<${project.basedir}/target/generate-test-sources>>) -* maven.site.locales +* {maven.site.locales} Locales used in site generation (by default <<fr>>) -* maven.license.file +* {maven.license.file} Path to license file (by default <<${project.basedir}/LICENSE.txt>>) -* maven.test.testFailureIgnore +* {maven.test.testFailureIgnore} To skip tests if they fail (by default <<false>>) -* maven.test.skip +* {maven.test.skip} To skip test (by default <<false>>) -* maven.reports.generate +* {maven.reports.generate} To skip site reports generation (by default <<false>>) -* maven.reports.dependencyDetailsEnabled +* {maven.reports.dependencyDetailsEnabled} To generate or not the detail of dependencies in depedencies report -* maven.reports.dependencyLocationsEnabled +* {maven.reports.dependencyLocationsEnabled} To generate or not the location of dependencies in depedencies report -* maven.version +* {maven.version} The maven api version to use (in plugin mostly) -* helper.version +* {helper.version} The {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}} version to use. -* jrst.version +* {jrst.version} The {{{http://maven-site.nuiton.org/jrst}jrst}} version to use. @@ -112,6 +178,51 @@ himself, otherwise, you will introduce some cyclic dependencies, and we do not want that... + +* {jredmine.version} + + The version of {{{http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin}maven-jredmine-plugin}} used + +* {license.version} + + The version of {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin}} used + +* {jrst.version} + + The version of {{{http://maven-site.nuiton.org/jrst}jrst}} to used in your project. + +* {redmine.url} + + <<http://www.${platform}>> + +* {redmine.serverId} + + <<redmine-${platform}>> + +* {redmine.projectId} + + <<${projectId}>> + +* {redmine.xmlPath} + + <<${maven.gen.dir}/changes/changes.xml>> + +* {redmine.issueLinkTemplate} + + <<${redmine.url}/issues/show/%ISSUE%>> + +* {redmine.versionLinkTemplate} + + <<${redmine.url}/versions/show/%VERSION%>> + +* {redmine.collectedFiles} + + <<target/collect.properties>> + +* {redmine.releaseFiles} + + None. + Conformity checks Some conformity checks are done to make sure we have all necessary files.