May 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-12
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT deleted branch release/7.0-RC-12 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-12
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed new tag v7.0-RC-12 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0-RC-12 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-12] [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with…
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch release/7.0-RC-12 at ultreiaio / ird-observe Commits: 7fc87781 by Tony CHEMIT at 2018-05-04T08:36:12Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with non-snapshot versions[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-12</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7fc87781bdb3df1b2c36cf95457… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7fc87781bdb3df1b2c36cf95457… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 23 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-12-SNAPSHOT development[skip ci]
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: b2ff2d12 by Tony CHEMIT at 2018-04-20T14:52:59Z [jgitflow-maven-plugin]updating poms for 7.0-RC-12-SNAPSHOT development[skip ci] - - - - - 6a951170 by Tony CHEMIT at 2018-04-20T15:07:35Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - de7865f6 by Tony CHEMIT at 2018-04-20T15:07:35Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1588af05 by Tony CHEMIT at 2018-04-20T15:07:36Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0977abfd by Tony CHEMIT at 2018-04-21T10:52:30Z update changelog after release 7.0-RC-11 [skip ci] - - - - - 82a198c5 by Tony CHEMIT at 2018-04-23T10:07:46Z Corriger certaines entrées de ObjectMaterial - See #928 - - - - - 1e0eaa67 by Tony CHEMIT at 2018-04-24T08:57:05Z Fix migration script - - - - - d9433970 by Tony CHEMIT at 2018-04-24T13:29:09Z Supprimer l'entrée non conforme du SpeciesGroupReleaseMode et toutes les associations indiuites sur les Speciesgroup - Closes #930 - - - - - 4540e328 by Tony CHEMIT at 2018-04-24T13:30:57Z * Ajout d'un référentiel PS NonTargetCatchReleaseConformity - Closes #929 * Remplacer detectionTime et release time par un référentiel NonTargetCatchReleasingTime - Closes #932 * Mettre à jour le référentiel NonTargetCatchReleaseStatus - Closes #933 * - - - - - c840b55e by Tony CHEMIT at 2018-04-24T13:57:27Z optimize dependencies - - - - - 63279977 by Tony CHEMIT at 2018-04-24T13:57:53Z Mettre les mêmes modes de libération que Whale shark pour le groupe d'espèce Cetaceans - Closes #931 - - - - - a0be7f0d by Tony CHEMIT at 2018-04-24T14:20:24Z Ajouter une nouvelle règle si un dcp présent alors le type de banc est obligatoirement Objet (changement de l'algorithme de consolidation) - Closes #938 - - - - - d2386af8 by Tony CHEMIT at 2018-04-25T18:31:34Z Revue des FAD material - See #935 - - - - - 5aa139a4 by Tony CHEMIT at 2018-04-25T19:03:58Z Corriger le problème de validation d'une chaine de caractère dans NonTargetCatchRelease Corriger le problème de validation d'une chaine de caractère dans NonTargetCatchRelease - Closes #934 - - - - - b3662aaf by Tony CHEMIT at 2018-05-02T12:53:49Z Calculer en temps réel les données calculées sur un FAD lors de la modification de ses materials (closes #937) - - - - - c0707507 by Tony CHEMIT at 2018-05-02T13:03:07Z Problème lors du changement de langue (les référentiels ne sont pas changé dans la bonne langue, mais ok après un redemarrage) (closes #936) - - - - - 2d09cd41 by Tony CHEMIT at 2018-05-03T09:37:37Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (See #941) - Update referential and migration - - - - - dc839eaa by Tony CHEMIT at 2018-05-03T13:43:13Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (See #941) - Add validation to check observed systems requirement on bycatch per species - See #941 - - - - - 1e9ef62e by Tony CHEMIT at 2018-05-03T14:06:42Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (Close #941) - Add FOB Observed system on activty as soon as a FOB is saved - - - - - c0741e19 by Tony CHEMIT at 2018-05-03T14:37:35Z use last version of config api - - - - - 0af25629 by Tony CHEMIT at 2018-05-04T08:15:42Z update pom + fix a plugin version - - - - - 7fc87781 by Tony CHEMIT at 2018-05-04T08:36:12Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with non-snapshot versions[skip ci] - - - - - 160c465c by Tony CHEMIT at 2018-05-04T08:43:33Z [jgitflow-maven-plugin]merging 'release/7.0-RC-12' into 'master' - - - - - 30 changed files: - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/filtered-resources/observe-client.conf - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - + client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - + client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ChangeLanguageActionSupport.java - client/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseConformityUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseConformityUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseConformityUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleasingTimeUI.jaxx - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleasingTimeUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleasingTimeUIModel.java - client/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - client/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1e830c34a399b7827611d3dbe3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1e830c34a399b7827611d3dbe3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with…
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7fc87781 by Tony CHEMIT at 2018-05-04T08:36:12Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-12' with non-snapshot versions[skip ci] - - - - - 160c465c by Tony CHEMIT at 2018-05-04T08:43:33Z [jgitflow-maven-plugin]merging 'release/7.0-RC-12' into 'master' - - - - - b53795d8 by Tony CHEMIT at 2018-05-04T08:43:35Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - d9dbbb7f by Tony CHEMIT at 2018-05-04T08:43:35Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - ca756982 by Tony CHEMIT at 2018-05-04T08:43:36Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4a4ea00e8e111fa83ef86ac07… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4a4ea00e8e111fa83ef86ac07… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-13-SNAPSHOT development[skip ci]
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4a4ea00 by Tony CHEMIT at 2018-05-04T08:35:12Z [jgitflow-maven-plugin]updating poms for 7.0-RC-13-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-12-SNAPSHOT</version> + <version>7.0-RC-13-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4a4ea00e8e111fa83ef86ac07a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4a4ea00e8e111fa83ef86ac07a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.0-RC-12
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed new branch release/7.0-RC-12 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/release/7.0-RC-12 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom + fix a plugin version
by Tony CHEMIT 04 May '18

04 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0af25629 by Tony CHEMIT at 2018-05-04T08:15:42Z update pom + fix a plugin version - - - - - 8 changed files: - + dto/.mvn/compiler-add-parameters - dto/pom.xml - pom.xml - + server/.mvn/compiler-add-parameters - server/pom.xml - + services/.mvn/compiler-add-parameters - services/pom.xml - services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java Changes: ===================================== dto/.mvn/compiler-add-parameters ===================================== --- /dev/null +++ b/dto/.mvn/compiler-add-parameters ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -226,16 +226,6 @@ </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - - <plugin> <groupId>io.ultreia.java4all.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <executions> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.31</version> + <version>2018.33</version> </parent> <groupId>fr.ird.observe</groupId> @@ -154,16 +154,15 @@ <observeToolkitVersion>3.1</observeToolkitVersion> - <lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx> +  <lib.version.nuiton.topia>3.3.1</lib.version.nuiton.topia> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> - <lib.version.java4all.config>1.0.3</lib.version.java4all.config> +  <xworkVersion>2.3.34</xworkVersion>   <lib.version.h2>1.4.196</lib.version.h2> -  -  + <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>  <license.licenseName>gpl_v3</license.licenseName> ===================================== server/.mvn/compiler-add-parameters ===================================== --- /dev/null +++ b/server/.mvn/compiler-add-parameters ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -233,7 +233,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>${lib.version.guava}</version> + <version>${lib.version.google.guava}</version> </dependency> </dependencies> </plugin> @@ -243,29 +243,6 @@ <plugins> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - - <plugin> - <groupId>io.ultreia.java4all.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <dependencies> -  -  -  -  -  -  - </dependencies> - </plugin> - - <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> ===================================== services/.mvn/compiler-add-parameters ===================================== --- /dev/null +++ b/services/.mvn/compiler-add-parameters ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -149,20 +149,4 @@ </dependencies> - <build> - - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-parameters</arg> - </compilerArgs> - </configuration> - </plugin> - - </plugins> - </build> </project> ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java +++ b/services/src/main/java/fr/ird/observe/services/validation/validators/NonTargetCatchObservedSystemValidator.java @@ -55,7 +55,7 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport Collection<String> requiredObservedSystemBySpeciesId = seineBycatchObservedSystemConfig.getRequiredObservedSystemBySpeciesId(speciesReference.getTopiaId()); if (!requiredObservedSystemBySpeciesId.isEmpty()) { - log.info("Required observed system: "+requiredObservedSystemBySpeciesId); + log.debug("Required observed system: " + requiredObservedSystemBySpeciesId); // must check that at least one of those observed system are in boolean found = false; for (ObservedSystemReference observedSystemReference : activitySeineDto.getObservedSystem()) { @@ -68,15 +68,15 @@ public class NonTargetCatchObservedSystemValidator extends FieldValidatorSupport if (!found) { List<ObservedSystemReference> observedSystems = (List<ObservedSystemReference>) getFieldValue("observedSystems", object); - log.info("references: " + observedSystems); + log.debug("references: " + observedSystems); DecoratorService decoratorService = (DecoratorService) stack.findValue("decoratorService"); ImmutableMap<String, ObservedSystemReference> map = Maps.uniqueIndex(observedSystems, ObservedSystemReference::getId); ReferentialReferenceDecorator<ObservedSystemReference> decorator = decoratorService.getReferentialReferenceDecorator(ObservedSystemReference.class); List<String> labels = new LinkedList<>(); for (String observedSystemId : requiredObservedSystemBySpeciesId) { ObservedSystemReference ref = map.get(observedSystemId); - log.info("Required observed system id: "+observedSystemId); - log.info("Required observed system: "+ref); + log.debug("Required observed system id: " + observedSystemId); + log.debug("Required observed system: " + ref); labels.add(decorator.toString(ref)); } stack.set("observedSystemLabels", labels); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0af25629266723ec0b02a74f2e6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0af25629266723ec0b02a74f2e6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use last version of config api
by Tony CHEMIT 03 May '18

03 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c0741e19 by Tony CHEMIT at 2018-05-03T14:37:35Z use last version of config api - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -157,7 +157,7 @@ <lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx> <lib.version.nuiton.topia>3.3.1</lib.version.nuiton.topia> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> - <lib.version.java4all.config>1.0.3-SNAPSHOT</lib.version.java4all.config> + <lib.version.java4all.config>1.0.3</lib.version.java4all.config> <xworkVersion>2.3.34</xworkVersion>   View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c0741e191ab469c1dae03960d65… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c0741e191ab469c1dae03960d65… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement…
by Tony CHEMIT 03 May '18

03 May '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1e9ef62e by Tony CHEMIT at 2018-05-03T14:06:42Z Gestion des requins-baleine lors de la migration V7 et dans le fonctionnement régulier de la V7 (Close #941) - Add FOB Observed system on activty as soon as a FOB is saved - - - - - 1 changed file: - services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java @@ -10,12 +10,12 @@ package fr.ird.observe.services.local.service.data.seine; * it under the terms of the GNU 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 General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import fr.ird.observe.binder.referential.ReferentialEntityDtoBinderSupport; -import fr.ird.observe.dto.referential.ReferentialLocale; +import fr.ird.observe.dto.DataNotFoundException; import fr.ird.observe.dto.data.seine.FloatingObjectDto; import fr.ird.observe.dto.data.seine.FloatingObjectPartDto; import fr.ird.observe.dto.data.seine.FloatingObjectPartReference; @@ -36,18 +36,22 @@ import fr.ird.observe.dto.data.seine.FloatingObjectReference; import fr.ird.observe.dto.data.seine.ObjectMaterialHierarchyDto; import fr.ird.observe.dto.form.Form; import fr.ird.observe.dto.reference.DataDtoReferenceSet; +import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.dto.result.SaveResultDto; -import fr.ird.observe.dto.DataNotFoundException; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.seine.ObjectMaterial; import fr.ird.observe.entities.referentiel.seine.ObjectMaterialTopiaDao; +import fr.ird.observe.entities.referentiel.seine.ObservedSystem; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.FloatingObject; import fr.ird.observe.entities.seine.FloatingObjectPart; import fr.ird.observe.entities.seine.FloatingObjectPartTopiaDao; import fr.ird.observe.services.local.service.ObserveServiceLocal; import fr.ird.observe.services.service.data.seine.FloatingObjectService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import java.util.Collection; import java.util.Comparator; import java.util.LinkedHashSet; @@ -57,8 +61,6 @@ import java.util.Optional; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -66,6 +68,10 @@ import org.apache.commons.logging.LogFactory; public class FloatingObjectServiceLocal extends ObserveServiceLocal implements FloatingObjectService { private static final Log log = LogFactory.getLog(FloatingObjectServiceLocal.class); + //FIXME Make this configurable + private static final String FOB_OBSERVED_SYSTEM = "fr.ird.observe.entities.referentiel.seine.ObservedSystem#0#1.2"; + //FIXME Make this configurable + private static final Set<String> FOB_OBSERVED_SYSTEM_EXCLUDE_OPERATIONS = ImmutableSet.of("fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#10", "fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#1"); @Override public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchy() { @@ -184,6 +190,15 @@ public class FloatingObjectServiceLocal extends ObserveServiceLocal implements F activitySeine.addFloatingObject(entity); } + boolean addFobObservedSystem = !FOB_OBSERVED_SYSTEM_EXCLUDE_OPERATIONS.contains(dto.getObjectOperation().getId()) + && !activitySeine.getObservedSystemTopiaIds().contains(FOB_OBSERVED_SYSTEM); + + if (addFobObservedSystem) { + log.info("Add FOB Observed System to activity: " + activitySeineId); + ObservedSystem observedSystem = getTopiaPersistenceContext().getObservedSystemDao().forTopiaIdEquals(FOB_OBSERVED_SYSTEM).findUnique(); + activitySeine.addObservedSystem(observedSystem); + } + return result; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1e9ef62ea127f671b814196e99f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1e9ef62ea127f671b814196e99f… You're receiving this email because of your account on gitlab.com.

1 0