branch develop updated (5ee8c04 -> dd1a924)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git from 5ee8c04 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new dd1a924 Deploy site on gitlab pages 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 dd1a9240708a042133c1eac39fb788e9cbf46193 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Apr 13 11:25:18 2018 +0200 Deploy site on gitlab pages Summary of changes: .gitlab-ci.yml | 29 +++++++++++++++++++++++++++++ pom.xml | 19 ++++++------------- src/site/site.xml | 21 ++++++--------------- 3 files changed, 41 insertions(+), 28 deletions(-) create mode 100644 .gitlab-ci.yml -- 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-j2r. See https://gitlab.nuiton.org/nuiton/nuiton-j2r.git commit dd1a9240708a042133c1eac39fb788e9cbf46193 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Apr 13 11:25:18 2018 +0200 Deploy site on gitlab pages --- .gitlab-ci.yml | 29 +++++++++++++++++++++++++++++ pom.xml | 19 ++++++------------- src/site/site.xml | 21 ++++++--------------- 3 files changed, 41 insertions(+), 28 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..f7cb3f5 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,29 @@ +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 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5909c83..11e92ab 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L Nuiton Java-2-R library %% - Copyright (C) 2006 - 2017 CodeLutin, Chemit Tony + Copyright (C) 2006 - 2018 CodeLutin, Chemit Tony %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -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-j2r</artifactId> @@ -104,21 +104,14 @@ <properties> <!-- redmine project Id --> - <projectId>nuiton-j2r</projectId> + <projectName>nuiton-j2r</projectName> + <projectGroup>nuiton</projectGroup> <license.licenseName>gpl_v3</license.licenseName> <rengineVersion>1.8-5</rengineVersion> <locales>fr</locales> <siteSourcesType>rst</siteSourcesType> - - <!-- Jar main class --> - <!--maven.jar.main.class>org.codelutin.j2r.RProxy</maven.jar.main.class--> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - <skipPostRelease>false</skipPostRelease> - <ciViewId>${projectId}</ciViewId> <javaVersion>1.7</javaVersion> <signatureArtifactId>java17</signatureArtifactId> @@ -172,7 +165,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <version>2.3-SNAPSHOT</version> </dependency> </dependencies> </plugin> diff --git a/src/site/site.xml b/src/site/site.xml index 6d630a1..0ae727d 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -3,7 +3,7 @@ #%L Nuiton Java-2-R %% - Copyright (C) 2006 - 2012 CodeLutin + Copyright (C) 2006 - 2018 CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -21,9 +21,9 @@ #L% --> -<project name="${project.name}" xmlns="http://maven.apache.org/DECORATION/1.4.0" +<project name="${project.name}" 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.4.0 http://maven.apache.org/xsd/decoration-1.4.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> @@ -31,15 +31,13 @@ </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> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${siteCommonResourcesUrl}/images/logos/maven-feather.png"/> - <logo href="http://jrst.nuiton.org" name="JRst" img="${siteCommonResourcesUrl}/images/logos/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" - img="${siteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> + <logo href="http://maven.apache.org" name="Maven" img="http://maven.apache.org/images/logos/maven-feather.png"/> </poweredBy> <body> @@ -78,12 +76,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='${project.siteSourcesType}'/> - </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