branch develop-1.0.x updated (c6d3f5e -> 3ef5f4b)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git from c6d3f5e [jgitflow-maven-plugin]updating poms for 1.0.3-SNAPSHOT development new 5c03658 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 5fb321e [jgitflow-maven-plugin]updating poms for 1.0.2 branch with snapshot versions new c7b15ec update file headers new 33a37c3 [jgitflow-maven-plugin]updating poms for branch'release/1.0.2' with non-snapshot versions new e6926a7 [jgitflow-maven-plugin]merging 'release/1.0.2' into 'master-1.0.x' new 711635a [jgitflow-maven-plugin]merging 'master-1.0.x' into 'develop-1.0.x' new 3ef5f4b [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 3ef5f4b7617ab425118e1c9b47b703ee96d75e9f Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:57 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 711635a62201814abee4d16cd7509655a7f77bb1 Merge: 5c03658 e6926a7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:57 2015 +0100 [jgitflow-maven-plugin]merging 'master-1.0.x' into 'develop-1.0.x' commit 5c036580166e670cfba8dab432083816bb9e0935 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:57 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e6926a745cc5a86dbe3d468efc0c938ac41c7746 Merge: 2a426c4 33a37c3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:55 2015 +0100 [jgitflow-maven-plugin]merging 'release/1.0.2' into 'master-1.0.x' commit 33a37c38298df225acc2b29d5467c2b092ecf393 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:40:29 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.0.2' with non-snapshot versions commit c7b15ec4e742f1afd0282ea485d8312cf8e809d5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:40:15 2015 +0100 update file headers Summary of changes: .../java/fr/ifremer/coselmar/beans/HealthBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/health.html | 23 +++++++++++++++++++++ 3 files changed, 71 insertions(+) -- 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-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit c7b15ec4e742f1afd0282ea485d8312cf8e809d5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:40:15 2015 +0100 update file headers --- .../java/fr/ifremer/coselmar/beans/HealthBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/health.html | 23 +++++++++++++++++++++ 3 files changed, 71 insertions(+) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/HealthBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/HealthBean.java index fa90591..4c614a2 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/HealthBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/HealthBean.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * 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 java.io.Serializable; /** diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java index 8415042..1bf1df2 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/v1/HealthService.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.v1; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2015 Ifremer, Code Lutin + * %% + * 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.ifremer.coselmar.beans.HealthBean; import fr.ifremer.coselmar.beans.QuestionSearchBean; import fr.ifremer.coselmar.persistence.entity.Privacy; diff --git a/coselmar-ui/src/main/webapp/health.html b/coselmar-ui/src/main/webapp/health.html index 235d109..5499fcf 100644 --- a/coselmar-ui/src/main/webapp/health.html +++ b/coselmar-ui/src/main/webapp/health.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 - 2015 Ifremer, Code Lutin + %% + 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% + --> <html ng-app="coselmarApp" ng-controller="HealthCtrl"> <head> -- 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-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit 33a37c38298df225acc2b29d5467c2b092ecf393 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:40:29 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.0.2' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index c742778..ff41be0 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d027a63..cea1be7 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index ca133f8..8b2e8f8 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 20f04f7..3bd703d 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 4363567..a1c9a3a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2-SNAPSHOT</version> + <version>1.0.2</version> <packaging>pom</packaging> <name>Coselmar</name> -- 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-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit e6926a745cc5a86dbe3d468efc0c938ac41c7746 Merge: 2a426c4 33a37c3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:55 2015 +0100 [jgitflow-maven-plugin]merging 'release/1.0.2' into 'master-1.0.x' coselmar-bundle/pom.xml | 4 +- coselmar-persistence/pom.xml | 2 +- .../coselmar/config/CoselmarServicesConfig.java | 4 ++ .../config/CoselmarServicesConfigOption.java | 5 ++ coselmar-rest/pom.xml | 2 +- .../java/fr/ifremer/coselmar/beans/HealthBean.java | 73 ++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 78 ++++++++++++++++++++++ .../i18n/coselmar-services_en_GB.properties | 2 +- .../i18n/coselmar-services_fr_FR.properties | 2 +- coselmar-rest/src/main/resources/mapping | 5 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/health.html | 53 +++++++++++++++ coselmar-ui/src/main/webapp/js/coselmar-health.js | 37 ++++++++++ pom.xml | 10 ++- 14 files changed, 270 insertions(+), 9 deletions(-) -- 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-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit 5c036580166e670cfba8dab432083816bb9e0935 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:57 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index ff19fc6..ff41be0 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f6a6af7..cea1be7 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index d3f0206..8b2e8f8 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index f068e5a..3bd703d 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index dab5056..a1c9a3a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.2</version> <packaging>pom</packaging> <name>Coselmar</name> -- 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-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit 711635a62201814abee4d16cd7509655a7f77bb1 Merge: 5c03658 e6926a7 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:57 2015 +0100 [jgitflow-maven-plugin]merging 'master-1.0.x' into 'develop-1.0.x' .../java/fr/ifremer/coselmar/beans/HealthBean.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/health.html | 23 +++++++++++++++++++++ 3 files changed, 71 insertions(+) -- 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-1.0.x in repository coselmar. See http://git.codelutin.com/coselmar.git commit 3ef5f4b7617ab425118e1c9b47b703ee96d75e9f Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 18 17:41:57 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index ff41be0..ff19fc6 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index cea1be7..f6a6af7 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 8b2e8f8..d3f0206 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 3bd703d..f068e5a 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index a1c9a3a..dab5056 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm