This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wikitty. See http://git.nuiton.org/wikitty.git commit cc243389e05be7f87d72b34765f0fa82ccacda59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 19 10:34:43 2015 +0100 Migration vers gitlab + simplification configuration des sites --- pom.xml | 9 +++++---- src/site/site_en.xml | 8 ++++++++ src/site/site_fr.xml | 8 ++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 9364979..daf4712 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>2.3</version> + <version>5</version> </parent> <artifactId>wikitty</artifactId> @@ -179,9 +179,9 @@ </modules> <scm> - <connection>scm:git:http://git.nuiton.org/wikitty.git</connection> - <developerConnection>scm:git:https://git.nuiton.org/wikitty.git</developerConnection> - <url>https://gitweb.nuiton.org/wikitty.git</url> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/wikitty.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/wikitty.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/wikitty</url> </scm> <distributionManagement> <site> @@ -217,6 +217,7 @@ <cxf.version>2.5.1</cxf.version> <!--Multilanguage maven-site --> <locales>fr,en</locales> + <siteSourcesType>rst</siteSourcesType> <!--FIXME tchemit-2014-10-26 --> <javadocPluginVersion>2.9.1</javadocPluginVersion> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 556a028..2caa2f6 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -79,5 +79,13 @@ <menu ref="reports"/> + <footer> + <div id='mavenProjectProperties' locale='en' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmwebeditor_vmFiles=',library,'/> + </footer> + </body> </project> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index a629cc5..04eaa45 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -83,5 +83,13 @@ <menu ref="reports"/> + <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>.