This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 81bb131 Les corrections orthographiques (fixes #8975) new c4ab5c1 Configuration pour générer le site dans une branche pages new 4f937a4 Add missing license header new 0cd5a2e add ci The 3 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 0cd5a2e75a5ff948313e2cf546c5cd2b89dc8638 Author: Tony CHEMIT <dev@tchemit.fr> Date: Mon Jan 30 21:17:44 2017 +0100 add ci commit 4f937a410ea64419999dcd2b33d09df483179f85 Author: Tony CHEMIT <dev@tchemit.fr> Date: Mon Jan 30 18:13:40 2017 +0100 Add missing license header commit c4ab5c10459b14ab2b9a669a4de05c95b193f1a5 Author: Tony CHEMIT <dev@tchemit.fr> Date: Mon Jan 30 18:13:29 2017 +0100 Configuration pour générer le site dans une branche pages Summary of changes: .gitlab-ci.yml | 8 ++++++ .../entities/referentiel/SpeciesTopiaDao.java | 22 ++++++++++++++++ pom.xml | 30 +++++++++++++++++++--- .../maven/plugins/toolbox/MergeI18nBundleMojo.java | 22 ++++++++++++++++ 4 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 .gitlab-ci.yml -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c4ab5c10459b14ab2b9a669a4de05c95b193f1a5 Author: Tony CHEMIT <dev@tchemit.fr> Date: Mon Jan 30 18:13:29 2017 +0100 Configuration pour générer le site dans une branche pages --- pom.xml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 91473f5..053c97c 100644 --- a/pom.xml +++ b/pom.xml @@ -975,6 +975,27 @@ <pluginManagement> <plugins> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-scm-publish-plugin</artifactId> + <version>1.1</version> + <configuration> + <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.build.directory}/staging</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin --> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- plugin site --> <plugin> <artifactId>maven-site-plugin</artifactId> @@ -985,6 +1006,9 @@ <version>${jrstPluginVersion}</version> </dependency> </dependencies> + <configuration> + <skipDeploy>true</skipDeploy> + </configuration> </plugin> <plugin> @@ -1172,7 +1196,7 @@ <reporting> <plugins> - <plugin> + <!--plugin> <groupId>org.nuiton</groupId> <artifactId>nuiton-config-maven-plugin</artifactId> <version>${nuitonConfigVersion}</version> @@ -1187,7 +1211,7 @@ <configuration> <i18nBundleName>${projectId}-i18n</i18nBundleName> </configuration> - </plugin> + </plugin--> </plugins> </reporting> @@ -1210,7 +1234,7 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="entities/src/main/xmi"> + <fileset dir="persistence/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4f937a410ea64419999dcd2b33d09df483179f85 Author: Tony CHEMIT <dev@tchemit.fr> Date: Mon Jan 30 18:13:40 2017 +0100 Add missing license header --- .../entities/referentiel/SpeciesTopiaDao.java | 22 ++++++++++++++++++++++ .../maven/plugins/toolbox/MergeI18nBundleMojo.java | 22 ++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java index 6e3427e..723d138 100644 --- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.referentiel; +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.longline.CatchLongline; import fr.ird.observe.persistence.ObserveEntityEnum; import org.hibernate.Session; diff --git a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java index 9b8574d..daed043 100644 --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/MergeI18nBundleMojo.java @@ -1,5 +1,27 @@ package fr.ird.observe.maven.plugins.toolbox; +/*- + * #%L + * ObServe :: Toolbox Maven plugin + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 0cd5a2e75a5ff948313e2cf546c5cd2b89dc8638 Author: Tony CHEMIT <dev@tchemit.fr> Date: Mon Jan 30 21:17:44 2017 +0100 add ci --- .gitlab-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..84d5e28 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,8 @@ +pages: + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm