This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 4165eb4c3f1db2c76eee4efbd251695efbefba99 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 6 20:21:18 2015 +0200 passage sous git et utilisation de codelutinpom --- pom.xml | 34 ++++++++++++---------------------- src/site/site_fr.xml | 48 +++++++++++++++--------------------------------- 2 files changed, 27 insertions(+), 55 deletions(-) diff --git a/pom.xml b/pom.xml index 9a5ec0d..c4b0939 100644 --- a/pom.xml +++ b/pom.xml @@ -27,8 +27,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>6.1</version> + <artifactId>codelutinpom</artifactId> + <version>1.8.2</version> </parent> <groupId>fr.ird.observe</groupId> @@ -37,7 +37,7 @@ <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.codelutin.com</url> + <url>https://observe.codelutin.com</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -85,32 +85,30 @@ <module>observe-swing</module> </modules> - <scm> + <!--scm> <url>https://svn.mpl.ird.fr/osiris/observe/trunk</url> <connection>scm:svn:https://svn.mpl.ird.fr/osiris/observe/trunk</connection> <developerConnection> scm:svn:https://svn.mpl.ird.fr/osiris/observe/trunk </developerConnection> + </scm--> + <scm> + <url>https://gitweb.codelutin.com/observe.git</url> + <connection>scm:git:http://git.codelutin.com/observe.git</connection> + <developerConnection>scm:git:https://git.codelutin.com/observe.git</developerConnection> </scm> + <distributionManagement> <site> - <id>${siteDeployId}</id> - <url>${siteDeployUrl}</url> + <id>${site.server}</id> + <url>${site.url}</url> </site> </distributionManagement> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - <properties> - <platform>codelutin.com</platform> <projectId>observe</projectId> - <!-- Release configuration --> - <releaseEmailDomain>forge.codelutin.com</releaseEmailDomain> - <eugenePluginVersion>2.14</eugenePluginVersion> <topiaVersion>2.9.4</topiaVersion> @@ -132,14 +130,6 @@ <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> <i18n.silent>true</i18n.silent> - <siteDeployUrl> - scpexe://forge.codelutin.com/var/lib/doc/maven-site/codelutin.com/${projectId}/${siteDeployClassifier} - </siteDeployUrl> - <mavenpomSiteCommonResourcesUrl>https://common.nuiton.org/0.3</mavenpomSiteCommonResourcesUrl> - - <!-- issues status to include in changelog --> - <redmine.statusIds>3,10,11,18,19</redmine.statusIds> - </properties> <repositories> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index 77c1e37..b25f690 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -21,23 +21,10 @@ #L% --> -<project name="${project.name}"> - - <skin> - <groupId>org.apache.maven.skins</groupId> - <artifactId>maven-fluido-skin</artifactId> - <version>${fluidoSkinVersion}</version> - </skin> - - <custom> - <fluidoSkin> - <topBarEnabled>false</topBarEnabled> - <googleSearch/> - <sideBarEnabled>true</sideBarEnabled> - <searchEnabled>true</searchEnabled> - <sourceLineNumbersEnabled>true</sourceLineNumbersEnabled> - </fluidoSkin> - </custom> +<project name="${project.name}" + xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -50,40 +37,35 @@ <href>http://www.codelutin.com</href> </bannerRight> - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://jrst.nuiton.org" name="JRst" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> + <logo href="https://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> + <logo href="https://jaxx.nuiton.org" name="JAXX" + img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> - <logo href="http://jaxx.nuiton.org" name="JAXX" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> + <logo href="https://topia.nuiton.org" name="ToPIA" + img="${mavenpomSiteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${mavenpomSiteCommonResourcesUrl}/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> <links> - <item name="Forge" href="http://www.forge.codelutin.com"/> - <item name="Code Lutin" href="http://www.codelutin.com"/> + <item name="Forge" href="https://forge.codelutin.com"/> + <item name="Code Lutin" href="https://codelutin.com"/> </links> <breadcrumbs> - <item name="${project.name}" href="${project.url}"/> + <item name="${project.name}" href="${project.url}/index.html"/> <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.