branch develop updated (f005d30 -> 2379fdd)
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 f005d30 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds dfd0132 Ajout du référentiel d'espèces cibles dans le modèle (refs #5973)) adds 69befc9 Introduction de la notion de laboratoire et d'organisation dans le modèle, on lie l'utilisateur à l'organisation et la ligne du plan à l'organisation (refs #2262) adds be716c0 Déclaration du programme Sclérochronologie new aae647d Merge branch 'develop' of https://git.codelutin.com/wao into develop new 2379fdd POM en 4.3-SNAPSHOT The 2 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 2379fdd1613661dcf0558679e069c1c15dcefe45 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 18:02:44 2014 +0100 POM en 4.3-SNAPSHOT commit aae647d7212ff0e9dd8bb1060c0ca2a6d0a03e73 Merge: be716c0 f005d30 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 18:00:45 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/wao into develop Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../fr/ifremer/wao/entity/ContactTopiaDao.java | 4 +- .../java/fr/ifremer/wao/entity/ObsProgram.java | 7 ++- .../fr/ifremer/wao/entity/OrganisationImpl.java | 8 ++- .../java/fr/ifremer/wao/entity/SampleRowImpl.java | 20 +++++++ .../fr/ifremer/wao/entity/SampleRowLogImpl.java | 4 +- .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 2 +- .../java/fr/ifremer/wao/entity/WaoUserImpl.java | 10 ++++ .../fr/ifremer/wao/entity/WaoUserTopiaDao.java | 2 +- .../V4_3__add_species,_add_laboratories.sql | 58 +++++++++++++++++++++ .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 1 + wao-persistence/src/main/xmi/wao-model.properties | 2 +- wao-persistence/src/main/xmi/wao-model.zargo | Bin 59661 -> 61426 bytes wao-services/pom.xml | 2 +- .../service/administration/WaoUsersService.java | 4 +- ...bsMerObsVenteSamplingPlanImportExportModel.java | 2 +- wao-web/pom.xml | 2 +- 19 files changed, 117 insertions(+), 16 deletions(-) copy wao-web/src/main/webapp/wao-screen.css => wao-persistence/src/main/java/fr/ifremer/wao/entity/OrganisationImpl.java (85%) create mode 100644 wao-persistence/src/main/resources/db/migration/V4_3__add_species,_add_laboratories.sql -- 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 aae647d7212ff0e9dd8bb1060c0ca2a6d0a03e73 Merge: be716c0 f005d30 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 18:00:45 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/wao into develop 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(-) -- 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 2379fdd1613661dcf0558679e069c1c15dcefe45 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Dec 2 18:02:44 2014 +0100 POM en 4.3-SNAPSHOT --- 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 6e6ffae..8314568 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3-SNAPSHOT</version> + <version>4.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index a91470b..1088332 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3-SNAPSHOT</version> + <version>4.3-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 40b7f30..3932503 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3-SNAPSHOT</version> + <version>4.3-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 5f7711b..da11f36 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.3-SNAPSHOT</version> + <version>4.3-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