Author: tchemit Date: 2010-05-09 14:02:56 +0200 (Sun, 09 May 2010) New Revision: 895 Url: http://nuiton.org/repositories/revision/mavenpom/895 Log: - Evolution #588: Use maven-pmd-plugin 2.5 - Evolution #589: Use maven-javadoc-plugin 2.7 - Evolution #590: Use maven-helper-plugin 1.2.4 - Evolution #591: Use default plugin configuration instead of override them Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml trunk/src/site/apt/properties.apt trunk/src/site/en/apt/properties.apt Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2010-04-29 05:44:35 UTC (rev 894) +++ trunk/mavenpom4labs/pom.xml 2010-05-09 12:02:56 UTC (rev 895) @@ -126,6 +126,8 @@ <!-- disable scmwebeditor in generated site --> <scmwebeditorEnabled>false</scmwebeditorEnabled> + <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> + </properties> <packaging>pom</packaging> @@ -162,9 +164,9 @@ <groupId>org.codehaus.sonar-plugins</groupId> <artifactId>maven-report</artifactId> <version>0.1</version> - <configuration> + <!--configuration> <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> - </configuration> + </configuration--> </plugin> </plugins> </reporting> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2010-04-29 05:44:35 UTC (rev 894) +++ trunk/mavenpom4redmine/pom.xml 2010-05-09 12:02:56 UTC (rev 895) @@ -138,6 +138,8 @@ target/${project.artifactId}-${project.version}-full.zip </redmine.libReleaseFiles> + <sonar.host.url>http://hudson.nuiton.org/sonar</sonar.host.url> + </properties> <packaging>pom</packaging> @@ -178,9 +180,9 @@ <groupId>org.codehaus.sonar-plugins</groupId> <artifactId>maven-report</artifactId> <version>0.1</version> - <configuration> + <!--configuration> <sonar.host.url>http://hudson.${platform}/sonar</sonar.host.url> - </configuration> + </configuration--> </plugin> </plugins> </reporting> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-29 05:44:35 UTC (rev 894) +++ trunk/pom.xml 2010-05-09 12:02:56 UTC (rev 895) @@ -270,10 +270,6 @@ <!-- a property to define list id --> <listId>${projectId}</listId> - <!-- java level is 1.6 --> - <maven.compile.source>1.6</maven.compile.source> - <maven.compile.target>1.6</maven.compile.target> - <!-- default encoding --> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> @@ -287,65 +283,61 @@ <!-- where to generate test sources --> <maven.test.gen.dir>${project.build.directory}/generated-test-sources</maven.test.gen.dir> - <!-- locales for the site generation, by default only french --> - <!--<maven.site.locales>fr</maven.site.locales>--> - <siteLocales>fr</siteLocales> - - <!-- default documentation format (if not rst, change it)--> - <siteSourcesType>rst</siteSourcesType> - - <!-- scmwebeditor url --> - <scmwebeditorUrl>http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor</scmwebeditorUrl> - - <!-- enable or disable scmwebeditor in generated site --> - <scmwebeditorEnabled>true</scmwebeditorEnabled> - <!-- le fichier de license du projet --> <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> - <!-- to allow bad tests --> - <maven.test.testFailureIgnore>false</maven.test.testFailureIgnore> + <helper.version>1.2.4</helper.version> + <jredmine.version>1.1.3</jredmine.version> + <license.version>2.2</license.version> + <jrst.version>1.1.1</jrst.version> + <skin.version>1.0.3</skin.version> - <!-- to skip tests (can use also profile notests) --> - <maven.test.skip>false</maven.test.skip> + <javadoc.version>2.7</javadoc.version> - <!-- to control fork mode of tests --> - <maven.test.forkMode>once</maven.test.forkMode> + <maven.version>2.2.1</maven.version> - <!-- to activate generation of reports and javadoc when doing a site --> - <maven.reports.generate>true</maven.reports.generate> + <maven-plugin-tools-javadoc.version>2.5.1</maven-plugin-tools-javadoc.version> + <plexus-component-javadoc.version>1.3.0</plexus-component-javadoc.version> - <!-- to activate or not the generation of detail dependencies in site --> - <maven.reports.dependencyDetailsEnabled>true</maven.reports.dependencyDetailsEnabled> + <!-- release repository url (to be used in site.xml) --> + <repository.home.url>http://maven.nuiton.org/release</repository.home.url> - <!-- to activate or not the generation of location detail of dependencies in site --> - <maven.reports.dependencyLocationsEnabled>true</maven.reports.dependencyLocationsEnabled> + <!-- FIX #534 unmodifiable parameter when releasing --> + <helper.smtpHost>smtp</helper.smtpHost> - <!-- pb with 2.6 + doxia-jrst-module + maven-helper-plugin --> - <javadoc.version>2.5</javadoc.version> + <!-- compiler configuration --> - <!-- pour ne pas generer la javadoc --> - <maven.javadoc.skip>false</maven.javadoc.skip> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.showWarnings>true</maven.compiler.showWarnings> + <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation> + <!-- javadoc configuration --> + <!-- pour modifier la verbosite de la javadoc --> <maven.javadoc.quiet>true</maven.javadoc.quiet> - <maven.version>2.2.1</maven.version> + <!-- site configuration --> - <maven-plugin-tools-javadoc.version>2.5.1</maven-plugin-tools-javadoc.version> - <plexus-component-javadoc.version>1.3.0</plexus-component-javadoc.version> + <!-- locales for the site generation, by default only french --> + <locales>fr</locales> + <!--<siteLocales>fr</siteLocales>--> - <helper.version>1.2.3</helper.version> - <jredmine.version>1.1.3</jredmine.version> - <license.version>2.2</license.version> - <jrst.version>1.1.1</jrst.version> - <skin.version>1.0.3</skin.version> + <generateSitemap>true</generateSitemap> - <!-- release repository url (to be used in site.xml) --> - <repository.home.url>http://maven.nuiton.org/release</repository.home.url> + <!-- default documentation format (if not rst, change it)--> + <siteSourcesType>rst</siteSourcesType> - <!-- FIX #534 unmodifiable parameter when releasing --> - <helper.smtpHost>smtp</helper.smtpHost> + <!-- scmwebeditor url --> + <scmwebeditorUrl>http://scmwebeditor.nuiton.org/nuiton-scmwebeditor/scmwebeditor</scmwebeditorUrl> + + <!-- enable or disable scmwebeditor in generated site --> + <scmwebeditorEnabled>true</scmwebeditorEnabled> + + <!-- release configuration --> + + <autoVersionSubmodules>true</autoVersionSubmodules> + </properties> <packaging>pom</packaging> @@ -410,32 +402,16 @@ <plugin> <artifactId>maven-resources-plugin</artifactId> <version>2.4.1</version> - <configuration> - <encoding>${project.build.sourceEncoding}</encoding> - </configuration> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>2.3</version> - <configuration> - <source>${maven.compile.source}</source> - <target>${maven.compile.target}</target> - <encoding>${project.build.sourceEncoding}</encoding> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - </configuration> </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>2.5</version> - <configuration> - <skip>${maven.test.skip}</skip> - <testFailureIgnore>${maven.test.testFailureIgnore} - </testFailureIgnore> - <forkMode>${maven.test.forkMode}</forkMode> - </configuration> </plugin> <plugin> @@ -447,8 +423,7 @@ <artifactId>maven-war-plugin</artifactId> <version>2.1-beta-1</version> <configuration> - <warSourceDirectory>${maven.src.dir}/main/webapp - </warSourceDirectory> + <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> </configuration> </plugin> @@ -481,17 +456,10 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <docencoding>${project.reporting.outputEncoding} - </docencoding> - <encoding>${project.reporting.outputEncoding}</encoding> <charset>${project.reporting.outputEncoding}</charset> - <quiet>${maven.javadoc.quiet}</quiet> - <skip>${maven.javadoc.skip}</skip> <links> <link>http://java.sun.com/javase/6/docs/api/</link> </links> - <excludePackageNames>${maven.javadoc.excludePackageNames} - </excludePackageNames> <tagletArtifacts> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> @@ -503,11 +471,6 @@ <artifactId>plexus-component-javadoc</artifactId> <version>${plexus-component-javadoc.version}</version> </tagletArtifact> - <!--tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>${plexus-javadoc.version}</version> - </tagletArtifact--> </tagletArtifacts> </configuration> </plugin> @@ -515,13 +478,6 @@ <plugin> <artifactId>maven-site-plugin</artifactId> <version>2.1</version> - <configuration> - <inputEncoding>${project.reporting.outputEncoding}</inputEncoding> - <outputEncoding>${project.reporting.outputEncoding}</outputEncoding> - <generateReports>${maven.reports.generate}</generateReports> - <locales>${siteLocales}</locales> - <generateSitemap>true</generateSitemap> - </configuration> <dependencies> <dependency> <groupId>org.nuiton</groupId> @@ -534,13 +490,6 @@ <plugin> <artifactId>maven-release-plugin</artifactId> <version>2.0</version> - <configuration> - <!-- all modules follow the mavenpom version, don't ask it --> - <autoVersionSubmodules>true</autoVersionSubmodules> - <!-- TC-20100420 prefer use the performRelease activation properties --> - <!-- always sign with gpg artifacts in release repository + use --> - <!--<releaseProfiles>release-sign-artifacts</releaseProfiles>--> - </configuration> </plugin> <plugin> @@ -702,7 +651,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <maven.reports.generate>false</maven.reports.generate> + <generateReports>false</generateReports> </properties> </profile> @@ -713,7 +662,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <maven.reports.dependencyDetailsEnabled>false</maven.reports.dependencyDetailsEnabled> + <dependency.details.enabled>true</dependency.details.enabled> </properties> </profile> <!-- do not build locations of dependencies in maven-project-info-report (speedup site generation in dev) --> @@ -723,7 +672,7 @@ <activeByDefault>false</activeByDefault> </activation> <properties> - <maven.reports.dependencyLocationsEnabled>false</maven.reports.dependencyLocationsEnabled> + <dependency.locations.enabled>false</dependency.locations.enabled> </properties> </profile> @@ -828,6 +777,13 @@ </property> </activation> + + <properties> + + <!-- pmd config --> + <minimumTokens>100</minimumTokens> + <targetJdk>1.6</targetJdk> + </properties> <!--Site--> <reporting> <plugins> @@ -839,10 +795,6 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>2.1.2</version> - <configuration> - <dependencyDetailsEnabled>${maven.reports.dependencyDetailsEnabled}</dependencyDetailsEnabled> - <dependencyLocationsEnabled>${maven.reports.dependencyLocationsEnabled}</dependencyLocationsEnabled> - </configuration> <reportSets> <reportSet> <reports> @@ -867,16 +819,11 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> - <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> <links> <link>http://java.sun.com/javase/6/docs/api/</link> </links> - <excludePackageNames>${maven.javadoc.excludePackageNames} - </excludePackageNames> + <!--<excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames>--> <tagletArtifacts> <tagletArtifact> <groupId>org.apache.maven.plugin-tools</groupId> @@ -913,25 +860,9 @@ </configuration--> </plugin> - <!-- TC-20100412 Remove since 2.1 : can not simply share configuration --> - <!--plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> - <configuration> - <encoding>${project.reporting.outputEncoding}</encoding> - </configuration> - </plugin--> - <plugin> <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <linkXRef>true</linkXRef> - <!--<sourceEncoding>${project.reporting.outputEncoding}</sourceEncoding>--> - <minimumTokens>100</minimumTokens> - <targetJdk>${maven.compile.target}</targetJdk> - </configuration> - + <version>2.5</version> </plugin> <plugin> @@ -1241,9 +1172,16 @@ <properties> <projectId>mavenpom</projectId> - <siteLocales>fr,en</siteLocales> + <locales>fr,en</locales> <siteSourcesType>apt</siteSourcesType> + <!-- release config --> + + <!-- activate this profile while doing release:prepare --> + <arguments>-Dinternal</arguments> + <!-- activate this profile while doing release:perform --> + <releaseProfiles>internal,release-sign-artifacts</releaseProfiles> + <!-- must fail if redmine actions failed --> <redmine.safe>true</redmine.safe> @@ -1264,12 +1202,12 @@ <plugin> <artifactId>maven-release-plugin</artifactId> - <configuration> - <!-- activate this profile while doing release:prepare --> - <prepareVerifyArgs>-Dinternal</prepareVerifyArgs> - <!-- activate this profile while doing release:perform --> - <releaseProfiles>internal,release-sign-artifacts</releaseProfiles> - </configuration> + <!--<configuration>--> + <!--<!– activate this profile while doing release:prepare –>--> + <!--<prepareVerifyArgs>-Dinternal</prepareVerifyArgs>--> + <!--<!– activate this profile while doing release:perform –>--> + <!--<releaseProfiles>internal,release-sign-artifacts</releaseProfiles>--> + <!--</configuration>--> </plugin> </plugins> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2010-04-29 05:44:35 UTC (rev 894) +++ trunk/src/site/apt/properties.apt 2010-05-09 12:02:56 UTC (rev 895) @@ -46,22 +46,12 @@ *----------------------------------------------+--------------------------------------------------------+ | {{listId}} | <<${projectId}>> | *----------------------------------------------+--------------------------------------------------------+ -| {{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>> | *----------------------------------------------+--------------------------------------------------------+ -| {{siteLocales}} | <<fr>> | -*----------------------------------------------+--------------------------------------------------------+ | {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ | {{scmwebeditorEnabled}} | <<true>> | @@ -70,16 +60,6 @@ *----------------------------------------------+--------------------------------------------------------+ | {{maven.license.file}} | <<${project.basedir}/LICENSE.txt>> | *----------------------------------------------+--------------------------------------------------------+ -| {{maven.test.testFailureIgnore}} | <<false>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{maven.test.skip}} | <<false>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{maven.generate.reports}} | <<true>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{maven.reports.dependencyDetailsEnabled}} | <<true>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{maven.reports.dependencyLocationsEnabled}} | <<true>> | -*----------------------------------------------+--------------------------------------------------------+ | {{maven.version}} | <<2.1.1>> | *----------------------------------------------+--------------------------------------------------------+ | {{javadoc.version}} | <<2.5>> | @@ -176,10 +156,6 @@ ${project.basedir}/target/generate-test-sources -------------------------------------------------------------------------------- -* {siteLocales} - - Locales utilisées pour la génération des sites (par défaut <<fr>>) - * {siteSourcesType} Le type de fichiers utilisé pour écrire la documentation du site @@ -202,36 +178,6 @@ ${project.basedir}/LICENSE.txt -------------------------------------------------------------------------------- -* {maven.test.testFailureIgnore} - - Un drapeau pour continuer même si les tests ont échoués (par défault - <<false>>) - -* {maven.test.skip} - - Pour ne pas lancer les tests (par défaut <<false>> car c'est une très - mauvaise idée de ne pas exécuter les tests...). - -* {maven.reports.generate} - - Pour lancer (ou pas) la génération des rapport lors de la création du site - (par défaut <<true>>, i.e qu'on génère les rapports). - -* {maven.reports.dependencyDetailsEnabled} - - Pour générer ou non le détail des dépendances dans le rapport des dépendances - - <Note:> Cette opération peut-être longue, le profile permet en phase de - développement du site de générer plus rapidemment celui-ci. - -* {maven.reports.dependencyLocationsEnabled} - - Pour générer ou pas la localisation des dépendances sur les dépôts maven dans - le rapport des dépendances. - - <Note:> Cette opération peut-être longue, le profile permet en phase de - développement du site de générer plus rapidemment celui-ci. - * {maven.version} La version de l'api de maven utilisée (principalement dans les plugins maven) @@ -241,14 +187,6 @@ La version du plugin javadoc à utiliser : <<2.5>> -* {maven.javadoc.skip} - - Pour ne pas utiliser le plugin javadoc : <<false>> - -* {maven.javadoc.quiet} - - Pour ne pas voir les traces du plugin javadoc : <<true>> - * {helper.version} La version du plugin Modified: trunk/src/site/en/apt/properties.apt =================================================================== --- trunk/src/site/en/apt/properties.apt 2010-04-29 05:44:35 UTC (rev 894) +++ trunk/src/site/en/apt/properties.apt 2010-05-09 12:02:56 UTC (rev 895) @@ -45,22 +45,12 @@ *----------------------------------------------+--------------------------------------------------------+ | {{listId}} | <<${projectId}>> | *----------------------------------------------+--------------------------------------------------------+ -| {{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>> | *----------------------------------------------+--------------------------------------------------------+ -| {{siteLocales}} | <<fr>> | -*----------------------------------------------+--------------------------------------------------------+ | {{siteSourcesType}} | <<rst>> | *----------------------------------------------+--------------------------------------------------------+ | {{scmwebeditorEnabled}} | <<true>> | @@ -69,22 +59,10 @@ *----------------------------------------------+--------------------------------------------------------+ | {{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>> | *----------------------------------------------+--------------------------------------------------------+ | {{javadoc.version}} | <<2.5>> | *----------------------------------------------+--------------------------------------------------------+ -| {{maven.javadoc.skip}} | <<false>> | -*----------------------------------------------+--------------------------------------------------------+ -| {{maven.javadoc.quiet}} | <<true>> | -*----------------------------------------------+--------------------------------------------------------+ | {{helper.version}} | <<1.1.0>> | *----------------------------------------------+--------------------------------------------------------+ | {{jrst.version}} | <<1.0.0>> | @@ -170,10 +148,6 @@ ${project.basedir}/target/generate-test-sources -------------------------------------------------------------------------------- -* {siteLocales} - - Locales used in site generation (by default <<fr>>) - * {siteSourcesType} Type of files used to write the site documentation (<<apt>> ou <<rst>>) (by default <<rst>>) @@ -195,26 +169,6 @@ ${project.basedir}/LICENSE.txt -------------------------------------------------------------------------------- -* {maven.test.testFailureIgnore} - - To skip tests if they fail (by default <<false>>) - -* {maven.test.skip} - - To skip test (by default <<false>>) - -* {maven.reports.generate} - - To skip site reports generation (by default <<false>>) - -* {maven.reports.dependencyDetailsEnabled} - - To generate or not the detail of dependencies in depedencies report - -* {maven.reports.dependencyLocationsEnabled} - - To generate or not the location of dependencies in depedencies report - * {maven.version} The maven api version to use (in plugin mostly) @@ -223,14 +177,6 @@ The version of javadoc's plugin to use : <<2.5>> -* {maven.javadoc.skip} - - To skip the javadoc plugin : <<false>> - -* {maven.javadoc.quiet} - - To make plugin javadoc silent : <<true>> - * {helper.version} The {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}}