branch develop updated (75f1d82 -> edf069b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-csv. See http://git.nuiton.org/nuiton-csv.git from 75f1d82 Migrates to gitlba (Fixes #3799) new dd1dc5f Add new site configuration using nuitonpom 5 new 19a3dec Add explicit project groupId, otherwise maven-versions-plugin:set does not work new f6dbec2 use pom 5 new 6bf02e5 Use final site configuration new edf069b Fixes #3811 Merge branch 'feature/3811_up_to_nuitonpom_5' into develop The 5 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 edf069b3ed5f58b5563331d25e54936f4babe2db Merge: 75f1d82 6bf02e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 23:00:38 2015 +0100 Fixes #3811 Merge branch 'feature/3811_up_to_nuitonpom_5' into develop commit 6bf02e53ebe88147823668586a9f7a136d57d94d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 23:00:35 2015 +0100 Use final site configuration commit f6dbec2d4dbdb8cd18155a01ebe85a4a32f85b93 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 23:00:24 2015 +0100 use pom 5 commit 19a3dec5e1956deb5032ceeedba5e0b09c883181 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 13 18:20:33 2015 +0100 Add explicit project groupId, otherwise maven-versions-plugin:set does not work commit dd1dc5febf4f6b867fe2bfbd41119625bc23b4bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 13 15:33:56 2015 +0100 Add new site configuration using nuitonpom 5 Summary of changes: pom.xml | 9 +++++---- src/site/site.xml | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 6 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 nuiton-csv. See http://git.nuiton.org/nuiton-csv.git commit dd1dc5febf4f6b867fe2bfbd41119625bc23b4bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 13 15:33:56 2015 +0100 Add new site configuration using nuitonpom 5 --- pom.xml | 8 ++++---- src/site/site.xml | 23 +++++++++++++++++++++-- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 1cce321..2c0257a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>4</version> + <version>5-SNAPSHOT</version> </parent> <artifactId>nuiton-csv</artifactId> @@ -45,7 +45,7 @@ </developers> <scm> - <connection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-csv.git</connection> + <connection>scm:git:https://gitlab.nuiton.org/nuiton/nuiton-csv.git</connection> <developerConnection>scm:git:git@gitlab.nuiton.org:nuiton/nuiton-csv.git</developerConnection> <url>https://gitlab.nuiton.org/nuiton/nuiton-csv</url> </scm> @@ -66,8 +66,8 @@ <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - <!-- Documentation is in apt format --> - <siteSourcesType>apt</siteSourcesType> + <!-- Site locales --> + <locales>fr</locales> <!-- extra files to include in release --> <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> diff --git a/src/site/site.xml b/src/site/site.xml index 78065fd..1790f8c 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -21,7 +21,9 @@ #L% --> -<project name="${project.name}"> +<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.3.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.3.0 http://maven.apache.org/xsd/decoration-1.3.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -35,6 +37,12 @@ <body> + <head> + <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"> + </script> + <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> + </head> + <links> <item name="Nuiton.org" href="http://forge.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -43,7 +51,7 @@ <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + <item name="${project.version}" href="#"/> </breadcrumbs> <menu name="Utilisateur"> @@ -53,5 +61,16 @@ <menu ref="reports"/> + <footer> + <div id='projectMetas' locale='fr' + platform='${project.platform}' + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmUrl='${project.scm.connection}' + editorUrl='${project.scmwebeditorUrl}'/> + </footer> + + </body> </project> -- 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 nuiton-csv. See http://git.nuiton.org/nuiton-csv.git commit 6bf02e53ebe88147823668586a9f7a136d57d94d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 23:00:35 2015 +0100 Use final site configuration --- src/site/site.xml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/site/site.xml b/src/site/site.xml index 1790f8c..c028364 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -37,12 +37,6 @@ <body> - <head> - <script type="text/javascript" src="http://common.nuiton.org/dev/js/pom-site.js"> - </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> - <links> <item name="Nuiton.org" href="http://forge.nuiton.org"/> <item name="Code Lutin" href="http://www.codelutin.com"/> @@ -62,7 +56,7 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' locale='fr' + <div id='mavenProjectProperties' locale='fr' platform='${project.platform}' projectId='${project.projectId}' version='${project.siteDeployClassifier}' @@ -71,6 +65,5 @@ editorUrl='${project.scmwebeditorUrl}'/> </footer> - </body> </project> -- 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 nuiton-csv. See http://git.nuiton.org/nuiton-csv.git commit edf069b3ed5f58b5563331d25e54936f4babe2db Merge: 75f1d82 6bf02e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 23:00:38 2015 +0100 Fixes #3811 Merge branch 'feature/3811_up_to_nuitonpom_5' into develop pom.xml | 9 +++++---- src/site/site.xml | 16 ++++++++++++++-- 2 files changed, 19 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm