Author: tchemit Date: 2011-02-16 18:12:35 +0100 (Wed, 16 Feb 2011) New Revision: 1064 Url: http://nuiton.org/repositories/revision/mavenpom/1064 Log: Evolution #1338: Add stats-scm plugin definition (version 1.2.0) Update documentation Modified: trunk/pom.xml trunk/src/site/apt/properties.apt Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-16 16:03:57 UTC (rev 1063) +++ trunk/pom.xml 2011-02-16 17:12:35 UTC (rev 1064) @@ -214,50 +214,60 @@ <!-- le fichier de license du projet --> <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file> + <mavenVersion>2.2.1</mavenVersion> + <antVersion>1.8.2</antVersion> + + <!-- our plugins (+ skin) version --> <helperPluginVersion>1.2.11</helperPluginVersion> <jredminePluginVersion>1.1.4</jredminePluginVersion> + <jrstPluginVersion>1.2</jrstPluginVersion> <licensePluginVersion>3.0</licensePluginVersion> - <jrstPluginVersion>1.2</jrstPluginVersion> <nuitonSkinVersion>1.0.4</nuitonSkinVersion> + <webstartPluginVersion>1.0-alpha-2-cl_20100511</webstartPluginVersion> - <!-- maven plugins version --> + <!-- apache maven plugins version --> + <antRunPluginVersion>1.6</antRunPluginVersion> + <assemblyPluginVersion>2.2</assemblyPluginVersion> <cleanPluginVersion>2.4.1</cleanPluginVersion> - <enforcerPluginVersion>1.0</enforcerPluginVersion> - <resourcesPluginVersion>2.4.3</resourcesPluginVersion> <compilerPluginVersion>2.3.2</compilerPluginVersion> - <surefirePluginVersion>2.7.2</surefirePluginVersion> - <jarPluginVersion>2.3.1</jarPluginVersion> - <warPluginVersion>2.1.1</warPluginVersion> + <dependencyPluginVersion>2.1</dependencyPluginVersion> + <deployPluginVersion>2.5</deployPluginVersion> <earPluginVersion>2.5</earPluginVersion> <ejbPluginVersion>2.3</ejbPluginVersion> + <enforcerPluginVersion>1.0</enforcerPluginVersion> + <gpgPluginVersion>1.1</gpgPluginVersion> <installPluginVersion>2.3.1</installPluginVersion> - <deployPluginVersion>2.5</deployPluginVersion> - <sourcePluginVersion>2.1.2</sourcePluginVersion> + <invokerPluginVersion>1.5</invokerPluginVersion> + <jarPluginVersion>2.3.1</jarPluginVersion> <javadocPluginVersion>2.7</javadocPluginVersion> - <webstartPluginVersion>1.0-alpha-2-cl_20100511</webstartPluginVersion> - <assemblyPluginVersion>2.2</assemblyPluginVersion> <pluginPluginVersion>2.7</pluginPluginVersion> + <pmdPluginVersion>2.5</pmdPluginVersion> <releasePluginVersion>2.1</releasePluginVersion> - <dependencyPluginVersion>2.1</dependencyPluginVersion> - <antRunPluginVersion>1.6</antRunPluginVersion> - <gpgPluginVersion>1.1</gpgPluginVersion> - <invokerPluginVersion>1.5</invokerPluginVersion> - <pmdPluginVersion>2.5</pmdPluginVersion> - <findbugsPluginVersion>2.3.1</findbugsPluginVersion> + <resourcesPluginVersion>2.4.3</resourcesPluginVersion> + <site2PluginVersion>2.1.1</site2PluginVersion> + <site3PluginVersion>3.0-beta-3</site3PluginVersion> + <sourcePluginVersion>2.1.2</sourcePluginVersion> + <surefirePluginVersion>2.7.2</surefirePluginVersion> + <warPluginVersion>2.1.1</warPluginVersion> + <!-- codehaud mojo plugins --> + <coberturaPluginVersion>2.4</coberturaPluginVersion> <execPluginVersion>1.2</execPluginVersion> - <plexusComponentMetadataPluginVersion>1.5.5</plexusComponentMetadataPluginVersion> - <jettyPluginVersion>6.1.26</jettyPluginVersion> + <findbugsPluginVersion>2.3.1</findbugsPluginVersion> + <gwtPluginVersion>2.1.0-1</gwtPluginVersion> <tomcatPluginVersion>1.1</tomcatPluginVersion> - <coberturaPluginVersion>2.4</coberturaPluginVersion> + + <!-- codehaus plexus plugins --> <plexusPluginVersion>1.3.8</plexusPluginVersion> - <gwtPluginVersion>2.1.0-1</gwtPluginVersion> + <plexusComponentMetadataPluginVersion>1.5.5</plexusComponentMetadataPluginVersion> + + <!-- others plugins --> + <androidPluginVersion>2.8.4</androidPluginVersion> + <jettyPluginVersion>6.1.26</jettyPluginVersion> + <statScmPluginVersion>1.2.0</statScmPluginVersion> - <site2PluginVersion>2.1.1</site2PluginVersion> - <site3PluginVersion>3.0-beta-3</site3PluginVersion> - <!-- report plugins version --> <changesPluginVersion>2.4</changesPluginVersion> <projectInfoReportsPluginVersion>2.3.1</projectInfoReportsPluginVersion> @@ -265,10 +275,6 @@ <jrxPluginVersion>2.2</jrxPluginVersion> <sonarReportPluginVersion>0.1</sonarReportPluginVersion> - - <mavenVersion>2.2.1</mavenVersion> - <antVersion>1.8.2</antVersion> - <!-- common libs used in projects --> <commonsBeanutilsVersions>1.8.3</commonsBeanutilsVersions> <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> @@ -475,62 +481,77 @@ <plugins> + <!-- Plugins version from apache --> + <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <version>${enforcerPluginVersion}</version> + <artifactId>maven-antrun-plugin</artifactId> + <version>${antRunPluginVersion}</version> </plugin> <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>${resourcesPluginVersion}</version> - <!-- WORKAROUND for : http://jira.codehaus.org/browse/MRESOURCES-104 --> - <configuration> - <delimiters> - <delimiter>${*}</delimiter> - </delimiters> - <useDefaultDelimiters>false</useDefaultDelimiters> - </configuration> + <artifactId>maven-assembly-plugin</artifactId> + <version>${assemblyPluginVersion}</version> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helperPluginVersion}</version> + </dependency> + </dependencies> </plugin> <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>${cleanPluginVersion}</version> + </plugin> + + <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>${compilerPluginVersion}</version> </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${dependencyPluginVersion}</version> + </plugin> + + <plugin> <artifactId>maven-deploy-plugin</artifactId> <version>${deployPluginVersion}</version> </plugin> <plugin> - <artifactId>maven-install-plugin</artifactId> - <version>${installPluginVersion}</version> + <artifactId>maven-ear-plugin</artifactId> + <version>${earPluginVersion}</version> </plugin> <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>${surefirePluginVersion}</version> - <configuration> - <systemPropertyVariables> - <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> - </systemPropertyVariables> - </configuration> + <artifactId>maven-ejb-plugin</artifactId> + <version>${ejbPluginVersion}</version> </plugin> + + <plugin> + <artifactId>maven-enforcer-plugin</artifactId> + <version>${enforcerPluginVersion}</version> + </plugin> <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <version>${dependencyPluginVersion}</version> + <artifactId>maven-gpg-plugin</artifactId> + <version>${gpgPluginVersion}</version> </plugin> <plugin> - <artifactId>maven-war-plugin</artifactId> - <version>${warPluginVersion}</version> - <configuration> - <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> - </configuration> + <artifactId>maven-install-plugin</artifactId> + <version>${installPluginVersion}</version> </plugin> <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <version>${invokerPluginVersion}</version> + </plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <version>${jarPluginVersion}</version> <inherited>true</inherited> @@ -551,16 +572,6 @@ </plugin> <plugin> - <artifactId>maven-ear-plugin</artifactId> - <version>${earPluginVersion}</version> - </plugin> - - <plugin> - <artifactId>maven-source-plugin</artifactId> - <version>${sourcePluginVersion}</version> - </plugin> - - <plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadocPluginVersion}</version> <configuration> @@ -584,117 +595,81 @@ </tagletArtifacts> </configuration> </plugin> - + <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>${site2PluginVersion}</version> - <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-nuiton-skin</artifactId> - <version>${nuitonSkinVersion}</version> - </dependency> - </dependencies> + <artifactId>maven-plugin-plugin</artifactId> + <version>${pluginPluginVersion}</version> </plugin> <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <version>${pmdPluginVersion}</version> + </plugin> + + <plugin> <artifactId>maven-release-plugin</artifactId> <version>${releasePluginVersion}</version> </plugin> <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>${pluginPluginVersion}</version> + <artifactId>maven-resources-plugin</artifactId> + <version>${resourcesPluginVersion}</version> + <!-- WORKAROUND for : http://jira.codehaus.org/browse/MRESOURCES-104 --> + <configuration> + <delimiters> + <delimiter>${*}</delimiter> + </delimiters> + <useDefaultDelimiters>false</useDefaultDelimiters> + </configuration> </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>${assemblyPluginVersion}</version> + <artifactId>maven-site-plugin</artifactId> + <version>${site2PluginVersion}</version> <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helperPluginVersion}</version> + <artifactId>maven-nuiton-skin</artifactId> + <version>${nuitonSkinVersion}</version> </dependency> </dependencies> </plugin> - - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <version>${antRunPluginVersion}</version> - </plugin> - - <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>${cleanPluginVersion}</version> - </plugin> - - <plugin> - <artifactId>maven-gpg-plugin</artifactId> - <version>${gpgPluginVersion}</version> - </plugin> <plugin> - <artifactId>maven-ejb-plugin</artifactId> - <version>${ejbPluginVersion}</version> + <artifactId>maven-source-plugin</artifactId> + <version>${sourcePluginVersion}</version> </plugin> <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>${pmdPluginVersion}</version> + <artifactId>maven-surefire-plugin</artifactId> + <version>${surefirePluginVersion}</version> + <configuration> + <systemPropertyVariables> + <java.io.tmpdir>${project.build.directory}/surefire-workdir</java.io.tmpdir> + </systemPropertyVariables> + </configuration> </plugin> <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>${webstartPluginVersion}</version> + <artifactId>maven-war-plugin</artifactId> + <version>${warPluginVersion}</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> - + <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory> </configuration> </plugin> + + <!-- Plugins version from codehaus mojo --> <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <version>${invokerPluginVersion}</version> - </plugin> - - <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>${execPluginVersion}</version> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>${coberturaPluginVersion}</version> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>tomcat-maven-plugin</artifactId> - <version>${tomcatPluginVersion}</version> + <artifactId>exec-maven-plugin</artifactId> + <version>${execPluginVersion}</version> </plugin> <plugin> @@ -710,6 +685,14 @@ </plugin> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>tomcat-maven-plugin</artifactId> + <version>${tomcatPluginVersion}</version> + </plugin> + + <!-- Plugins version from codehaus plexus --> + + <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-component-metadata</artifactId> <version>${plexusComponentMetadataPluginVersion}</version> @@ -721,19 +704,9 @@ <version>${plexusPluginVersion}</version> </plugin> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>${jettyPluginVersion}</version> - </plugin> - - <plugin> - <groupId>com.jayway.maven.plugins.android.generation2</groupId> - <artifactId>maven-android-plugin</artifactId> - <version>${androidPluginVersion}</version> - </plugin> + <!-- Plugins version from nuiton --> - <plugin> + <plugin> <groupId>org.nuiton</groupId> <artifactId>maven-helper-plugin</artifactId> <version>${helperPluginVersion}</version> @@ -751,6 +724,56 @@ <version>${licensePluginVersion}</version> </plugin> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>${webstartPluginVersion}</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 version from others --> + + <plugin> + <groupId>com.jayway.maven.plugins.android.generation2</groupId> + <artifactId>maven-android-plugin</artifactId> + <version>${androidPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> + <version>${jettyPluginVersion}</version> + </plugin> + + <plugin> + <groupId>net.sf</groupId> + <artifactId>stat-scm</artifactId> + <version>${statScmPluginVersion}</version> + </plugin> + </plugins> </pluginManagement> @@ -1072,6 +1095,12 @@ <version>${surefirePluginVersion}</version> </plugin> + <!--plugin> + <groupId>net.sf</groupId> + <artifactId>stat-scm</artifactId> + <version>${statScmPluginVersion}</version> + </plugin--> + </plugins> </reporting> Modified: trunk/src/site/apt/properties.apt =================================================================== --- trunk/src/site/apt/properties.apt 2011-02-16 16:03:57 UTC (rev 1063) +++ trunk/src/site/apt/properties.apt 2011-02-16 17:12:35 UTC (rev 1064) @@ -68,43 +68,54 @@ *--------------------------------------+--------------------------------------+ | {{mavenVersion}} | <<2.1.1>> | *--------------------------------------+--------------------------------------+ -| {{antVersion}} | <<1.8.0>> | +| {{antVersion}} | <<1.8.2>> | *--------------------------------------+--------------------------------------+ | {{nuitonSkinVersion}} | <<1.0.4>> | *--------------------------------------+--------------------------------------+ -| {{helperPluginVersion}} | <<1.2.10>> | -*--------------------------------------+--------------------------------------+ -| {{jrstPluginVersion}} | <<1.1.1>> | -*--------------------------------------+--------------------------------------+ -| {{jredminePluginVersion}} | <<1.1.4>> | -*--------------------------------------+--------------------------------------+ -| {{licensePluginVersion}} | <<2.4.1>> | -*--------------------------------------+--------------------------------------+ -| {{javadocPluginVersion}} | <<2.7>> | -*--------------------------------------+--------------------------------------+ -| {{webstartPluginVersion}} | <<1.0-alpha-2-cl_20100511>> | -*--------------------------------------+--------------------------------------+ -| {{commonsBeanutilsVersions}} | <<1.8.2>> | -*--------------------------------------+--------------------------------------+ -| {{commonsCollectionsVersion}} | <<3.2.1>> | -*--------------------------------------+--------------------------------------+ -| {{commonsHttpclientVersion}} | <<3.1>> | -*--------------------------------------+--------------------------------------+ -| {{commonsIoVersion}} | <<1.4>> | -*--------------------------------------+--------------------------------------+ -| {{commonsJxpathVersion}} | <<1.3>> | -*--------------------------------------+--------------------------------------+ -| {{commonsLangVersion}} | <<2.5>> | -*--------------------------------------+--------------------------------------+ -| {{commonsLoggingVersion}} | <<1.1.1>> | -*--------------------------------------+--------------------------------------+ -| {{commonsPrimitivesVersion}} | <<1.0>> | -*--------------------------------------+--------------------------------------+ -| {{junitVersion}} | <<4.8.2>> | -*--------------------------------------+--------------------------------------+ -| {{log4jVersion}} | <<1.2.16>> | -*--------------------------------------+--------------------------------------+ +Pour avoir la liste de toutes les dépendances mutualisées dans le projet, +aller sur la page {{{./dependency-management.html}des versions supportées}}. + +Chaque dépendance possède une propriété pour définir sa version, afin de vous +permettre dans vos poms de pouvoir facilement surcharger la version d'une telle +dépendances sans avoir à changer de version de mavenpom. + +*-------------------------------+---------------------------------------------+ +| <<Propriété>> | <<librarie>> | +*-------------------------------+---------------------------------------------+ +| {{commonsBeanutilsVersions}} | <<commons-beanutils:commons-beanutils>> | +*-------------------------------+---------------------------------------------+ +| {{commonsCollectionsVersion}} | <<commons-collections:commons-collections>> | +*-------------------------------+---------------------------------------------+ +| {{commonsHttpclientVersion}} | <<commons-httpclient:commons-httpclient>> | +*-------------------------------+---------------------------------------------+ +| {{commonsIoVersion}} | <<commons-io:commons-io>> | +*-------------------------------+---------------------------------------------+ +| {{commonsJxpathVersion}} | <<commons-jxpath:commons-jxpath>> | +*-------------------------------+---------------------------------------------+ +| {{commonsLangVersion}} | <<commons-lang:commons-lang>> | +*-------------------------------+---------------------------------------------+ +| {{commonsLoggingVersion}} | <<commons-logging:commons-logging>> | +*-------------------------------+---------------------------------------------+ +| {{commonsPrimitivesVersion}} | <<commons-primitives:commons-primitives>> | +*-------------------------------+---------------------------------------------+ +| {{junitVersion}} | <<junit:junit>> | +*-------------------------------+---------------------------------------------+ +| {{log4jVersion}} | <<log4j:log4j>> | +*-------------------------------+---------------------------------------------+ + +* Propriétés de versions de plugins + +On définit dans le mavenpom beaucoup de versions de plugins. En consultant la +page {{{./plugin-management.html.html}des versions de plugins supportés}}. + +Comme pour les librairies, on définit une propriété pour chaqsue plugin définit + et ceci pour les même raisons. + +A noter que si un plugin est aussi un report il est nécessaire dans la partie report +de refournir la version du plugin (merci d'utiliser la propriété et non pas une +version en dure). + * Propriétés de génération de site et reports *--------------------------------------+--------------------------------------------------------+ @@ -251,61 +262,6 @@ La version de l'api de ant utilisée (principalement dans les modules de tâches ant).\ {{{Propriétés de versions}[remonter]}} -** {javadocPluginVersion} - - La version du plugin - {{{http://maven.apache.org/plugins/maven-javadoc-plugin}javadoc}} à utiliser.\ - {{{Propriétés de versions}[remonter]}} - -** {webstartPluginVersion} - - La version du plugin - {{http://mojo.codehaus.org/webstart/webstart-maven-plugin/}webstart}} à utiliser.\ - {{{Propriétés de versions}[remonter]}} - -** {helperPluginVersion} - - La version du plugin - {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin}} - utilisée.\ - {{{Propriétés de versions}[remonter]}} - -** {jredminePluginVersion} - - La version du plugin - {{{http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin}maven-jredmine-plugin}} - utilisée.\ - {{{Propriétés de versions}[remonter]}} - -** {licensePluginVersion} - - La version du plugin - {{{http://maven-site.nuiton.org/maven-license-plugin}maven-license-plugin}} - utilisée.\ - {{{Propriétés de versions}[remonter]}} - -** {jrstPluginVersion} - - La version de {{{http://maven-site.nuiton.org/jrst}jrst}} utilisée lors de la - génération du site si on utilise jrst. - - <Note:> Afin de pouvoir utiliser le format rst comme format de documentation, - il faut ajouter la dépendance suivant dans le plugin site : - --------------------------------------------------------------------------------- -<plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> - </dependency> - </dependencies> -</plugin> --------------------------------------------------------------------------------- - {{{Propriétés de versions}[remonter]}} - ** {nuitonSkinVersion} La version de notre skin @@ -337,7 +293,6 @@ {{{http://commons.apache.org/io/}commons-io}}.\ {{{Propriétés de versions}[remonter]}} - ** {commonsJxpathVersion} La version de la librairie