branch develop updated (64f3e3d -> aa3b322)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) new e9de68c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds cfd8f88 [jgitflow-maven-plugin]updating poms for branch '5.0-RC4' with snapshot versions new 274da5a [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions new 29a5c2b Merge branch 'release/5.0-RC4' new 9f71c77 Merge branch 'master' into develop new aa3b322 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 aa3b322c41ff1756cf410bfc1ef9396ac61b38d8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 9f71c773a19f091eaad5d89fd889ce0f79f0f7a8 Merge: e9de68c 29a5c2b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 Merge branch 'master' into develop commit e9de68c4c880842f679d5279ccec5d10612bc860 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 29a5c2bbaf378180ea48b058cbeb3eee86c5e575 Merge: ff93260 274da5a Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:44 2015 +0000 Merge branch 'release/5.0-RC4' commit 274da5a82d14edf246679ab826b2edbe801242e8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:05:14 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions Summary of changes: -- 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 wao. See http://git.codelutin.com/wao.git commit 274da5a82d14edf246679ab826b2edbe801242e8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:05:14 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC4' with non-snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ab017ee..03c1dec 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4-SNAPSHOT</version> + <version>5.0-RC4</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index f7fa705..d9d44a9 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4-SNAPSHOT</version> + <version>5.0-RC4</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 81e43ef..7aa07cf 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4-SNAPSHOT</version> + <version>5.0-RC4</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 545ef02..f08653b 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4-SNAPSHOT</version> + <version>5.0-RC4</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit 29a5c2bbaf378180ea48b058cbeb3eee86c5e575 Merge: ff93260 274da5a Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:44 2015 +0000 Merge branch 'release/5.0-RC4' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 2 ++ .../entity/SclerochronologySamplingContext.java | 16 +++++++++++++-- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ wao-services/pom.xml | 2 +- .../service/administration/WaoUsersList.java | 2 +- wao-web/pom.xml | 2 +- .../wao/web/action/AbstractImportCsvAction.java | 2 +- 9 files changed, 46 insertions(+), 8 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 wao. See http://git.codelutin.com/wao.git commit e9de68c4c880842f679d5279ccec5d10612bc860 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8da7a50..03c1dec 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC4</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 26c6ea3..d9d44a9 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC4</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3d39d69..7aa07cf 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC4</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d54b842..f08653b 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC4</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit 9f71c773a19f091eaad5d89fd889ce0f79f0f7a8 Merge: e9de68c 29a5c2b Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:45 2015 +0000 Merge branch 'master' into develop -- 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 wao. See http://git.codelutin.com/wao.git commit aa3b322c41ff1756cf410bfc1ef9396ac61b38d8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Feb 13 14:07:46 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 03c1dec..8da7a50 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4</version> + <version>5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index d9d44a9..26c6ea3 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 7aa07cf..3d39d69 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index f08653b..d54b842 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC4</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm