Author: tchemit Date: 2013-12-25 17:27:01 +0100 (Wed, 25 Dec 2013) New Revision: 1500 Url: http://nuiton.org/projects/mavenpom/repository/revisions/1500 Log: fixes #2982: Introduce fluidoSkinVersion property and set it to 1.3.1 fixes #2983: Add support for tidy-maven-plugin fixes #2980: Updates m-jrx-p to 2.4 fixes #2981: Updates commons-codec to 1.9 clean poms and docs. Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm trunk/mavenpomdoc/src/site/site.xml trunk/pom.xml Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2013-12-12 09:21:01 UTC (rev 1499) +++ trunk/mavenpom4labs/pom.xml 2013-12-25 16:27:01 UTC (rev 1500) @@ -25,9 +25,7 @@ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> @@ -44,9 +42,6 @@ </parent> --> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> <name>Mavenpom4labs</name> <description> Ancestor of all projects of Code Lutin based on a labs environnement @@ -59,50 +54,6 @@ <distribution>repo</distribution> </license> </licenses> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <!-- Build Environment : Environment Information --> - - <!-- Add this in your pom --> - <!--issueManagement> - <system>gforge</system> - <url>https://${platform}/tracker?group_id=${labs.id}</url> - </issueManagement--> - - <!--Any mailing lists for the project--> - <!-- Add any of thoses in your pom --> - - <!--mailingLists> - <mailingList> - <name>${listId}-commits</name> - <subscribe>http://list.${platform}/mailman/listinfo/${listId}-commits</subscribe> - <unsubscribe>http://list.${platform}/mailman/listinfo/${listId}-commits</unsubscribe> - <post>${listId}-commits@list.${platform}</post> - <archive>http://list.${platform}/pipermail/${listId}-commits/</archive> - </mailingList> - - <mailingList> - <name>${listId}-devel</name> - <subscribe>http://list.${platform}/mailman/listinfo/${listId}-devel</subscribe> - <unsubscribe>http://list.${platform}/mailman/listinfo/${listId}-devel</unsubscribe> - <post>${listId}-devel@list.${platform}</post> - <archive>http://list.${platform}/pipermail/${listId}-devel/</archive> - </mailingList> - - <mailingList> - <name>${listId}-users</name> - <subscribe>http://list.${platform}/mailman/listinfo/${listId}-users</subscribe> - <unsubscribe>http://list.${platform}/mailman/listinfo/${listId}-users</unsubscribe> - <post>${listId}-users@list.${platform}</post> - <archive>http://list.${platform}/pipermail/${listId}-users/</archive> - </mailingList> - </mailingLists--> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> <properties> <labs.id /> @@ -134,9 +85,6 @@ <googleSearchEnabled>false</googleSearchEnabled> <piwikEnabled>false</piwikEnabled> </properties> - <!-- ************************************************************* --> - <!-- *** Maven Environment *************************************** --> - <!-- ************************************************************* --> <!-- Maven Environment : profiles --> <profiles> Modified: trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm =================================================================== --- trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm 2013-12-12 09:21:01 UTC (rev 1499) +++ trunk/mavenpomdoc/src/site/apt/mavenpom/properties.apt.vm 2013-12-25 16:27:01 UTC (rev 1500) @@ -207,10 +207,8 @@ *----------------------------------+---------------------------------------------------------------------------------------------+ | {{resourcesPluginVersion}} | {{{http://maven.apache.org/plugins/maven-resources-plugin}<<org.apache.maven.plugins:maven-resources-plugin:${resourcesPluginVersion}>>}} | *----------------------------------+---------------------------------------------------------------------------------------------+ -| {{site2PluginVersion}} | {{{http://maven.apache.org/plugins/maven-site-plugin}<<org.apache.maven.plugins:maven-site-plugin:${site2PluginVersion}>>}} | +| {{sitePluginVersion}} | {{{http://maven.apache.org/plugins/maven-site-plugin}<<org.apache.maven.plugins:maven-site-plugin:${sitePluginVersion}>>}} | *----------------------------------+---------------------------------------------------------------------------------------------+ -| {{site3PluginVersion}} | {{{http://maven.apache.org/plugins/maven-site-plugin-3.0-beta-3}<<org.apache.maven.plugins:maven-site-plugin:${site3PluginVersion}>>}} | -*----------------------------------+---------------------------------------------------------------------------------------------+ | {{sourcePluginVersion}} | {{{http://maven.apache.org/plugins/maven-source-plugin}<<org.apache.maven.plugins:maven-source-plugin:${sourcePluginVersion}>>}} | *----------------------------------+---------------------------------------------------------------------------------------------+ | {{surefirePluginVersion}} | {{{http://maven.apache.org/plugins/maven-surefire-plugin}<<org.apache.maven.plugins:maven-surefire-plugin:${surefirePluginVersion}>>}} | @@ -237,6 +235,8 @@ *-------------------------------+--------------------------------------------------------------------------+ | {{licensePluginVersion}} | {{{http://mojo.codehaus.org/license-maven-plugin}<<org.codehaus.codehaus.mojo:license-maven-plugin:${licensePluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ +| {{tidyPluginVersion}} | {{{http://mojo.codehaus.org/tidy-maven-plugin}<<org.codehaus.codehaus.mojo:tity-maven-plugin:${tidyPluginVersion}>>}} | +*-------------------------------+--------------------------------------------------------------------------+ | {{versionsPluginVersion}} | {{{http://mojo.codehaus.org/versions-maven-plugin}<<org.codehaus.mojo:versions-maven-plugin:${versionsPluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ | {{wagonPluginVersion}} | {{{http://mojo.codehaus.org/wagon-maven-plugin}<<org.codehaus.mojo:wagon-maven-plugin:${wagonPluginVersion}>>}} | @@ -292,6 +292,8 @@ *--------------------------------------+--------------------------------------------------------+ | <<Propriété>> | <<Valeur par défaut>> | *--------------------------------------+--------------------------------------------------------+ +| {{fluidoSkinVersion}} | <<${fluidoSkinVersion}>> | +*--------------------------------------+--------------------------------------------------------+ | {{siteSourcesType}} | <<rst>> | *--------------------------------------+--------------------------------------------------------+ | {{scmwebeditorEnabled}} | <<true>> | @@ -555,6 +557,11 @@ * Détail des propriétés de génération de site et reports +** {fluidoSkinVersion} + + La version utilisée du skin {{{http://maven.apache.org/skins/maven-fluido-skin/}fluido}}.\ + {{{Propriétés de génération de site et reports}[remonter]}} + ** {siteSourcesType} Le type de fichiers utilisé pour écrire la documentation du site Modified: trunk/mavenpomdoc/src/site/site.xml =================================================================== --- trunk/mavenpomdoc/src/site/site.xml 2013-12-12 09:21:01 UTC (rev 1499) +++ trunk/mavenpomdoc/src/site/site.xml 2013-12-25 16:27:01 UTC (rev 1500) @@ -25,7 +25,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.2.1</version> + <version>${fluidoSkinVersion}</version> </skin> <custom> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-12-12 09:21:01 UTC (rev 1499) +++ trunk/pom.xml 2013-12-25 16:27:01 UTC (rev 1500) @@ -26,17 +26,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> <version>4.5-SNAPSHOT</version> <packaging>pom</packaging> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> <name>Mavenpom</name> <description>Ancestor of all projects of Code Lutin</description> <url>http://maven-site.nuiton.org/mavenpom</url> @@ -45,6 +39,7 @@ <name>CodeLutin</name> <url>http://www.codelutin.com/</url> </organization> + <licenses> <license> <name>Lesser General Public License (LGPL) v 3.0</name> @@ -100,7 +95,7 @@ </developer> </developers> - <!--Any mailing lists for the project--> + <mailingLists> <mailingList> <name>${listId}-commits</name> @@ -138,11 +133,7 @@ <archive>http://list.${platform}/pipermail/${listId}-users/</archive> </mailingList> </mailingLists> - <!-- ************************************************************* --> - <!-- *** Maven Environment *************************************** --> - <!-- ************************************************************* --> - <!-- prerequisites --> <prerequisites> <maven>2.2.1</maven> </prerequisites> @@ -152,7 +143,7 @@ <module>mavenpom4labs</module> <module>mavenpomdoc</module> </modules> - <!-- Source control management. --> + <scm> <connection>scm:svn:http://svn.nuiton.org/svn/mavenpom/trunk</connection> <developerConnection> @@ -160,11 +151,7 @@ </developerConnection> <url>http://nuiton.org/projects/mavenpom/repository/trunk</url> </scm> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - <!-- Build Environment : Environment Information --> <issueManagement> <system>redmine</system> <url>http://${platform}/projects/${projectId}/issues</url> @@ -184,9 +171,7 @@ <url>${snapshot.repository}</url> </snapshotRepository> </distributionManagement> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <properties> <!-- the redmine plateform used (nuiton.org or chorem.org or forge.codelutin.com) --> @@ -295,7 +280,7 @@ <gwtPluginVersion>2.5.1</gwtPluginVersion> <l10nPluginVersion>1.0-alpha-2</l10nPluginVersion> <licensePluginVersion>1.5</licensePluginVersion> - <tomcatPluginVersion>2.2</tomcatPluginVersion> + <tidyPluginVersion>1.0-alpha-2</tidyPluginVersion> <versionsPluginVersion>2.1</versionsPluginVersion> <wagonPluginVersion>1.0-beta-4</wagonPluginVersion> <webstartPluginVersion>1.0-beta-4</webstartPluginVersion> @@ -309,19 +294,20 @@ <androidPluginVersion>2.8.4</androidPluginVersion> <jettyPluginVersion>8.1.14.v20131031</jettyPluginVersion> <statScmPluginVersion>1.2.0</statScmPluginVersion> + <tomcatPluginVersion>2.2</tomcatPluginVersion> <!-- report plugins version --> <changesPluginVersion>2.9</changesPluginVersion> <projectInfoReportsPluginVersion>2.7</projectInfoReportsPluginVersion> <changelogPluginVersion>2.2</changelogPluginVersion> - <jrxPluginVersion>2.3</jrxPluginVersion> + <jrxPluginVersion>2.4</jrxPluginVersion> <sonarReportPluginVersion>0.1</sonarReportPluginVersion> <!-- common libs used in projects --> <commonsBeanutilsVersion>1.8.3</commonsBeanutilsVersion> <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> <commonsCollections4Version>4.0</commonsCollections4Version> - <commonsCodecVersion>1.8</commonsCodecVersion> + <commonsCodecVersion>1.9</commonsCodecVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> <commonsHttpclientVersion>3.1</commonsHttpclientVersion> <httpCommonsHttpclientVersion>4.3.1</httpCommonsHttpclientVersion> @@ -376,6 +362,7 @@ <!-- locales for the site generation, by default only french --> <locales>fr</locales> + <fluidoSkinVersion>1.3.1</fluidoSkinVersion> <generateSitemap>true</generateSitemap> @@ -807,6 +794,12 @@ <plugin> <groupId>org.codehaus.mojo</groupId> + <artifactId>tidy-maven-plugin</artifactId> + <version>${tidyPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> <configuration>