This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit d70defe98e8d7ac9ee69b71dfd59d4e6e0c89c93 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 16:36:34 2015 +0100 Migration sous gitlab + passage sous chorem 5-rc-2 --- pollen-rest-api/pom.xml | 2 ++ pollen-ui-angular/pom.xml | 3 ++ pom.xml | 23 ++++--------- src/site/site_en.xml | 83 +++++++++++++-------------------------------- src/site/site_fr.xml | 85 ++++++++++++++--------------------------------- 5 files changed, 60 insertions(+), 136 deletions(-) diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 1bb11c5..6b60bc9 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -28,6 +28,8 @@ <redmine.releaseFiles> ${project.build.directory}/${project.build.finalName}.war </redmine.releaseFiles> + + <maven.deploy.skip>true</maven.deploy.skip> </properties> <dependencies> diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 8bb0819..3888260 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -24,6 +24,9 @@ <redmine.releaseFiles> ${project.build.directory}/${project.build.finalName}.war </redmine.releaseFiles> + + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <build> diff --git a/pom.xml b/pom.xml index 0c40527..9fbfbcd 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>1.2</version> + <version>5-rc-2</version> </parent> <groupId>org.chorem</groupId> @@ -143,11 +143,9 @@ </modules> <scm> - <connection>scm:git:http://git.chorem.org/pollen.git</connection> - <developerConnection> - scm:git:https://git.chorem.org/pollen.git - </developerConnection> - <url>https://gitweb.chorem.org/pollen.git</url> + <url>https://gitlab.nuiton.org/chorem/pollen</url> + <connection>scm:git:git@gitlab.nuiton.org:chorem/pollen.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:chorem/pollen.git</developerConnection> </scm> <distributionManagement> <site> @@ -189,17 +187,8 @@ <!--Site configuration --> <locales>en,fr</locales> - <scmwebeditorEnabled>true</scmwebeditorEnabled> - - <!-- java configuration --> - <!-- Using Java 7 --> - <javaVersion>1.7</javaVersion> - <!--TODO remove this when IDEA won't ask to change jdk level at each pom modification--> - <maven.compiler.source>${javaVersion}</maven.compiler.source> - <!--TODO remove this when IDEA won't ask to change jdk level at each pom modification--> - <maven.compiler.target>${javaVersion}</maven.compiler.target> - <signatureArtifactId>java17</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> + <siteSourcesType>rst</siteSourcesType> + </properties> <repositories> diff --git a/src/site/site_en.xml b/src/site/site_en.xml index b3ef142..76d5330 100644 --- a/src/site/site_en.xml +++ b/src/site/site_en.xml @@ -22,76 +22,41 @@ #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> - <src alt="Pollen">${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> + <alt>Pollen</alt> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <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> - - <publishDate position="right" format="MM/dd/yyyy"/> - <version position="right"/> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/struts2-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://doc.nuiton.org/jrst" name="JRst" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/jrst-logo.png"/> + <logo href="http://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://doc.nuiton.org/topia" name="ToPIA" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/topia-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" + img="${siteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://http://www.webmotion-framework.org/" name="WebMotion"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - - <breadcrumbs> - <item name="${project.name}" href="./index.html"/> - </breadcrumbs> - <links> <item name="nuiton.org" href="http://www.nuiton.org"/> <item name="chorem.org" href="http://www.chorem.org"/> @@ -99,6 +64,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> + </breadcrumbs> + <menu name="User documentation"> <item name="Home" href="./index.html"/> <item name="Vote counting methods" href="./methods.html"/> @@ -130,19 +100,14 @@ <menu ref="reports"/> <footer> - <div id='projectMetas' locale='en' - projectversion='${project.version}' + <div id='mavenProjectProperties' locale='en' 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=",install.html," - scmwebeditor_skipDefaultFiles="true"> - </div> + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmUrl='${project.scm.connection}' + editorUrl='${project.scmwebeditorUrl}' + scmwebeditor_vmFiles=",install,"/> </footer> </body> diff --git a/src/site/site_fr.xml b/src/site/site_fr.xml index b9ada27..77828dc 100644 --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -22,76 +22,42 @@ #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> - <src alt="Pollen">${project.url}/logo.jpg</src> + <src>${project.url}/logo.jpg</src> <name>${project.name}</name> <href>index.html</href> + <alt>Pollen</alt> </bannerLeft> - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> - - <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> - - <publishDate position="right" format="dd/MM/yyyy"/> - <version position="right"/> - <poweredBy> <logo href="http://maven.apache.org" name="Maven" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/maven-feather.png"/> + img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> <logo href="http://struts.apache.org/" name="Struts 2" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos//struts2-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos//struts2-logo.png"/> <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/restructuredtext-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://doc.nuiton.org/jrst" name="JRst" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/jrst-logo.png"/> + <logo href="http://jrst.nuiton.org" name="JRst" + img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://doc.nuiton.org/topia" name="ToPIA" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/topia-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" + img="${siteCommonResourcesUrl}/images/logos/topia-logo.png"/> <logo href="http://http://www.webmotion-framework.org/" name="WebMotion"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${mavenpomSiteCommonResourcesUrl}/public/images/logos/argouml-logo.png"/> + img="${siteCommonResourcesUrl}/images/logos/argouml-logo.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" - src="${mavenpomSiteCommonResourcesUrl}/public/js/mavenpom-site.js"> - </script> - - <link rel="stylesheet" type="text/css" - href="${mavenpomSiteCommonResourcesUrl}/public/css/mavenpom-site.css"/> - </head> - - <breadcrumbs> - <item name="${project.name}" href="./index.html"/> - </breadcrumbs> - <links> <item name="Nuiton.org" href="http://forge.nuiton.org"/> <item name="Chorem.org" href="http://forge.chorem.org"/> @@ -99,6 +65,11 @@ <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> </links> + <breadcrumbs> + <item name="${project.name}" href="${project.url}/fr/index.html"/> + <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/fr/index.html"/> + </breadcrumbs> + <menu name="Documentation utilisateur"> <item name="Accueil" href="./index.html"/> <item name="Méthodes de dépouillement" href="./depouillement.html"/> @@ -128,20 +99,14 @@ <menu ref="reports"/> <footer> - - <div id='projectMetas' locale='fr' - projectversion='${project.version}' + <div id='mavenProjectProperties' locale='fr' 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=",install.html," - scmwebeditor_skipDefaultFiles="true"> - </div> + projectId='${project.projectId}' + version='${project.siteDeployClassifier}' + sourcesType='${project.siteSourcesType}' + scmUrl='${project.scm.connection}' + editorUrl='${project.scmwebeditorUrl}' + scmwebeditor_vmFiles=",install,"/> </footer> </body> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.