branch develop updated (6ed7e09 -> 2a221c3)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from 6ed7e09 [jgitflow-maven-plugin]updating poms for 1.3-SNAPSHOT development new 67565a5 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e84786c update file headers new 7995812 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions new 269cdab [jgitflow-maven-plugin]merging 'release/1.2' into 'master' new e5c70bb [jgitflow-maven-plugin]merging 'master' into 'develop' new 2a221c3 [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 2a221c3821ef3e3875cae1c6094fb7cc01177183 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:50 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e5c70bb017ed73bc13dc3faafcf652a85eb74bf9 Merge: 67565a5 269cdab Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:50 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 67565a552d74af573e6267d0715027d28ff51278 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:49 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 269cdabb6505f21c11fc3dac779ecae4e2bf91f7 Merge: 6f653f6 7995812 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:49 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.2' into 'master' commit 7995812cb317178b0a52a3180174288d52c004c4 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:30:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.2' with non-snapshot versions commit e84786c8b403e87b38178ed247fdf96452b2df53 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:30:03 2016 +0100 update file headers Summary of changes: .../java/fr/ifremer/coselmar/beans/HealthBean.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/coselmar/beans/LinkBean.java | 24 ++++++++++++++++++++++ .../ifremer/coselmar/beans/QuestionTreeNode.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 24 ++++++++++++++++++++++ .../src/main/webapp/css/d3-collapsible-tree.css | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/health.html | 23 +++++++++++++++++++++ .../src/main/webapp/js/d3-2waytree-graph.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/js/d3.layout.js | 23 +++++++++++++++++++++ .../webapp/views/questions/modalHierarchy.html | 23 +++++++++++++++++++++ 9 files changed, 211 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 in repository coselmar. See http://git.codelutin.com/coselmar.git commit e84786c8b403e87b38178ed247fdf96452b2df53 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:30:03 2016 +0100 update file headers --- .../java/fr/ifremer/coselmar/beans/HealthBean.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/coselmar/beans/LinkBean.java | 24 ++++++++++++++++++++++ .../ifremer/coselmar/beans/QuestionTreeNode.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 24 ++++++++++++++++++++++ .../src/main/webapp/css/d3-collapsible-tree.css | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/health.html | 23 +++++++++++++++++++++ .../src/main/webapp/js/d3-2waytree-graph.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/js/d3.layout.js | 23 +++++++++++++++++++++ .../webapp/views/questions/modalHierarchy.html | 23 +++++++++++++++++++++ 9 files changed, 211 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..d78dc9b 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 - 2016 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/beans/LinkBean.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LinkBean.java index a6075e7..570e307 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LinkBean.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/LinkBean.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 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/beans/QuestionTreeNode.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionTreeNode.java index b95cbb0..ee6743d 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionTreeNode.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/beans/QuestionTreeNode.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.beans; +/* + * #%L + * Coselmar :: Rest Services + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 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; import java.util.Date; import java.util.List; 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 5b68539..791d730 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 - 2016 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.beans.QuestionSearchExample; diff --git a/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css b/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css index c951a95..bedd266 100644 --- a/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css +++ b/coselmar-ui/src/main/webapp/css/d3-collapsible-tree.css @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 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% + */ /** * Get from https://github.com/kanesee/d3-2way-tree and modified for our case **/ diff --git a/coselmar-ui/src/main/webapp/health.html b/coselmar-ui/src/main/webapp/health.html index 8a4a8e4..97d3fdc 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 - 2016 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> diff --git a/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js b/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js index 93008fc..592e4ae 100644 --- a/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js +++ b/coselmar-ui/src/main/webapp/js/d3-2waytree-graph.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 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% + */ /** * Get from https://github.com/kanesee/d3-2way-tree and modified for our case **/ diff --git a/coselmar-ui/src/main/webapp/js/d3.layout.js b/coselmar-ui/src/main/webapp/js/d3.layout.js index a4e4529..251add8 100644 --- a/coselmar-ui/src/main/webapp/js/d3.layout.js +++ b/coselmar-ui/src/main/webapp/js/d3.layout.js @@ -1,3 +1,26 @@ +/* + * #%L + * Coselmar :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2016 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% + */ /** * Get from https://github.com/kanesee/d3-2way-tree and modified for our case **/ diff --git a/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html b/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html index 220931f..db0ef5d 100644 --- a/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html +++ b/coselmar-ui/src/main/webapp/views/questions/modalHierarchy.html @@ -1,3 +1,26 @@ +<!-- + #%L + Coselmar :: UI + $Id:$ + $HeadURL:$ + %% + Copyright (C) 2014 - 2016 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% + --> <link rel="stylesheet" href="css/d3-collapsible-tree.css"> <div xmlns="http://www.w3.org/1999/html"> -- 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 coselmar. See http://git.codelutin.com/coselmar.git commit 7995812cb317178b0a52a3180174288d52c004c4 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:30:23 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.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 1338680..53e5131 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.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 253a00c..8baf807 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.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 5f3b3f3..f0e020c 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.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 0c2069f..3070f4d 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.2-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index d4732c1..0288a70 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.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 in repository coselmar. See http://git.codelutin.com/coselmar.git commit 269cdabb6505f21c11fc3dac779ecae4e2bf91f7 Merge: 6f653f6 7995812 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:49 2016 +0100 [jgitflow-maven-plugin]merging 'release/1.2' into 'master' coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 2 +- coselmar-persistence/pom.xml | 8 +- .../coselmar/beans/DocumentSearchExample.java | 24 + .../coselmar/beans/QuestionSearchExample.java | 110 + .../fr/ifremer/coselmar/beans/SearchExample.java | 20 +- .../coselmar/config/CoselmarServicesConfig.java | 4 + .../config/CoselmarServicesConfigOption.java | 5 + .../persistence/entity/QuestionTopiaDao.java | 83 +- .../V1_2_0_1__7867_add_list_links_in_projects.sql | 34 + .../src/main/xmi/coselmar-model.zargo | Bin 10470 -> 10955 bytes .../resources/coselmar-persistence-test.properties | 3 +- coselmar-rest/pom.xml | 2 +- .../ifremer/coselmar/beans/DocumentSearchBean.java | 20 + .../java/fr/ifremer/coselmar/beans/HealthBean.java | 73 + .../java/fr/ifremer/coselmar/beans/LinkBean.java | 40 +- .../fr/ifremer/coselmar/beans/QuestionBean.java | 17 + .../coselmar/beans/QuestionExportModel.java | 21 +- ...mentSearchBean.java => QuestionSearchBean.java} | 48 +- .../ifremer/coselmar/beans/QuestionTreeNode.java | 116 ++ .../java/fr/ifremer/coselmar/beans/UserBean.java | 9 + .../fr/ifremer/coselmar/beans/UserExportModel.java | 76 + .../coselmar/converter/BeanEntityConverter.java | 84 + .../services/CoselmarRestApplicationListener.java | 6 +- .../coselmar/services/indexation/LuceneUtils.java | 9 +- .../indexation/QuestionsIndexationService.java | 1 + .../indexation/TransverseIndexationService.java | 13 - .../coselmar/services/v1/DocumentsWebService.java | 38 +- .../coselmar/services/v1/HealthService.java | 79 + .../coselmar/services/v1/QuestionsWebService.java | 363 +++- .../coselmar/services/v1/UsersWebService.java | 58 + .../i18n/coselmar-services_en_GB.properties | 24 +- .../i18n/coselmar-services_fr_FR.properties | 23 +- coselmar-rest/src/main/resources/mapping | 9 +- .../coselmar/services/QuestionsWebServiceTest.java | 2 +- .../indexation/DocumentsIndexationServiceTest.java | 22 +- .../indexation/QuestionsIndexationServiceTest.java | 2 +- .../src/test/resources/coselmar-test.properties | 3 +- coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 53 +- .../src/main/webapp/css/d3-collapsible-tree.css | 132 ++ coselmar-ui/src/main/webapp/health.html | 53 + coselmar-ui/src/main/webapp/i18n/en.js | 24 +- coselmar-ui/src/main/webapp/i18n/fr.js | 32 +- coselmar-ui/src/main/webapp/index.html | 3 + .../src/main/webapp/js/coselmar-admin-services.js | 2 +- .../src/main/webapp/js/coselmar-constants.js | 13 +- .../src/main/webapp/js/coselmar-controllers.js | 361 +++- .../main/webapp/js/coselmar-general-services.js | 2 +- .../{coselmar-constants.js => coselmar-health.js} | 18 +- .../main/webapp/js/coselmar-questions-services.js | 18 +- .../src/main/webapp/js/coselmar-services.js | 2 +- .../src/main/webapp/js/coselmar-user-services.js | 7 +- .../src/main/webapp/js/d3-2waytree-graph.js | 447 ++++ coselmar-ui/src/main/webapp/js/d3.layout.js | 2146 ++++++++++++++++++++ .../src/main/webapp/views/documents/documents.html | 2 +- .../main/webapp/views/documents/editDocument.html | 13 +- .../webapp/views/documents/modalDocumentEdit.html | 17 +- .../main/webapp/views/documents/newdocument.html | 13 +- .../src/main/webapp/views/documents/toolsPart.html | 113 +- .../main/webapp/views/documents/viewDocument.html | 4 +- coselmar-ui/src/main/webapp/views/home.html | 56 +- .../src/main/webapp/views/links/modalLinkEdit.html | 81 + .../main/webapp/views/questions/editquestion.html | 44 +- .../users.html => questions/modalHierarchy.html} | 30 +- .../src/main/webapp/views/questions/questions.html | 35 +- .../src/main/webapp/views/questions/toolsPart.html | 165 ++ .../main/webapp/views/questions/viewquestion.html | 22 +- .../main/webapp/views/referential/referential.html | 4 +- .../src/main/webapp/views/users/searchPart.html | 10 +- coselmar-ui/src/main/webapp/views/users/users.html | 8 + pom.xml | 16 +- 72 files changed, 5044 insertions(+), 363 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 in repository coselmar. See http://git.codelutin.com/coselmar.git commit 67565a552d74af573e6267d0715027d28ff51278 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:49 2016 +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 f42470c..53e5131 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.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index f11f0e8..8baf807 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.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 25c040a..f0e020c 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.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 24112a8..3070f4d 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.3-SNAPSHOT</version> + <version>1.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 534c3b4..0288a70 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.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 in repository coselmar. See http://git.codelutin.com/coselmar.git commit e5c70bb017ed73bc13dc3faafcf652a85eb74bf9 Merge: 67565a5 269cdab Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:50 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' .../java/fr/ifremer/coselmar/beans/HealthBean.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/coselmar/beans/LinkBean.java | 24 ++++++++++++++++++++++ .../ifremer/coselmar/beans/QuestionTreeNode.java | 24 ++++++++++++++++++++++ .../coselmar/services/v1/HealthService.java | 24 ++++++++++++++++++++++ .../src/main/webapp/css/d3-collapsible-tree.css | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/health.html | 23 +++++++++++++++++++++ .../src/main/webapp/js/d3-2waytree-graph.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/js/d3.layout.js | 23 +++++++++++++++++++++ .../webapp/views/questions/modalHierarchy.html | 23 +++++++++++++++++++++ 9 files changed, 211 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 in repository coselmar. See http://git.codelutin.com/coselmar.git commit 2a221c3821ef3e3875cae1c6094fb7cc01177183 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jan 14 16:31:50 2016 +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 53e5131..f42470c 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.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 8baf807..f11f0e8 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.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index f0e020c..25c040a 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.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 3070f4d..24112a8 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.2</version> + <version>1.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 0288a70..534c3b4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>1.2</version> + <version>1.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