October 2009 - Mavenpom-commits - mailman.cloud.codelutin.com

r663 - in trunk/src/site: apt en/apt
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 19:32:25 +0200 (Fri, 09 Oct 2009) New Revision: 663 Modified: trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Log: - add maven.javadoc.skip and maven.javadoc.quiet properties - use javadoc 2.5 instead of 2.6 (still some problems with the latest version...) Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2009-10-09 17:29:47 UTC (rev 662) +++ trunk/src/site/apt/index.apt 2009-10-09 17:32:25 UTC (rev 663) @@ -182,7 +182,7 @@ Pour ne pas utiliser le plugin javadoc : <<false>> -* {maven.javadoc.skip} +* {maven.javadoc.quiet} Pour ne pas voir les traces du plugin javadoc : <<true>> Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2009-10-09 17:29:47 UTC (rev 662) +++ trunk/src/site/en/apt/index.apt 2009-10-09 17:32:25 UTC (rev 663) @@ -179,7 +179,7 @@ To skip the javadoc plugin : <<false>> -* {maven.javadoc.skip} +* {maven.javadoc.quiet} To make plugin javadoc silent : <<true>>

1 0

r662 - in trunk: . src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 19:29:47 +0200 (Fri, 09 Oct 2009) New Revision: 662 Modified: trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/en/apt/index.apt Log: - add maven.javadoc.skip and maven.javadoc.quiet properties - use javadoc 2.5 instead of 2.6 (still some problems with the latest version...) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-09 14:10:16 UTC (rev 661) +++ trunk/pom.xml 2009-10-09 17:29:47 UTC (rev 662) @@ -229,12 +229,15 @@  <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> -  - <javadoc.version>2.6</javadoc.version> +  + <javadoc.version>2.5</javadoc.version> -  +  <maven.javadoc.skip>false</maven.javadoc.skip> +  + <maven.javadoc.quiet>true</maven.javadoc.quiet> + <maven.version>2.2.1</maven.version> <helper.version>1.0.3</helper.version> <jredmine.version>1.0.0-SNAPSHOT</jredmine.version> @@ -404,10 +407,9 @@ <docencoding>${project.reporting.outputEncoding}</docencoding> <encoding>${project.reporting.outputEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> - <quiet>true</quiet> + <quiet>${maven.javadoc.quiet}</quiet> + <skip>${maven.javadoc.skip}</skip> <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> -  -  </configuration> </plugin> @@ -581,10 +583,11 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <quiet>true</quiet> <docencoding>${project.build.sourceEncoding}</docencoding> <encoding>${project.build.sourceEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> + <quiet>${maven.javadoc.quiet}</quiet> + <skip>${maven.javadoc.skip}</skip> <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> </configuration> <reportSets> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2009-10-09 14:10:16 UTC (rev 661) +++ trunk/src/site/apt/index.apt 2009-10-09 17:29:47 UTC (rev 662) @@ -53,6 +53,12 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.version}} | <<2.1.1>> | *----------------------------------------------+--------------------------------------------------------+ +| {{javadoc.version}} | <<2.5>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.javadoc.skip}} | <<false>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.javadoc.quiet}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ | {{helper.version}} | <<1.0.3>> | *----------------------------------------------+--------------------------------------------------------+ | {{jrst.version}} | <<1.0.0>> | @@ -168,6 +174,18 @@ La version de l'api de maven utilisée (principalement dans les plugins maven) : <<2.2.1>> +* {javadoc.version} + + La version du plugin javadoc à utiliser : <<2.5>> + +* {maven.javadoc.skip} + + Pour ne pas utiliser le plugin javadoc : <<false>> + +* {maven.javadoc.skip} + + Pour ne pas voir les traces du plugin javadoc : <<true>> + * {helper.version} La version de {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}} utilisée Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2009-10-09 14:10:16 UTC (rev 661) +++ trunk/src/site/en/apt/index.apt 2009-10-09 17:29:47 UTC (rev 662) @@ -53,6 +53,12 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.version}} | <<2.1.1>> | *----------------------------------------------+--------------------------------------------------------+ +| {{javadoc.version}} | <<2.5>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.javadoc.skip}} | <<false>> | +*----------------------------------------------+--------------------------------------------------------+ +| {{maven.javadoc.quiet}} | <<true>> | +*----------------------------------------------+--------------------------------------------------------+ | {{helper.version}} | <<1.0.3>> | *----------------------------------------------+--------------------------------------------------------+ | {{jrst.version}} | <<1.0.0>> | @@ -165,6 +171,18 @@ The maven api version to use (in plugin mostly) +* {javadoc.version} + + The version of javadoc's plugin to use : <<2.5>> + +* {maven.javadoc.skip} + + To skip the javadoc plugin : <<false>> + +* {maven.javadoc.skip} + + To make plugin javadoc silent : <<true>> + * {helper.version} The {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}}

