Author: tchemit Date: 2014-08-26 18:00:05 +0200 (Tue, 26 Aug 2014) New Revision: 331 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/331 Log: fixes #3483: Updates mavenpom to 5.1 and use new site layout Modified: trunk/pom.xml trunk/src/site/site_fr.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-08-26 15:56:13 UTC (rev 330) +++ trunk/pom.xml 2014-08-26 16:00:05 UTC (rev 331) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.1</version> + <version>5.1</version> </parent> <groupId>org.nuiton.web</groupId> @@ -79,8 +79,8 @@ </scm> <distributionManagement> <site> - <id>doc.${platform}</id> - <url>${our.site.repository}/${projectId}</url> + <id>${siteDeployId}</id> + <url>${siteDeployUrl}</url> </site> </distributionManagement> @@ -117,6 +117,10 @@ <!--Multilanguage maven-site --> <siteLocales>en,fr</siteLocales> + <!-- Can't use version 3.4 since jrst is not compatible --> + <!-- see https://forge.nuiton.org/issues/3342 --> + <sitePluginVersion>3.3</sitePluginVersion> + <!-- license to use --> <license.licenseName>lgpl_v3</license.licenseName> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-08-26 15:56:13 UTC (rev 330) +++ trunk/src/site/site_fr.xml 2014-08-26 16:00:05 UTC (rev 331) @@ -58,19 +58,21 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="images/logos/maven-feather.png"/> + img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> </poweredBy> <body> <links> - <item name="Nuiton.org" href="http://www.nuiton.org"/> - <item name="Chorem.org" href="http://www.chorem.org"/> + <item name="Nuiton.org" href="http://forge.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.name}" + href="${project.url}/index.html"/> + <item name="${project.version}" + href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu ref="modules"/>