This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 479ba9362b1984f37ac37cbf01e6aecb5a059350 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 19 10:22:35 2015 +0100 Migration vers gitlab + simplification configuration des sites (il faut remettre le site technique en état) --- pom.xml | 10 ++++++---- src/site/site_fr.xml | 46 ++++++++-------------------------------------- 2 files changed, 14 insertions(+), 42 deletions(-) diff --git a/pom.xml b/pom.xml index fa41c60..b2a0128 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>3</version> + <version>5</version> </parent> <artifactId>topia</artifactId> @@ -213,11 +213,11 @@ </modules> <scm> - <connection>scm:git:http://git.nuiton.org/topia.git</connection> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/topia.git</connection> <developerConnection> - scm:git:https://git.nuiton.org/topia.git + scm:git:git@gitlab.nuiton.org:nuiton/topia.git </developerConnection> - <url>https://gitweb.nuiton.org/topia.git</url> + <url>https://gitlab.nuiton.org/nuiton/topia</url> </scm> <distributionManagement> @@ -256,6 +256,8 @@ <sl4jVersion>1.7.9</sl4jVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> + <siteSourcesType>rst</siteSourcesType> + </properties> <dependencyManagement> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 223c8f8..14b9fc7 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -36,35 +36,6 @@ <href>http://www.codelutin.com</href> </bannerRight> - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>true</topBarEnabled> - <topBarIcon> - <name>ToPIA : Tools for Portable and Independent Architecture</name> - <alt>ToPIA : Tools for Portable and Independent Architecture</alt> - <src>${siteCommonResourcesUrl}/images/logos/topia_60_20.png</src> - <href>/index.html</href> - </topBarIcon> - <sideBarEnabled>false</sideBarEnabled> - <googleSearch>false</googleSearch> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - <piwik> - <piwikUrl>http://piwik.codelutin.com</piwikUrl> - <idsite>${project.piwikId}</idsite> - </piwik> - </fluidoSkin> - </custom> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> @@ -83,15 +54,6 @@ <body> - <head> - - <link rel="stylesheet" type="text/css" - href="${siteCommonResourcesUrl}/css/mavenpom-site.css"/> - - <!--<link rel="stylesheet" type="text/css" href="site.css"/> <!– XXX AThimel 15/05/2014 May be merged with mavenpom-site.css –>--> - - </head> - <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> @@ -140,5 +102,13 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <footer> + <div id='mavenProjectProperties' locale='fr' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmwebeditor_vmFiles=',library,'/> + </footer> + </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.