1 0

r661 - in trunk: . src/site/apt src/site/en/apt
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

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>  - <javadoc.version>2.4</javadoc.version> + <javadoc.version>2.6</javadoc.version>  <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> -  -  + <license.version>2.0.0-SNAPSHOT</license.version> <jrst.version>1.0.0</jrst.version>  @@ -344,6 +343,7 @@ </configuration> </plugin> +  <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>   - </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>  <prerequisites> - <maven>[2.0.10,)</maven> + <maven>[2.1.0,)</maven> </prerequisites>  @@ -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> -  +  <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> @@ -1224,65 +1221,6 @@ </properties> </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.

1 0

r660 - trunk
by tchemit＠users.nuiton.org 09 Oct '09

09 Oct '09

Author: tchemit Date: 2009-10-09 10:22:08 +0200 (Fri, 09 Oct 2009) New Revision: 660 Modified: trunk/pom.xml Log: bump maven-plugin-plugin version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-07 07:26:56 UTC (rev 659) +++ trunk/pom.xml 2009-10-09 08:22:08 UTC (rev 660) @@ -446,7 +446,7 @@ <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.5</version> + <version>2.5.1</version> </plugin> <plugin>

1 0

r659 - trunk
by tchemit＠users.nuiton.org 07 Oct '09

07 Oct '09

Author: tchemit Date: 2009-10-07 09:26:56 +0200 (Wed, 07 Oct 2009) New Revision: 659 Modified: trunk/pom.xml Log: bump resources plugin version Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-04 08:19:53 UTC (rev 658) +++ trunk/pom.xml 2009-10-07 07:26:56 UTC (rev 659) @@ -318,7 +318,7 @@ <plugin> <artifactId>maven-resources-plugin</artifactId> - <version>2.3</version> + <version>2.4.1</version> <configuration> <encoding>${project.build.sourceEncoding}</encoding> </configuration>

1 0

r658 - trunk
by tchemit＠users.nuiton.org 04 Oct '09

04 Oct '09

Author: tchemit Date: 2009-10-04 10:19:53 +0200 (Sun, 04 Oct 2009) New Revision: 658 Modified: trunk/pom.xml Log: fix redmine url Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-03 09:13:43 UTC (rev 657) +++ trunk/pom.xml 2009-10-04 08:19:53 UTC (rev 658) @@ -254,7 +254,7 @@ <redmine.projectId>${projectId}</redmine.projectId> <redmine.xmlPath>${maven.gen.dir}/changes/changes.xml</redmine.xmlPath> <redmine.issueLinkTemplate>${redmine.url}/issues/show/%ISSUE%</redmine.issueLinkTemplate> - <redmine.versionLinkTemplate>${redmine.url}/issues/show/%VERSION%</redmine.versionLinkTemplate> + <redmine.versionLinkTemplate>${redmine.url}/versions/show/%VERSION%</redmine.versionLinkTemplate> <redmine.collectedFiles>target/collect.properties</redmine.collectedFiles>

1 0

r657 - trunk
by tchemit＠users.nuiton.org 03 Oct '09

03 Oct '09

Author: tchemit Date: 2009-10-03 11:13:43 +0200 (Sat, 03 Oct 2009) New Revision: 657 Modified: trunk/pom.xml Log: Evolution #70: aider l'utilisation de webstart (am?\195?\169lioration des configurations de plugin) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-01 20:52:52 UTC (rev 656) +++ trunk/pom.xml 2009-10-03 09:13:43 UTC (rev 657) @@ -1051,32 +1051,21 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> <executions> <execution> - <id>get-jnlp-keystore</id> + <id>get-keystore</id> <goals> <goal>share-server-secret</goal> </goals> <phase>package</phase> <configuration> <serverId>codelutin-keystore</serverId> - <usernameOut>keystorepath</usernameOut> + <privateKeyOut>keystorepath</privateKeyOut> <passwordOut>keystorepass</passwordOut> - </configuration> - </execution> - <execution> - <id>get-jnlp-key</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore-nuiton-key</serverId> <usernameOut>keyalias</usernameOut> - <passwordOut>keypass</passwordOut> + <passphraseOut>keypass</passphraseOut> </configuration> - </execution> + </execution> </executions> </plugin> @@ -1116,30 +1105,19 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> <executions> <execution> - <id>get-jnlp-keystore</id> + <id>get-keystore</id> <goals> <goal>share-server-secret</goal> </goals> <phase>package</phase> <configuration> <serverId>codelutin-keystore</serverId> - <usernameOut>keystorepath</usernameOut> + <privateKeyOut>keystorepath</privateKeyOut> <passwordOut>keystorepass</passwordOut> - </configuration> - </execution> - <execution> - <id>get-jnlp-key</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore-nuiton-key</serverId> <usernameOut>keyalias</usernameOut> - <passwordOut>keypass</passwordOut> + <passphraseOut>keypass</passphraseOut> </configuration> </execution> </executions> @@ -1170,7 +1148,7 @@ <activeByDefault>false</activeByDefault> </activation> <build> - <defaultGoal>compile</defaultGoal> + <defaultGoal>package</defaultGoal> <plugins> <plugin> <artifactId>maven-enforcer-plugin</artifactId>

