Author: tchemit Date: 2011-02-28 10:19:35 +0100 (Mon, 28 Feb 2011) New Revision: 1078 Url: http://nuiton.org/repositories/revision/mavenpom/1078 Log: Evolution #1357: Updates to m-dependency-p 2.2.1 Evolution #1368: Add m-remote-resources-p definition (version 1.2) Evolution #1369: Updates to m-resources-p 2.5 Add plugins declaration in documentation Modified: trunk/pom.xml trunk/src/site/apt/properties.apt.vm Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-26 10:22:06 UTC (rev 1077) +++ trunk/pom.xml 2011-02-28 09:19:35 UTC (rev 1078) @@ -227,7 +227,7 @@ <!-- apache maven plugins version --> <antRunPluginVersion>1.6</antRunPluginVersion> - <assemblyPluginVersion>2.2</assemblyPluginVersion> + <assemblyPluginVersion>2.2.1</assemblyPluginVersion> <cleanPluginVersion>2.4.1</cleanPluginVersion> <compilerPluginVersion>2.3.2</compilerPluginVersion> <dependencyPluginVersion>2.2</dependencyPluginVersion> @@ -243,8 +243,8 @@ <pluginPluginVersion>2.7</pluginPluginVersion> <pmdPluginVersion>2.5</pmdPluginVersion> <releasePluginVersion>2.1</releasePluginVersion> - <remoteResourcesPluginVersion>1.1</remoteResourcesPluginVersion> - <resourcesPluginVersion>2.4.3</resourcesPluginVersion> + <remoteResourcesPluginVersion>1.2</remoteResourcesPluginVersion> + <resourcesPluginVersion>2.5</resourcesPluginVersion> <site2PluginVersion>2.1.1</site2PluginVersion> <site3PluginVersion>3.0-beta-3</site3PluginVersion> <sourcePluginVersion>2.1.2</sourcePluginVersion> @@ -682,16 +682,17 @@ <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>gwt-maven-plugin</artifactId> - <version>${gwtPluginVersion}</version> + <artifactId>findbugs-maven-plugin</artifactId> + <version>${findbugsPluginVersion}</version> </plugin> - + <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>${findbugsPluginVersion}</version> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtPluginVersion}</version> </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>tomcat-maven-plugin</artifactId> Modified: trunk/src/site/apt/properties.apt.vm =================================================================== --- trunk/src/site/apt/properties.apt.vm 2011-02-26 10:22:06 UTC (rev 1077) +++ trunk/src/site/apt/properties.apt.vm 2011-02-28 09:19:35 UTC (rev 1078) @@ -119,65 +119,120 @@ version en dure). A titre indicatif, voici la liste de toutes les propriétés utilisées : - -------------------------------------------------------------------------------- -<!-- our plugins (+ skin) version --> -helperPluginVersion -jredminePluginVersion -jrstPluginVersion -licensePluginVersion -nuitonSkinVersion -webstartPluginVersion -<!-- apache maven plugins version --> -antRunPluginVersion -assemblyPluginVersion -cleanPluginVersion -compilerPluginVersion -dependencyPluginVersion -deployPluginVersion -earPluginVersion -ejbPluginVersion -enforcerPluginVersion -gpgPluginVersion -installPluginVersion -invokerPluginVersion -jarPluginVersion -javadocPluginVersion -pluginPluginVersion -pmdPluginVersion -releasePluginVersion -resourcesPluginVersion -site2PluginVersion -site3PluginVersion -sourcePluginVersion -surefirePluginVersion -warPluginVersion +*-------------------------------+--------------------------------------------------------------------------+ +| <<Propriété (plugins nuton)>> | <<GAV>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{helperPluginVersion}} | <<org.nuiton:maven-helper-plugin:${helperPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{jredminePluginVersion}} | <<org.nuiton.jredmine:maven-jredmine-plugin:${jredminePluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{jrstPluginVersion}} | <<::${jrstPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{licensePluginVersion}} | <<org.nuiton:maven-license-plugin:${licensePluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{webstartPluginVersion}} | <<org.nuiton.thirdparty:webstart-maven-plugin:${webstartPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ -<!-- codehaud mojo plugins --> -coberturaPluginVersion -execPluginVersion -findbugsPluginVersion -gwtPluginVersion -tomcatPluginVersion +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{Propriété (plugins maven)}} | <<GAV>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{antRunPluginVersion}} | <<org.apache.maven.plugins:maven-antrun-plugin:${antRunPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{assemblyPluginVersion}} | <<org.apache.maven.plugins:maven-assembly-plugin:${assemblyPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{cleanPluginVersion}} | <<org.apache.maven.plugins:maven-clean-plugin:${cleanPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{compilerPluginVersion}} | <<org.apache.maven.plugins:maven-compiler-plugin:${compilerPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{dependencyPluginVersion}} | <<org.apache.maven.plugins:maven-dependency-plugin:${dependencyPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{deployPluginVersion}} | <<org.apache.maven.plugins:maven-deploy-plugin:${deployPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{earPluginVersion}} | <<org.apache.maven.plugins:maven-ear-plugin:${earPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{ejbPluginVersion}} | <<org.apache.maven.plugins:maven-ejb-plugin:${ejbPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{enforcerPluginVersion}} | <<org.apache.maven.plugins:maven-enforcer-plugin:${enforcerPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{gpgPluginVersion}} | <<org.apache.maven.plugins:maven-gpg-plugin:${gpgPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{installPluginVersion}} | <<org.apache.maven.plugins:maven-install-plugin:${installPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{invokerPluginVersion}} | <<org.apache.maven.plugins:maven-invoker-plugin:${invokerPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{jarPluginVersion}} | <<org.apache.maven.plugins:maven-jar-plugin:${jarPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{javadocPluginVersion}} | <<org.apache.maven.plugins:maven-javadoc-plugin:${javadocPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{pluginPluginVersion}} | <<org.apache.maven.plugins:maven-plugin-plugin:${pluginPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{pmdPluginVersion}} | <<org.apache.maven.plugins:maven-pmd-plugin:${pmdPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{releasePluginVersion}} | <<org.apache.maven.plugins:maven-release-plugin:${releasePluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{remoteResourcesPluginVersion}} | <<org.apache.maven.plugins:maven-remote-resources-plugin:${remoteResourcesPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{resourcesPluginVersion}} | <<org.apache.maven.plugins:maven-resources-plugin:${resourcesPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{site2PluginVersion}} | <<org.apache.maven.plugins:maven-site-plugin:${site2PluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{site3PluginVersion}} | <<org.apache.maven.plugins:maven-site-plugin:${site3PluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{sourcePluginVersion}} | <<org.apache.maven.plugins:maven-source-plugin:${sourcePluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{surefirePluginVersion}} | <<org.apache.maven.plugins:maven-surefire-plugin:${surefirePluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ +| {{warPluginVersion}} | <<org.apache.maven.plugins:maven-war-plugin:${warPluginVersion}>> | +*----------------------------------+---------------------------------------------------------------------------------------------+ -<!-- codehaus plexus plugins --> -plexusPluginVersion -plexusComponentMetadataPluginVersion +*-------------------------------+--------------------------------------------------------------------------+ +| {{Propriété (plugins mojo)}} | <<GAV>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{coberturaPluginVersion}} | <<org.codehaus.mojo:cobertura-maven-plugin:${coberturaPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{execPluginVersion}} | <<org.codehaus.mojo:exec-maven-plugin:${execPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{findbugsPluginVersion}} | <<org.codehaus.mojo:findbugs-maven-plugin:${findbugsPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{gwtPluginVersion}} | <<org.codehaus.mojo:gwt-maven-plugin:${gwtPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ +| {{tomcatPluginVersion}} | <<org.codehaus.mojo:tomcat-maven-plugin:${tomcatPluginVersion}>> | +*-------------------------------+--------------------------------------------------------------------------+ -<!-- others plugins --> -androidPluginVersion -jettyPluginVersion -statScmPluginVersion +*-------------------------------+------------------------------------------------------------------------------------------------------+ +| {{Propriété (plugins plexus)}} | <GAV>> | +*------------------------------------------+-------------------------------------------------------------------------------------------+ +| {{plexusPluginVersion}} | <<org.codehaus.plexus:plexus-maven-plugin:${plexusPluginVersion}>> | +*------------------------------------------+-------------------------------------------------------------------------------------------+ +| {{plexusComponentMetadataPluginVersion}} | <<org.codehaus.plexus:plexus-component-metadata:${plexusComponentMetadataPluginVersion}>> | +*------------------------------------------+-------------------------------------------------------------------------------------------+ -<!-- report plugins version --> -changesPluginVersion -projectInfoReportsPluginVersion -changelogPluginVersion -jrxPluginVersion -sonarReportPluginVersion -------------------------------------------------------------------------------- +*-------------------------------------+------------------------------------------------------------------------------------------------+ +| {{Propriété (autre plugins)} | <<GAV>> | +*-------------------------------------+------------------------------------------------------------------------------------------------+ +| {{androidPluginVersion}} | <<com.jayway.maven.plugins.android.generation2:maven-android-plugin:${androidPluginVersion}>> | +*-------------------------------------+------------------------------------------------------------------------------------------------+ +| {{jettyPluginVersion}} | <<org.mortbay.jetty:maven-jetty-plugin:${jettyPluginVersion}>> | +*-------------------------------------+------------------------------------------------------------------------------------------------+ +| {{statScmPluginVersion}} | <<net.sf:stat-scm:${statScmPluginVersion}>> | +*-------------------------------------+------------------------------------------------------------------------------------------------+ +*-------------------------------------+----------------------------------------------------------------------------------------------------+ +| {{Propriété (reports)}} | <<GAV>> | +*-------------------------------------+----------------------------------------------------------------------------------------------------+ +| {{changesPluginVersion}} | <<org.apache.maven.plugins::${changesPluginVersion}>> | +*-------------------------------------+----------------------------------------------------------------------------------------------------+ +| {{projectInfoReportsPluginVersion}} | <<org.apache.maven.plugins:maven-project-info-reports-plugin:${projectInfoReportsPluginVersion}>> | +*-------------------------------------+----------------------------------------------------------------------------------------------------+ +| {{changelogPluginVersion}} | <<org.apache.maven.plugins:maven-changelog-plugin:${changelogPluginVersion}>> | +*-------------------------------------+----------------------------------------------------------------------------------------------------+ +| {{jrxPluginVersion}} | <<org.apache.maven.plugins:maven-jxr-plugin:${jrxPluginVersion}>> | +*-------------------------------------+----------------------------------------------------------------------------------------------------+ +| {{sonarReportPluginVersion}} | <<org.codehaus.sonar-plugins:maven-report:${sonarReportPluginVersion}>> | +*-------------------------------------+----------------------------------------------------------------------------------------------------+ + + * Propriétés de génération de site et reports *--------------------------------------+--------------------------------------------------------+