branch develop updated (8dc289e -> a73f267)
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 8dc289e [jgitflow-maven-plugin]updating poms for 0.6-SNAPSHOT development new c19f8f9 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5dba8bb prepare release new 9ebc85a [jgitflow-maven-plugin]updating poms for branch'release/0.5' with non-snapshot versions new 12c71d0 Merge branch 'release/0.5' new 2417d30 Merge branch 'master' into develop new a73f267 [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 a73f2672cc701c006650b860a775f110b11e45a2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:20 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2417d3082823246e050747c2fe9f389b3e3f116c Merge: c19f8f9 12c71d0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:20 2015 +0000 Merge branch 'master' into develop commit c19f8f9d78529c3b40a1fe6a374f37323e43d088 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:19 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 12c71d01f107c7288d4cd5aecf9cbf8812b0bca3 Merge: a319f1e 9ebc85a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:18 2015 +0000 Merge branch 'release/0.5' commit 9ebc85a2349833bb862756572c27adc1ec226b00 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:14:30 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.5' with non-snapshot versions commit 5dba8bbbfb0b90c2cbdf162343862ec6faf52b24 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:14:07 2015 +0000 prepare release Summary of changes: .../services/errors/NoResultException.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 5dba8bbbfb0b90c2cbdf162343862ec6faf52b24 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:14:07 2015 +0000 prepare release --- .../services/errors/NoResultException.java | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/NoResultException.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/NoResultException.java index 4817747..bfd55a2 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/NoResultException.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/services/errors/NoResultException.java @@ -1,5 +1,29 @@ package fr.ifremer.coselmar.services.errors; +/* + * #%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% + */ + /** * @author ymartel (martel@codelutin.com) */ -- 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 9ebc85a2349833bb862756572c27adc1ec226b00 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:14:30 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.5' 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 4b1cf61..0d57c63 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.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d5094fe..e32563a 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.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index c54358e..a369cfa 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.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7d1f199..b93f2b1 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.5-SNAPSHOT</version> + <version>0.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index cb154b9..8845b7c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.5</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 12c71d01f107c7288d4cd5aecf9cbf8812b0bca3 Merge: a319f1e 9ebc85a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:18 2015 +0000 Merge branch 'release/0.5' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- .../src/main/xmi/coselmar-model.zargo | Bin 10252 -> 10322 bytes coselmar-rest/pom.xml | 2 +- .../services/errors/NoResultException.java | 35 ++++++++++++++ .../coselmar/services/v1/DocumentsWebService.java | 52 +++++++++------------ coselmar-rest/src/main/resources/mapping | 1 + coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/css/coselmar.css | 10 +++- coselmar-ui/src/main/webapp/index.html | 2 +- .../src/main/webapp/views/documents/document.html | 4 +- .../src/main/webapp/views/documents/documents.html | 6 ++- .../views/documents/modalDocumentSearch.html | 6 ++- .../main/webapp/views/documents/newdocument.html | 2 +- .../main/webapp/views/questions/editquestion.html | 10 ++-- .../webapp/views/questions/newDocumentsPart.html | 6 ++- .../main/webapp/views/questions/viewquestion.html | 12 +++-- coselmar-ui/src/main/webapp/views/users/users.html | 2 +- pom.xml | 2 +- 19 files changed, 102 insertions(+), 56 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 c19f8f9d78529c3b40a1fe6a374f37323e43d088 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:19 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 56ad828..0d57c63 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.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 535dd82..e32563a 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.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index ddc338a..a369cfa 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.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 27df992..b93f2b1 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.5</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index c6233d9..8845b7c 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.5</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 2417d3082823246e050747c2fe9f389b3e3f116c Merge: c19f8f9 12c71d0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16:20 2015 +0000 Merge branch 'master' into develop .../services/errors/NoResultException.java | 24 ++++++++++++++++++++++ 1 file changed, 24 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 a73f2672cc701c006650b860a775f110b11e45a2 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 13 15:16: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 0d57c63..56ad828 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.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index e32563a..535dd82 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.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index a369cfa..ddc338a 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.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index b93f2b1..27df992 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.5</version> + <version>0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 8845b7c..c6233d9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5</version> + <version>0.6-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