branch develop updated (bacd44c -> 93c275a)
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 bacd44c [jgitflow-maven-plugin]updating poms for 0.7-SNAPSHOT development new e01e771 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b42365b Prepare release new 03ab385 [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions new 22b6b6a Merge branch 'release/0.6' new 0a52409 Merge branch 'master' into develop new 93c275a [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 93c275a45bb94935240e47edaa5e35b675f867d8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 0a52409996a06fce65caca808824073e80bbb868 Merge: e01e771 22b6b6a Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 Merge branch 'master' into develop commit e01e771259b10fdb80892ff9c7cf73846a84ca17 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 22b6b6a3d45c31b9669561fcb9cc7ec660b4b45f Merge: 12c71d0 03ab385 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:19 2015 +0000 Merge branch 'release/0.6' commit 03ab3850dab484f314f990aeb756dca430a2c378 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:31:36 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.6' with non-snapshot versions commit b42365bec824bc1cdfc29b6096fd670fdc1b1242 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:31:19 2015 +0000 Prepare release Summary of changes: .../src/test/java/fr/ifremer/DocumentDaoTest.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 23 +++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/documents/viewDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/users/users.html | 23 +++++++++++++++++++++ pom.xml | 2 +- 8 files changed, 163 insertions(+), 1 deletion(-) -- 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 b42365bec824bc1cdfc29b6096fd670fdc1b1242 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:31:19 2015 +0000 Prepare release --- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 23 +++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/documents/viewDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/users/users.html | 23 +++++++++++++++++++++ pom.xml | 2 +- 8 files changed, 163 insertions(+), 1 deletion(-) diff --git a/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java b/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java index 0143697..19b0fdf 100644 --- a/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java +++ b/coselmar-persistence/src/test/java/fr/ifremer/DocumentDaoTest.java @@ -1,5 +1,29 @@ package fr.ifremer; +/* + * #%L + * Coselmar :: Persistence + * $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.persistence.CoselmarTopiaPersistenceContext; import fr.ifremer.coselmar.persistence.entity.Document; import fr.ifremer.coselmar.persistence.entity.DocumentTopiaDao; diff --git a/coselmar-ui/src/main/webapp/i18n/en.js b/coselmar-ui/src/main/webapp/i18n/en.js index 75e7453..5cda814 100644 --- a/coselmar-ui/src/main/webapp/i18n/en.js +++ b/coselmar-ui/src/main/webapp/i18n/en.js @@ -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% + */ var translateEN = { "application.title" : "Coselmar Platform", diff --git a/coselmar-ui/src/main/webapp/i18n/fr.js b/coselmar-ui/src/main/webapp/i18n/fr.js index 979cfbd..9400af0 100644 --- a/coselmar-ui/src/main/webapp/i18n/fr.js +++ b/coselmar-ui/src/main/webapp/i18n/fr.js @@ -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% + */ var translateFR = { "application.title" : "Coselmar Plateforme", diff --git a/coselmar-ui/src/main/webapp/views/documents/editDocument.html b/coselmar-ui/src/main/webapp/views/documents/editDocument.html index 7a9df02..99c62e1 100644 --- a/coselmar-ui/src/main/webapp/views/documents/editDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/editDocument.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% + --> <div class="page-header" style="margin: 0"> <h2>{{document.name}}</h2> </div> diff --git a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html b/coselmar-ui/src/main/webapp/views/documents/viewDocument.html index 9c641e9..8f36a0b 100644 --- a/coselmar-ui/src/main/webapp/views/documents/viewDocument.html +++ b/coselmar-ui/src/main/webapp/views/documents/viewDocument.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% + --> <div class="page-header" style="margin: 0"> <h1> diff --git a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html index ea327fa..69834a3 100644 --- a/coselmar-ui/src/main/webapp/views/users/supervisorUsers.html +++ b/coselmar-ui/src/main/webapp/views/users/supervisorUsers.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% + --> <div class="table-responsive" ng-if="currentUser.role == 'SUPERVISOR'"> <div class="row"> diff --git a/coselmar-ui/src/main/webapp/views/users/users.html b/coselmar-ui/src/main/webapp/views/users/users.html index 6989a53..84baf0b 100644 --- a/coselmar-ui/src/main/webapp/views/users/users.html +++ b/coselmar-ui/src/main/webapp/views/users/users.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% + --> <div style="padding: 0px 0px 0px 30px"> <div class="page-header" style="margin: 0"> <h1> diff --git a/pom.xml b/pom.xml index eb9f416..0a4fab4 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>codelutinpom</artifactId> - <version>1.6</version> + <version>1.8.1</version> </parent> <groupId>fr.ifremer</groupId> -- 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 03ab3850dab484f314f990aeb756dca430a2c378 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:31:36 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.6' 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 56ad828..3c74ab6 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index df1fe91..7e99b61 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 63682c5..48ab21f 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 872db46..6e5aec2 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 0a4fab4..717a674 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</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 22b6b6a3d45c31b9669561fcb9cc7ec660b4b45f Merge: 12c71d0 03ab385 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:19 2015 +0000 Merge branch 'release/0.6' coselmar-bundle/pom.xml | 2 +- .../src/main/webapp/js/coselmar-constants.js | 3 +- coselmar-persistence/pom.xml | 40 ++- .../coselmar}/config/CoselmarServicesConfig.java | 4 +- .../config/CoselmarServicesConfigOption.java | 2 +- .../exceptions}/CoselmarTechnicalException.java | 2 +- .../persistence/entity/CoselmarUserTopiaDao.java | 8 +- .../i18n/coselmar-persistence_en_GB.properties | 2 + .../i18n/coselmar-persistence_fr_FR.properties | 2 + .../src/main/xmi/coselmar-model.zargo | Bin 10322 -> 10390 bytes .../java/fr/ifremer/AbstractCoselmarDaoTest.java | 19 +- .../src/test/java/fr/ifremer/DocumentDaoTest.java | 99 ++++++++ .../ifremer}/FakeCoselmarApplicationContext.java | 141 ++--------- .../resources/coselmar-persistence-test.properties | 0 coselmar-rest/pom.xml | 6 +- .../fr/ifremer/coselmar/beans/DocumentBean.java | 49 +++- .../fr/ifremer/coselmar/beans/UserSearchBean.java | 10 +- .../coselmar/converter/BeanEntityConverter.java | 17 +- .../services/CoselmarApplicationContext.java | 2 +- .../CoselmarServicesApplicationContext.java | 2 +- .../coselmar/services/CoselmarServicesContext.java | 2 +- .../services/CoselmarSimpleServiceSupport.java | 2 +- .../services/CoselmarWebServiceSupport.java | 3 +- .../services/DefaultCoselmarServicesContext.java | 3 +- .../indexation/DocumentsIndexationService.java | 9 +- .../coselmar/services/indexation/LuceneUtils.java | 2 +- .../indexation/QuestionsIndexationService.java | 11 +- .../coselmar/services/v1/AdminWebService.java | 4 +- .../coselmar/services/v1/DocumentsWebService.java | 166 ++++++++++-- .../coselmar/services/v1/QuestionsWebService.java | 2 +- .../coselmar/services/v1/UsersWebService.java | 80 ++++-- .../main/resources/coselmar-services.properties | 2 + coselmar-rest/src/main/resources/mapping | 7 +- .../services/FakeCoselmarApplicationContext.java | 4 +- .../services/FakeCoselmarServicesContext.java | 2 +- .../coselmar/services/UsersWebServiceTest.java | 54 +++- .../indexation/DocumentsIndexationServiceTest.java | 32 +-- .../indexation/QuestionsIndexationServiceTest.java | 12 + coselmar-ui/pom.xml | 8 +- coselmar-ui/src/main/webapp/css/coselmar.css | 6 + coselmar-ui/src/main/webapp/i18n/en.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 233 +++++++++++++++++ coselmar-ui/src/main/webapp/img/en.png | Bin 0 -> 599 bytes coselmar-ui/src/main/webapp/img/fr.png | Bin 0 -> 545 bytes coselmar-ui/src/main/webapp/index.html | 64 +++-- .../src/main/webapp/js/coselmar-constants.js | 5 +- .../src/main/webapp/js/coselmar-controllers.js | 280 ++++++++++++++++----- .../main/webapp/js/coselmar-questions-services.js | 14 +- .../src/main/webapp/js/coselmar-services.js | 52 +++- .../src/main/webapp/js/coselmar-user-services.js | 39 +-- coselmar-ui/src/main/webapp/js/coselmar.js | 16 +- .../src/main/webapp/views/admin/admintools.html | 12 +- .../src/main/webapp/views/documents/document.html | 78 +----- .../src/main/webapp/views/documents/documents.html | 28 +-- .../{newdocument.html => editDocument.html} | 106 ++++---- .../webapp/views/documents/modalDocumentEdit.html | 66 ++--- .../views/documents/modalDocumentSearch.html | 16 +- .../main/webapp/views/documents/newdocument.html | 73 +++--- .../documents/{document.html => viewDocument.html} | 58 +++-- .../main/webapp/views/questions/closeQuestion.html | 14 +- .../main/webapp/views/questions/editquestion.html | 60 ++--- .../views/questions/modalQuestionSearch.html | 14 +- .../webapp/views/questions/newDocumentsPart.html | 12 +- .../main/webapp/views/questions/newquestion.html | 4 +- .../src/main/webapp/views/questions/question.html | 16 +- .../src/main/webapp/views/questions/questions.html | 26 +- .../views/questions/viewRestrictedQuestion.html | 6 +- .../main/webapp/views/questions/viewquestion.html | 52 ++-- .../main/webapp/views/referential/referential.html | 35 +-- .../src/main/webapp/views/users/adminUsers.html | 122 +++++++++ .../src/main/webapp/views/users/edituser.html | 98 ++++++-- .../src/main/webapp/views/users/newuser.html | 15 +- .../main/webapp/views/users/supervisorUsers.html | 123 +++++++++ coselmar-ui/src/main/webapp/views/users/user.html | 26 +- coselmar-ui/src/main/webapp/views/users/users.html | 61 +---- pom.xml | 28 ++- 76 files changed, 2045 insertions(+), 861 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 e01e771259b10fdb80892ff9c7cf73846a84ca17 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 [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 008ba9a..3c74ab6 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index bb42a95..7e99b61 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 94bbebf..48ab21f 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index d27dd42..6e5aec2 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index b2303ef..10e2d14 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.6</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 0a52409996a06fce65caca808824073e80bbb868 Merge: e01e771 22b6b6a Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 Merge branch 'master' into develop .../src/test/java/fr/ifremer/DocumentDaoTest.java | 24 ++++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/en.js | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/i18n/fr.js | 23 +++++++++++++++++++++ .../main/webapp/views/documents/editDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/documents/viewDocument.html | 23 +++++++++++++++++++++ .../main/webapp/views/users/supervisorUsers.html | 23 +++++++++++++++++++++ coselmar-ui/src/main/webapp/views/users/users.html | 23 +++++++++++++++++++++ pom.xml | 2 +- 8 files changed, 163 insertions(+), 1 deletion(-) -- 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 93c275a45bb94935240e47edaa5e35b675f867d8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 09:33:20 2015 +0000 [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 3c74ab6..008ba9a 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 7e99b61..bb42a95 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 48ab21f..94bbebf 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 6e5aec2..d27dd42 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6</version> + <version>0.7-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 717a674..16cfb31 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.6</version> + <version>0.7-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