1 0

r656 - trunk
by tchemit＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: tchemit Date: 2009-10-01 22:52:52 +0200 (Thu, 01 Oct 2009) New Revision: 656 Modified: trunk/pom.xml Log: Evolution #70: aider l'utilisation de webstart (isolation des configurations de plugin) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-01 20:46:26 UTC (rev 655) +++ trunk/pom.xml 2009-10-01 20:52:52 UTC (rev 656) @@ -495,32 +495,6 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> - <executions> - <execution> - <id>get-jnlp-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <usernameOut>keystorepath</usernameOut> - <passwordOut>keystorepass</passwordOut> - </configuration> - </execution> - <execution> - <id>get-jnlp-key</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore-nuiton-key</serverId> - <usernameOut>keyalias</usernameOut> - <passwordOut>keypass</passwordOut> - </configuration> - </execution> - </executions> </plugin> <plugin> @@ -1077,12 +1051,31 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> <executions> <execution> <id>get-jnlp-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> + </configuration> </execution> <execution> <id>get-jnlp-key</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> </execution> </executions> </plugin> @@ -1123,12 +1116,31 @@ <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> <executions> <execution> <id>get-jnlp-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> + </configuration> </execution> <execution> <id>get-jnlp-key</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> </execution> </executions> </plugin>

1 0

r655 - trunk
by tchemit＠users.nuiton.org 01 Oct '09

01 Oct '09

Author: tchemit Date: 2009-10-01 22:46:26 +0200 (Thu, 01 Oct 2009) New Revision: 655 Modified: trunk/pom.xml Log: Evolution #70: aider l'utilisation de webstart Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-29 14:13:04 UTC (rev 654) +++ trunk/pom.xml 2009-10-01 20:46:26 UTC (rev 655) @@ -495,6 +495,32 @@ <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helper.version}</version> + <executions> + <execution> + <id>get-jnlp-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <usernameOut>keystorepath</usernameOut> + <passwordOut>keystorepass</passwordOut> + </configuration> + </execution> + <execution> + <id>get-jnlp-key</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore-nuiton-key</serverId> + <usernameOut>keyalias</usernameOut> + <passwordOut>keypass</passwordOut> + </configuration> + </execution> + </executions> </plugin> <plugin> @@ -521,6 +547,57 @@ <version>${license.version}</version> </plugin--> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + <configuration> + + <libPath>lib</libPath> + <makeArchive>false</makeArchive> + <verbose>false</verbose> + + <jnlp> + <mainClass>${maven.jar.main.class}</mainClass> + <allPermissions>true</allPermissions> + <offlineAllowed>true</offlineAllowed> + </jnlp> + +  +  + + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keyalias}</alias> + <keypass>${keypass}</keypass> + <verify>true</verify> + <keystoreConfig> + <delete>false</delete> + <gen>false</gen> + </keystoreConfig> + </sign> + + </configuration> + </plugin> + </plugins> </pluginManagement> @@ -985,6 +1062,95 @@ </build> </profile> +  + <profile> + <id>webstart-profile</id> + <activation> + <property> + <name>doWebstart</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-jnlp-keystore</id> + </execution> + <execution> + <id>get-jnlp-key</id> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + +  + <profile> + <id>local-webstart-profile</id> + <activation> + <property> + <name>doLocalWebstart</name> + <value>true</value> + </property> + </activation> + <properties> + <jnlp.codebase>file://${project.build.directory}/jnlp</jnlp.codebase> + </properties> + <build> + <plugins> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-jnlp-keystore</id> + </execution> + <execution> + <id>get-jnlp-key</id> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp-local</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> +  <profile> <id>run</id>

1 0