branch develop updated (004b464 -> c108b47)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository i18n. See http://git.nuiton.org/i18n.git from 004b464 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new c108b47 Migration vers gitlab + simplification configuration des sites The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c108b47e2eef3e9bd57c42a9b0f98eda99ee6c90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 19 09:31:27 2015 +0100 Migration vers gitlab + simplification configuration des sites Summary of changes: pom.xml | 13 ++++++------- src/site/site_en.xml | 28 ++++++---------------------- src/site/site_fr.xml | 14 ++++++++------ 3 files changed, 20 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository i18n. See http://git.nuiton.org/i18n.git commit c108b47e2eef3e9bd57c42a9b0f98eda99ee6c90 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Dec 19 09:31:27 2015 +0100 Migration vers gitlab + simplification configuration des sites --- pom.xml | 13 ++++++------- src/site/site_en.xml | 28 ++++++---------------------- src/site/site_fr.xml | 14 ++++++++------ 3 files changed, 20 insertions(+), 35 deletions(-) diff --git a/pom.xml b/pom.xml index 44a57d2..43c9ea4 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>1.2</version> + <version>5</version> </parent> <artifactId>i18n</artifactId> @@ -37,7 +37,7 @@ <packaging>pom</packaging> <name>I18n</name> <description>Nuiton i18n tools</description> - <url>https://doc.nuiton.org/i18n</url> + <url>https://i18n.nuiton.org</url> <inceptionYear>2008</inceptionYear> <modules> @@ -46,11 +46,9 @@ </modules> <scm> - <connection>scm:git:http://git.nuiton.org/i18n.git</connection> - <developerConnection> - scm:git:https://git.nuiton.org/i18n.git - </developerConnection> - <url>https://gitweb.nuiton.org/i18n.git</url> + <connection>scm:git:git@gitlab.nuiton.org:nuiton/i18n.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/i18n.git</developerConnection> + <url>https://gitlab.nuiton.org/nuiton/i18n</url> </scm> <distributionManagement> @@ -71,6 +69,7 @@ <locales>fr,en</locales> <mavenVersion>2.2.1</mavenVersion> + <pluginPluginVersion>3.2</pluginPluginVersion> </properties> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index 7559489..542bd04 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -38,16 +38,9 @@ <body> - <head> - - <link rel="stylesheet" type="text/css" - href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" - href="${project.url}/${siteDeployClassifier}/en/index.html"/> + <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/en/index.html"/> </breadcrumbs> <menu name="Language"> @@ -83,20 +76,11 @@ <menu ref="reports"/> <footer> - - <div id='projectMetas' locale='en' - projectversion='${project.version}' - platform='${project.platform}' - projectid='${project.projectId}' - scm='${project.scm.developerConnection}' - scmwebeditorenabled='${project.scmwebeditorEnabled}' - scmwebeditorurl='${project.scmwebeditorUrl}' - siteSourcesType='${project.siteSourcesType}' - piwikEnabled='${project.piwikEnabled}' - piwikId='${project.piwikId}' - scmwebeditor_vmFiles=",library.html," - scmwebeditor_skipDefaultFiles="true"> - </div> + <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 4bbfda9..3190c34 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -38,12 +38,6 @@ <body> - <head> - - <link rel="stylesheet" type="text/css" - href="${siteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> <item name="${project.version}" @@ -82,5 +76,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>.
participants (1)
-
nuiton.org scm