This is an automated email from the git hooks/post-receive script. New commit to branch develop-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git commit 88777456e886e0fc5b7dfe7f056725a1243c8d4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 24 11:46:54 2015 +0100 Utilisation de nuitonpom 5.1 + configuration du scm sur gitlab (Fixes #3834) --- pom.xml | 15 +++++++++++---- src/site/site.xml | 9 ++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index a354b48..9f3f2e4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.8.3</version> + <version>5.1</version> </parent> <artifactId>jaxx</artifactId> @@ -133,6 +133,9 @@ <!-- Remove this if one day we use maven3 API in jaxx 2 --> <helperPluginVersion>2.1</helperPluginVersion> + <pluginPluginVersion>3.3</pluginPluginVersion> + <!-- Remove this if one day we use maven3 API in jaxx 2 --> + <mavenVersion>2.2.1</mavenVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <nuitonI18nVersion>3.3</nuitonI18nVersion> @@ -142,6 +145,10 @@ <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> + <!--site configuration --> + <locales>fr</locales> + <siteSourcesType>rst</siteSourcesType> + <!-- jnlp configuration --> <jnlpFileName>jaxx-demo.jnlp</jnlpFileName> <jnlpCodebase>http://jaxx.nuiton.org/v/${siteDeployClassifier}/jaxx-demo/jnlp</jnlpCodebase> @@ -159,9 +166,9 @@ <!-- Source control management. --> <scm> - <connection>scm:git:http://git.nuiton.org/jaxx.git</connection> - <developerConnection>scm:git:https://git.nuiton.org/jaxx.git</developerConnection> - <url>https://gitweb.nuiton.org/jaxx.git</url> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/jaxx.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/jaxx</url> </scm> <distributionManagement> diff --git a/src/site/site.xml b/src/site/site.xml index 8cf8f97..5a78984 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -40,7 +40,7 @@ <poweredBy> <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> - <logo href="${siteCommonResourcesUrl}/jrst" name="JRst" + <logo href="http://jrst.nuiton.org" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" @@ -104,5 +104,12 @@ <menu ref="reports"/> + <footer> + <div id='mavenProjectProperties' locale='fr' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}'/> + </footer> + </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.