branch develop updated (55c5ddf -> 09464e0)
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 55c5ddf Correction du build new cb06485 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds be003ef [jgitflow-maven-plugin]updating poms for branch '5.0-RC3' with snapshot versions new a4c066f Ajout des entêtes manquants new 380f973 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' with non-snapshot versions new ff93260 Merge branch 'release/5.0-RC3' new a48664a Merge branch 'master' into develop new 09464e0 [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 09464e080371edab8123c9d7d1d32a7630d24754 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit a48664a1acfe230b5019ca1b0c77b454724d5f1f Merge: cb06485 ff93260 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 Merge branch 'master' into develop commit cb064853f31dbd2d3f67ccac6f70184ccb7e2c5e Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ff93260c054fe3d12bd3c0a97757fbaa05af745b Merge: 8d78952 380f973 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:22 2015 +0000 Merge branch 'release/5.0-RC3' commit 380f9735fb3f1c37a03980a8e659e317d82bddaf Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:01:07 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' with non-snapshot versions commit a4c066f0425abb128c9fce7a9ed3c7548c310421 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:00:35 2015 +0000 Ajout des entêtes manquants Summary of changes: .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 21 +++++++++++++++++++++ 1 file changed, 21 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 a4c066f0425abb128c9fce7a9ed3c7548c310421 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:00:35 2015 +0000 Ajout des entêtes manquants --- .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java index 4dff678..00a6ac3 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/SpeciesImpl.java @@ -1,5 +1,26 @@ package fr.ifremer.wao.entity; +/* + * #%L + * Wao :: Persistence + * %% + * Copyright (C) 2009 - 2015 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * Une espèce qu'il faut observer pour une ligne {@link fr.ifremer.wao.entity.ObsProgram#SCLEROCHRONOLOGY}. * -- 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 380f9735fb3f1c37a03980a8e659e317d82bddaf Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:01:07 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC3' 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 133dd53..f02b9bb 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC3-SNAPSHOT</version> + <version>5.0-RC3</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 8c47a4c..4f38b35 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-RC3-SNAPSHOT</version> + <version>5.0-RC3</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 9067b55..c9a9a2b 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-RC3-SNAPSHOT</version> + <version>5.0-RC3</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 1e4deb9..ecf02e5 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-RC3-SNAPSHOT</version> + <version>5.0-RC3</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 ff93260c054fe3d12bd3c0a97757fbaa05af745b Merge: 8d78952 380f973 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:22 2015 +0000 Merge branch 'release/5.0-RC3' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/wao/SampleRowsFilter.java | 28 +++++++++++++++ .../java/fr/ifremer/wao/entity/BoatTopiaDao.java | 3 +- .../wao/entity/IndividualMeasurementStrategy.java | 5 +++ .../fr/ifremer/wao/entity/SampleRowTopiaDao.java | 11 ++++++ .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 38 +++++++++++++++++++++ ...ies,_add_laboratories,_add_sclerochronology.sql | 4 +++ .../i18n/wao-persistence_en_GB.properties | 1 + .../i18n/wao-persistence_fr_FR.properties | 1 + wao-persistence/src/main/xmi/wao-model.zargo | Bin 62318 -> 62432 bytes wao-services/pom.xml | 2 +- .../ifremer/wao/services/AuthenticatedWaoUser.java | 9 ++++- .../wao/services/service/ContactsService.java | 12 ++----- .../services/service/SampleRowsFilterValues.java | 23 ++++++++++--- .../wao/services/service/SamplingPlanService.java | 10 ++---- .../service/SclerochronologySamplingPlan.java | 7 ++++ .../wao/services/service/SynthesisService.java | 9 ++++- .../service/administration/CompaniesService.java | 2 +- .../resources/i18n/wao-services_en_GB.properties | 1 + .../resources/i18n/wao-services_fr_FR.properties | 1 + .../SclerochronologySamplingPlanServiceTest.java | 4 +-- .../ifremer/wao/services/service/WaoFixtures.java | 9 ++--- wao-web/pom.xml | 2 +- .../action/administration/EditWaoUserAction.java | 4 ++- .../main/resources/i18n/wao-web_en_GB.properties | 1 + .../main/resources/i18n/wao-web_fr_FR.properties | 3 +- .../src/main/webapp/WEB-INF/content/contacts.jsp | 7 ++++ .../WEB-INF/content/edit-sample-row-input.jsp | 2 +- .../content/sclerochronology/sampling-plan.jsp | 17 ++++++--- .../src/main/webapp/WEB-INF/content/synthesis.jsp | 7 ++++ wao-web/src/main/webapp/wao.css | 5 +++ 32 files changed, 191 insertions(+), 41 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 cb064853f31dbd2d3f67ccac6f70184ccb7e2c5e Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:24 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..f02b9bb 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-RC3</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 26c6ea3..4f38b35 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-RC3</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3d39d69..c9a9a2b 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-RC3</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d54b842..ecf02e5 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-RC3</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 a48664a1acfe230b5019ca1b0c77b454724d5f1f Merge: cb06485 ff93260 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:24 2015 +0000 Merge branch 'master' into develop .../java/fr/ifremer/wao/entity/SpeciesImpl.java | 21 +++++++++++++++++++++ 1 file changed, 21 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 09464e080371edab8123c9d7d1d32a7630d24754 Author: Maven Release <maven-release@codelutin.com> Date: Thu Feb 12 16:04:24 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 f02b9bb..8da7a50 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-RC3</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 4f38b35..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-RC3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index c9a9a2b..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-RC3</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index ecf02e5..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-RC3</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