branch develop updated (1b9676d -> 6b7a0f0)
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 1b9676d Mise à jour des dépendances new 27f2c02 POM en 5.0-SNAPSHOT, conformément à la feuille de route new 0206540 Utilisation du code permanent comme clé du référentiel des espèces (et non le aphiaId) (fixes #5973) new 6b7a0f0 Fusion du référentiel des espèces cibles dans develop (fixes #5973) The 3 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 6b7a0f0f3d55eff1c42950ce370f742588127dec Merge: 27f2c02 0206540 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 17:09:16 2014 +0100 Fusion du référentiel des espèces cibles dans develop (fixes #5973) commit 27f2c02b206e0b549db266cc3503ef394ca0157d Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 17:07:04 2014 +0100 POM en 5.0-SNAPSHOT, conformément à la feuille de route commit 02065406afa483bbbe542eaf5e0655174ada1bbd Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 17:05:15 2014 +0100 Utilisation du code permanent comme clé du référentiel des espèces (et non le aphiaId) (fixes #5973) Summary of changes: pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- .../wao/services/service/administration/ReferentialService.java | 6 +++--- wao-web/pom.xml | 2 +- 5 files changed, 7 insertions(+), 7 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 02065406afa483bbbe542eaf5e0655174ada1bbd Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 17:05:15 2014 +0100 Utilisation du code permanent comme clé du référentiel des espèces (et non le aphiaId) (fixes #5973) --- .../wao/services/service/administration/ReferentialService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java index 9843992..eda6d1b 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/ReferentialService.java @@ -838,14 +838,14 @@ public class ReferentialService extends WaoServiceSupport { try { for (Species species : csvImport) { - String aphiaId = species.getAphiaId(); + String permanentCode = species.getPermanentCode(); - Species existingSpecies = dao.forAphiaIdEquals(aphiaId).findUniqueOrNull(); + Species existingSpecies = dao.forPermanentCodeEquals(permanentCode).findUniqueOrNull(); if (existingSpecies == null) { dao.create(species); } else { - existingSpecies.setPermanentCode(species.getPermanentCode()); + existingSpecies.setAphiaId(species.getAphiaId()); existingSpecies.setScientificName(species.getScientificName()); existingSpecies.setVernacularName(species.getVernacularName()); dao.update(existingSpecies); -- 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 27f2c02b206e0b549db266cc3503ef394ca0157d Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 17:07:04 2014 +0100 POM en 5.0-SNAPSHOT, conformément à la feuille de route --- 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 1f2dd45..bca0260 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.3-SNAPSHOT</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 1088332..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>4.3-SNAPSHOT</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3932503..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>4.3-SNAPSHOT</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index da11f36..661b0d4 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.3-SNAPSHOT</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>.
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 6b7a0f0f3d55eff1c42950ce370f742588127dec Merge: 27f2c02 0206540 Author: Brendan Le Ny <bleny@codelutin.com> Date: Thu Dec 18 17:09:16 2014 +0100 Fusion du référentiel des espèces cibles dans develop (fixes #5973) .../wao/services/service/administration/ReferentialService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm