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 @@ <!-- to activate or not the generation of location detail of dependencies in site --> <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> - <!-- do not use 2.5 version, it is buggy (crazy aggregate mode !) --> - <javadoc.version>2.6</javadoc.version> + <!-- pb with 2.6 + doxia-jrst-module + maven-helper-plugin --> + <javadoc.version>2.5</javadoc.version> - <!-- pour ne pas generer la javadoc (quand on aura un javadoc 2.5) --> + <!-- pour ne pas generer la javadoc --> <maven.javadoc.skip>false</maven.javadoc.skip> + <!-- pour modifier la verbosite de la javadoc --> + <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> - <!-- uniquement a partir de javadoc 2.5 --> - <!--skip>${maven.javadoc.skip}</skip--> </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}}