This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-utils. See https://gitlab.nuiton.org/nuiton/nuiton-utils.git commit c4ec83261974051472875519f5dd6831f4fc21f8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Apr 13 11:32:39 2018 +0200 Deploy site on gitlab pages --- .gitignore | 10 ++++------ .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++ pom.xml | 25 ++++++++++++++----------- src/site/site.xml | 19 +++++-------------- 4 files changed, 53 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 78e7d43..5071835 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ -/target -/.idea -/*.ipr -/*.iml -/*.iws -/*~ \ No newline at end of file +target +.idea +*.iml +*~ \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..cc38cee --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,30 @@ +image: registry.nuiton.org/codelutin/dockerfiles:maven-release + +stages: +- build +- deploy +- reporting + +build: + stage: build + script: + - mvn install + +snapshot: + stage: deploy + only: + - develop + script: + - mvn deploy -Prelease-profile + +pages: + stage: reporting + only: + - develop + artifacts: + paths: + - public + script: + - mvn install && mvn site -Preporting + - mv target/site public + diff --git a/pom.xml b/pom.xml index d9cb049..cd130cb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,8 +25,8 @@ <parent> <groupId>org.nuiton</groupId> - <artifactId>nuitonpom</artifactId> - <version>10.5</version> + <artifactId>mop</artifactId> + <version>1-SNAPSHOT</version> </parent> <artifactId>nuiton-utils</artifactId> @@ -128,8 +128,8 @@ <properties> <!-- redmine project Id --> - <projectId>nuiton-utils</projectId> - <ciViewId>nuiton-utils</ciViewId> + <projectName>nuiton-utils</projectName> + <projectGroup>nuiton</projectGroup> <!-- Java level --> <javaVersion>1.8</javaVersion> @@ -146,13 +146,6 @@ <!-- Documentation is in apt format --> <siteSourcesType>apt</siteSourcesType> <locales>fr</locales> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - </properties> <dependencies> @@ -238,6 +231,16 @@ <version>${nuitonI18nVersion}</version> </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>2.3-SNAPSHOT</version> + </dependency> + </dependencies> + </plugin> </plugins> </pluginManagement> <plugins> diff --git a/src/site/site.xml b/src/site/site.xml index db1a14f..78c324b 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -3,7 +3,7 @@ #%L Nuiton Utils %% - Copyright (C) 2004 - 2010 CodeLutin + Copyright (C) 2004 - 2018 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -23,9 +23,9 @@ <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.6.0" + xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.6.0 http://maven.apache.org/xsd/decoration-1.6.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -33,8 +33,9 @@ </bannerLeft> <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <src>http://www.codelutin.com/img/logos/code-lutin.svg</src> <href>http://www.codelutin.com</href> + <width>250</width> </bannerRight> <body> @@ -47,7 +48,6 @@ <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -56,14 +56,5 @@ </menu> <menu ref="reports"/> - - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}' - scmwebeditor_vmFiles=",update,"/> - </footer> - </body> </project> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.