branch develop updated (9b3a659 -> ba469dd)
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 9b3a659 On désactive l'envoi de mail si pas de SMTP configuré, on supprime la notion de devMode (termine #6685) new 29d7ece [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b0e0de5 [jgitflow-maven-plugin]updating poms for branch '5.0-RC5' with snapshot versions new 4f267c7 Correction d'une NPE lors des tests new 80d9669 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC5' with non-snapshot versions new 86eaaef Merge branch 'release/5.0-RC5' new 5a0b610 Merge branch 'master' into develop new ba469dd [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 ba469dd68e0901d684371a8e45d13d34520bc9a2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:09 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5a0b610c29a8dde2e52348a826184f72976de71c Merge: 29d7ece 86eaaef Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:09 2015 +0000 Merge branch 'master' into develop commit 29d7ece600d9730ff29c1e9dd2c91ca010be77f2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:08 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 86eaaef75899eb69e1fd404423b3de8a2ed52261 Merge: 29a5c2b 80d9669 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:07 2015 +0000 Merge branch 'release/5.0-RC5' commit 80d966995237d2d417d1ce7dd70b7f5e7333b4a0 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:14:17 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC5' with non-snapshot versions commit 4f267c7fa2609f7ee8c8257bccd31437f8e555e4 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:13:46 2015 +0000 Correction d'une NPE lors des tests Summary of changes: .../src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java | 2 ++ 1 file changed, 2 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 wao. See http://git.codelutin.com/wao.git commit 4f267c7fa2609f7ee8c8257bccd31437f8e555e4 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:13:46 2015 +0000 Correction d'une NPE lors des tests --- .../src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java b/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java index a9332ee..1235c60 100644 --- a/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java +++ b/wao-services/src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java @@ -91,6 +91,8 @@ public class WaoFixtures { waoUser = new WaoUserImpl(); waoUser.setOrganisation(organisation); waoUser.setLogin(login); + waoUser.setFirstName("Prénom de " + login); + waoUser.setLastName("Nom de " + login); waoUser.setActive(true); UserProfile userProfile = new UserProfileImpl(); userProfile.setUserRole(userRole); -- 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 80d966995237d2d417d1ce7dd70b7f5e7333b4a0 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:14:17 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC5' 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 830ae4f..f7babbc 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC5-SNAPSHOT</version> + <version>5.0-RC5</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index cd29c7e..15f559f 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-RC5-SNAPSHOT</version> + <version>5.0-RC5</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 9f56232..dc0864d 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-RC5-SNAPSHOT</version> + <version>5.0-RC5</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index a548eab..3d07973 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-RC5-SNAPSHOT</version> + <version>5.0-RC5</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 86eaaef75899eb69e1fd404423b3de8a2ed52261 Merge: 29a5c2b 80d9669 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:07 2015 +0000 Merge branch 'release/5.0-RC5' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../src/main/java/fr/ifremer/wao/WaoApplicationConfig.java | 5 ----- .../src/main/java/fr/ifremer/wao/WaoApplicationConfigOption.java | 5 ----- .../src/main/resources/i18n/wao-persistence_fr_FR.properties | 2 +- wao-services/pom.xml | 2 +- .../main/java/fr/ifremer/wao/services/service/ContactsService.java | 2 +- .../java/fr/ifremer/wao/services/service/SampleRowsFilterValues.java | 2 +- .../main/java/fr/ifremer/wao/services/service/mail/EmailService.java | 5 +++-- .../src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java | 2 ++ wao-web/pom.xml | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 2 +- wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp | 2 +- .../main/webapp/WEB-INF/content/sclerochronology/sampling-plan.jsp | 2 +- 14 files changed, 15 insertions(+), 22 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 29d7ece600d9730ff29c1e9dd2c91ca010be77f2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:08 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..f7babbc 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-RC5</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 26c6ea3..15f559f 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-RC5</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3d39d69..dc0864d 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-RC5</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d54b842..3d07973 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-RC5</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 5a0b610c29a8dde2e52348a826184f72976de71c Merge: 29d7ece 86eaaef Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:09 2015 +0000 Merge branch 'master' into develop .../src/test/java/fr/ifremer/wao/services/service/WaoFixtures.java | 2 ++ 1 file changed, 2 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 wao. See http://git.codelutin.com/wao.git commit ba469dd68e0901d684371a8e45d13d34520bc9a2 Author: Maven Release <maven-release@codelutin.com> Date: Wed Feb 18 17:17:09 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 f7babbc..8da7a50 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC5</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 15f559f..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-RC5</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index dc0864d..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-RC5</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 3d07973..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-RC5</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