This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 1c09d5152e58cf397f057521aa2d95e5594bb3d7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 18 16:34:33 2015 +0100 Migration sur gitlab + utilisation chorempom 5-rc-2 --- pom.xml | 27 +++++---------------------- src/site/site.xml | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 46daaef..3782199 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>2.2</version> + <version>5-rc-2</version> </parent> <groupId>org.chorem</groupId> @@ -144,11 +144,9 @@ </modules> <scm> - <connection>scm:git:http://git.chorem.org/lima.git</connection> - <developerConnection> - scm:git:https://git.chorem.org/lima.git - </developerConnection> - <url>https://gitweb.chorem.org/lima.git</url> + <url>https://gitlab.nuiton.org/chorem/lima</url> + <connection>scm:git:git@gitlab.nuiton.org:chorem/lima.git</connection> + <developerConnection>scm:git:git@gitlab.nuiton.org:chorem/lima.git</developerConnection> </scm> <distributionManagement> <site> @@ -161,19 +159,6 @@ <projectId>lima</projectId> - <!-- compiler configuration --> - - <javaVersion>1.7</javaVersion> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - - <!--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> - <!-- customized libs version --> <eugeneVersion>2.14</eugeneVersion> <nuitonConfigVersion>3.0-rc-2</nuitonConfigVersion> @@ -221,9 +206,7 @@ <!-- Site configuration --> <locales>fr</locales> - - <!-- FIXME Remove this when using chorempom 1.8.2 --> - <dependencyPluginVersion>2.10</dependencyPluginVersion> + <siteSourcesType>rst</siteSourcesType> </properties> diff --git a/src/site/site.xml b/src/site/site.xml index ef5fd4c..ee0883f 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -44,7 +44,7 @@ img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://jaxx.nuiton.org/" name="Jaxx" + <logo href="http://jaxx.nuiton.org" name="Jaxx" img="${siteCommonResourcesUrl}/images/logos/jaxx-logo.png"/> </poweredBy> @@ -69,7 +69,7 @@ <item name="Téléchargements" href="http://forge.chorem.org/projects/lima/files"/> <item name="Contacts" href="contact.html"/> - <item name="Dépôt GIT" href="https://git.chorem.org/lima.git"/> + <item name="Dépôt GIT" href="https://gitlab.nuiton.org/chorem/lima.git"/> </menu> <menu name="Mode d'emploi" inherit="top"> <item name="Installer et lancer" href="install.html"/> @@ -86,6 +86,16 @@ <menu ref="reports"/> + <footer> + <div id='mavenProjectProperties' 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 chorem.org SCM administrator <admin+scm@chorem.org>.