March 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreia.io/ird-observe] Pushed new tag v3.14
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.14 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.14
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.14 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.13
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.13 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.13
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.13 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.12
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.12 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.11
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.11 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.11
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.11 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.10
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.10 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.10
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.10 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.1.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.1.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.1.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.1.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.1.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.1.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.0
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.0 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.0
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.0 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 2f75e9a1 by Tony CHEMIT at 2017-03-11T13:02:24+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,28 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-11 12:59. + * Last generated at 2017-03-10 16:31. + +## Version [5.3.3](https://gitlab.com/ultreia.io/ird-observe/milestones/86) + +**Closed at 2017-03-10.** + +### Download +* [Application (observe-5.3.3.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.3.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 741]](https://gitlab.com/ultreia.io/ird-observe/issues/741) **[LL] Echec export marée LL vers base centrale** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 743]](https://gitlab.com/ultreia.io/ird-observe/issues/743) **[Synchro referentiel] Impossible d'appliquer un changement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 744]](https://gitlab.com/ultreia.io/ird-observe/issues/744) **[Synchro référentiel] Impossible de finir la synchro** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) **Closed at *In progress*.** +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -57,7 +73,7 @@ ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *In progress*.** +**Closed at *2017-03-08*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/2f75e9a1c04dedb1a644622e7a…

1 0

[Git][ultreia.io/ird-observe][develop] Update changelog for staging version 6.0-RC-1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 9eb36475 by Tony CHEMIT at 2017-03-11T12:59:33+01:00 Update changelog for staging version 6.0-RC-1 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,28 +1,12 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-10 16:31. - -## Version [5.3.3](https://gitlab.com/ultreia.io/ird-observe/milestones/86) - -**Closed at 2017-03-10.** - -### Download -* [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) -* [Serveur (observe-5.3.2.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) - -### Issues - * [[Anomalie 741]](https://gitlab.com/ultreia.io/ird-observe/issues/741) **[LL] Echec export marée LL vers base centrale** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) - * [[Anomalie 743]](https://gitlab.com/ultreia.io/ird-observe/issues/743) **[Synchro referentiel] Impossible d'appliquer un changement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 744]](https://gitlab.com/ultreia.io/ird-observe/issues/744) **[Synchro référentiel] Impossible de finir la synchro** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * Last generated at 2017-03-11 12:59. ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) **Closed at *In progress*.** -### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -73,7 +57,7 @@ ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *2017-03-08*.** +**Closed at *In progress*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/9eb3647512608cec059cd150ad…

1 0

[Git][ultreia.io/ird-observe][master] 17 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: 2e0e76bc by Tony CHEMIT at 2017-03-09T23:59:05+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 92f92f5f by Tony CHEMIT at 2017-03-10T00:13:12+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 573b9180 by Tony CHEMIT at 2017-03-10T00:13:13+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - d8073921 by Tony CHEMIT at 2017-03-10T00:13:13+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - ae3033d5 by Tony CHEMIT at 2017-03-10T00:20:00+01:00 Update changelog for staging version 6.0-RC-1 - - - - - b4a80180 by Tony CHEMIT at 2017-03-10T00:23:43+01:00 update changelog - - - - - 0e588de8 by Tony CHEMIT at 2017-03-10T00:26:35+01:00 improve release script - - - - - 4af51fc1 by Tony CHEMIT at 2017-03-10T00:59:56+01:00 update changelog - - - - - bb4205cd by Tony CHEMIT at 2017-03-10T16:33:59+01:00 update changelog - - - - - 0e6a6770 by Tony CHEMIT at 2017-03-10T16:34:31+01:00 update changelog - - - - - fb928aa1 by Tony CHEMIT at 2017-03-10T16:44:54+01:00 report from 5.x (See #744) - - - - - 5f3c3f84 by Tony CHEMIT at 2017-03-11T12:43:11+01:00 use last jaxx version - - - - - b3d6eb71 by Tony CHEMIT at 2017-03-11T12:44:26+01:00 reroll release 6.0-RC-1 - - - - - 069012b8 by Tony CHEMIT at 2017-03-11T12:47:32+01:00 fix scripts - - - - - fd44c369 by Tony CHEMIT at 2017-03-11T12:48:55+01:00 fix scripts - - - - - 8b442df0 by Tony CHEMIT at 2017-03-11T12:49:48+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 365fe5e3 by Tony CHEMIT at 2017-03-11T12:56:01+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 7 changed files: - CHANGELOG.md - bin/stage_create.sh - bin/stage_drop.sh - bin/stage_release.sh - pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,28 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-08 20:41. + * Last generated at 2017-03-10 16:31. + +## Version [5.3.3](https://gitlab.com/ultreia.io/ird-observe/milestones/86) + +**Closed at 2017-03-10.** + +### Download +* [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.2.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 741]](https://gitlab.com/ultreia.io/ird-observe/issues/741) **[LL] Echec export marée LL vers base centrale** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 743]](https://gitlab.com/ultreia.io/ird-observe/issues/743) **[Synchro referentiel] Impossible d'appliquer un changement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 744]](https://gitlab.com/ultreia.io/ird-observe/issues/744) **[Synchro référentiel] Impossible de finir la synchro** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) -Status: **_Staging_** +**Closed at *In progress*.** ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -55,11 +68,12 @@ Status: **_Staging_** * [[Evolution 653]](https://gitlab.com/ultreia.io/ird-observe/issues/653) **Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 695]](https://gitlab.com/ultreia.io/ird-observe/issues/695) **Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 652]](https://gitlab.com/ultreia.io/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at 2017-03-08.** +**Closed at *2017-03-08*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) @@ -189,6 +203,7 @@ Status: **_Staging_** * [[Anomalie 666]](https://gitlab.com/ultreia.io/ird-observe/issues/666) **Mémorisation du dernier dossier utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 667]](https://gitlab.com/ultreia.io/ird-observe/issues/667) **Problème de chargement du fichier des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 669]](https://gitlab.com/ultreia.io/ird-observe/issues/669) **[persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 668]](https://gitlab.com/ultreia.io/ird-observe/issues/668) **Question sur l'assistant calcul de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.1.1](https://gitlab.com/ultreia.io/ird-observe/milestones/74) 

*(from redmine: created on 2016-12-08)* @@ -317,110 +332,6 @@ Status: **_Staging_** * [[Evolution 614]](https://gitlab.com/ultreia.io/ird-observe/issues/614) **[VALIDATION] Remettre en route le contrôle des position avec possibilité de le désactiver** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 617]](https://gitlab.com/ultreia.io/ird-observe/issues/617) **Simplification de la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [5.0-RC-3](https://gitlab.com/ultreia.io/ird-observe/milestones/68) -

*(from redmine: created on 2016-09-05)* - -**Closed at 2016-09-07.** - - -### Issues - * [[Anomalie 421]](https://gitlab.com/ultreia.io/ird-observe/issues/421) **Comportement de l'assistant de chargement d'une sauvegarde** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 553]](https://gitlab.com/ultreia.io/ird-observe/issues/553) **[UI] Mauvais fonctionnement dans les caractéristiques d'équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 603]](https://gitlab.com/ultreia.io/ird-observe/issues/603) **[Calee/Rejet de thon] Niveau de validation du champ "Poids estimé"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 604]](https://gitlab.com/ultreia.io/ird-observe/issues/604) **[Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 605]](https://gitlab.com/ultreia.io/ird-observe/issues/605) **[Actions] Exception lors de la validation des données référentiel en serveur distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 606]](https://gitlab.com/ultreia.io/ird-observe/issues/606) **[Action] Erreur lors de la validation d'une marée LL avec capteur utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [5.0-RC-2](https://gitlab.com/ultreia.io/ird-observe/milestones/67) -

*(from redmine: created on 2016-09-01)* - -**Closed at 2016-09-05.** - - -### Issues - * [[Anomalie 105]](https://gitlab.com/ultreia.io/ird-observe/issues/105) **Valeurs nulles autorisées dans les champs contenant des topiaid de clés étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 112]](https://gitlab.com/ultreia.io/ird-observe/issues/112) **Réplication des données non cloisonnée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 259]](https://gitlab.com/ultreia.io/ird-observe/issues/259) **[PS] Formulaire "rejet de thon"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 503]](https://gitlab.com/ultreia.io/ird-observe/issues/503) **Imposible de renseigner un date si la valeur d'origine est null** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 544]](https://gitlab.com/ultreia.io/ird-observe/issues/544) **Id de virage obligatoire sur sur la schéma de palangre ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 550]](https://gitlab.com/ultreia.io/ird-observe/issues/550) **Import de commentaire dont la ligne fini par un ";"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 567]](https://gitlab.com/ultreia.io/ird-observe/issues/567) **[PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 590]](https://gitlab.com/ultreia.io/ird-observe/issues/590) **[Actions] [Validation] Problème de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 592]](https://gitlab.com/ultreia.io/ird-observe/issues/592) **[Source de données] Pas de résumé lors de l'import du dernier référentiel chargé (dump)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 593]](https://gitlab.com/ultreia.io/ird-observe/issues/593) **[Source de données] Il manque les templates de wizzard de source de données pour la langue anglaise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 595]](https://gitlab.com/ultreia.io/ird-observe/issues/595) **[Carte] Il manque des symboles dans la légende et aussi dans la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 596]](https://gitlab.com/ultreia.io/ird-observe/issues/596) **[I18n] Chaines non traduites** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 598]](https://gitlab.com/ultreia.io/ird-observe/issues/598) **[Source de données] Erreur d'import des marées avec PJ (oid/blob?)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 599]](https://gitlab.com/ultreia.io/ird-observe/issues/599) **[Carte] La carte ne s'affiche plus en server distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 600]](https://gitlab.com/ultreia.io/ird-observe/issues/600) **[DCP] Message de suppression d'un DCP en serveur distant incorrect** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 601]](https://gitlab.com/ultreia.io/ird-observe/issues/601) **Revoir le chargement de l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 602]](https://gitlab.com/ultreia.io/ird-observe/issues/602) **[Reférentiel] Les actions ne sont pas bien connectés avec la sélection dans la liste** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [5.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/65) -

*(from redmine: created on 2016-03-01)* - -**Closed at 2016-09-01.** - - -### Issues - * [[Evolution 119]](https://gitlab.com/ultreia.io/ird-observe/issues/119) **Synchronisation de marées entre bases centrales** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Evolution 120]](https://gitlab.com/ultreia.io/ird-observe/issues/120) **Synchronisation de référentiel : plus de possibilités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 427]](https://gitlab.com/ultreia.io/ird-observe/issues/427) **Migration vers ToPIA 3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 430]](https://gitlab.com/ultreia.io/ird-observe/issues/430) **Gestion de la date de dernière mise à jour des entités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 434]](https://gitlab.com/ultreia.io/ird-observe/issues/434) **[Actions] Migration de l'action de consolidation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 435]](https://gitlab.com/ultreia.io/ird-observe/issues/435) **[Actions] Migration de l'action de validation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 438]](https://gitlab.com/ultreia.io/ird-observe/issues/438) **[Actions] Migration de l'action des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 449]](https://gitlab.com/ultreia.io/ird-observe/issues/449) **Migration des écrans de saisie (utilisation des services)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 452]](https://gitlab.com/ultreia.io/ird-observe/issues/452) **[Actions] Migration des actions d'administration des sources de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 454]](https://gitlab.com/ultreia.io/ird-observe/issues/454) **Migration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 455]](https://gitlab.com/ultreia.io/ird-observe/issues/455) **[PS] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 456]](https://gitlab.com/ultreia.io/ird-observe/issues/456) **[LL] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 457]](https://gitlab.com/ultreia.io/ird-observe/issues/457) **[PS] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 458]](https://gitlab.com/ultreia.io/ird-observe/issues/458) **[LL] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 459]](https://gitlab.com/ultreia.io/ird-observe/issues/459) **[PS] Migration de l'écran des routes d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 460]](https://gitlab.com/ultreia.io/ird-observe/issues/460) **[PS] Migration de l'écran d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 461]](https://gitlab.com/ultreia.io/ird-observe/issues/461) **[LL] Migration de l'écran des activités d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 462]](https://gitlab.com/ultreia.io/ird-observe/issues/462) **[PS] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 463]](https://gitlab.com/ultreia.io/ird-observe/issues/463) **[LL] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 464]](https://gitlab.com/ultreia.io/ird-observe/issues/464) **[PS] Migration de l'écran des systèmes observés d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 465]](https://gitlab.com/ultreia.io/ird-observe/issues/465) **[PS] Migration de l'écran d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 466]](https://gitlab.com/ultreia.io/ird-observe/issues/466) **[PS] Migration de l'écran d'un objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 467]](https://gitlab.com/ultreia.io/ird-observe/issues/467) **[PS] Migration de l'écran des opération sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 468]](https://gitlab.com/ultreia.io/ird-observe/issues/468) **[PS] Migration de l'écran de l'estimation du banc objet sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 469]](https://gitlab.com/ultreia.io/ird-observe/issues/469) **[PS] Migration de l'écran de la faune observé sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 470]](https://gitlab.com/ultreia.io/ird-observe/issues/470) **[PS] Migration de l'écran de l'estimation du banc d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 471]](https://gitlab.com/ultreia.io/ird-observe/issues/471) **[PS] Migration de l'écran des captures cibles d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 472]](https://gitlab.com/ultreia.io/ird-observe/issues/472) **[PS] Migration de l'écran des rejets thon d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 473]](https://gitlab.com/ultreia.io/ird-observe/issues/473) **[PS] Migration de l'écran des échantillon thon rejeté d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 474]](https://gitlab.com/ultreia.io/ird-observe/issues/474) **[PS] Migration de l'écran des échantillons thon capturés d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 475]](https://gitlab.com/ultreia.io/ird-observe/issues/475) **[PS] Migration de l'écran des échantillons faune accessoire d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 476]](https://gitlab.com/ultreia.io/ird-observe/issues/476) **[PS] Migration de l'écran de la faune accessoire conservée ou rejetée d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 477]](https://gitlab.com/ultreia.io/ird-observe/issues/477) **[LL] Migration des écrans du détail de l'opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 478]](https://gitlab.com/ultreia.io/ird-observe/issues/478) **[LL] Migration de l'écran de la composition globale d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 479]](https://gitlab.com/ultreia.io/ird-observe/issues/479) **[LL] Migration de l'écran de définition du schéma de palangre d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 480]](https://gitlab.com/ultreia.io/ird-observe/issues/480) **[LL] Migration de l'écran des captures d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 481]](https://gitlab.com/ultreia.io/ird-observe/issues/481) **[LL] Migration de l'écran des enregistrements de profondeur d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 482]](https://gitlab.com/ultreia.io/ird-observe/issues/482) **[LL] Migration de l'écran des rencontres d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 483]](https://gitlab.com/ultreia.io/ird-observe/issues/483) **[LL] Migration de l'écran des capteurs utilisés d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 491]](https://gitlab.com/ultreia.io/ird-observe/issues/491) **[Actions] Migration de l'action d'exportation des données observateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 497]](https://gitlab.com/ultreia.io/ird-observe/issues/497) **Faire paraitre le type de marée dans le nom du programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 504]](https://gitlab.com/ultreia.io/ird-observe/issues/504) **[Actions] Migration de l'action de synchronisation du referentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 505]](https://gitlab.com/ultreia.io/ird-observe/issues/505) **Mise à jour des librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 548]](https://gitlab.com/ultreia.io/ird-observe/issues/548) **Serveur : Rendre configurable le delais d'expiration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 549]](https://gitlab.com/ultreia.io/ird-observe/issues/549) **recharger la source de donné apres expiration du token** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 561]](https://gitlab.com/ultreia.io/ird-observe/issues/561) **[Source de données] Migration du changement de source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 562]](https://gitlab.com/ultreia.io/ird-observe/issues/562) **[Source de données] Migration du rechargement de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 563]](https://gitlab.com/ultreia.io/ird-observe/issues/563) **[Source de données] Migration de la fermeture de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 564]](https://gitlab.com/ultreia.io/ird-observe/issues/564) **[Source de données] Migration de l'écran d'information de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 565]](https://gitlab.com/ultreia.io/ird-observe/issues/565) **[Source de données] Migration de l'import de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 566]](https://gitlab.com/ultreia.io/ird-observe/issues/566) **[Source de données] Migration de la sauvegarde d'une source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 582]](https://gitlab.com/ultreia.io/ird-observe/issues/582) **[Source de données] Migration du mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - ## Version [4.0.6](https://gitlab.com/ultreia.io/ird-observe/milestones/64) 

*(from redmine: created on 2015-11-04)* @@ -502,6 +413,7 @@ Status: **_Staging_** ### Issues * [[Anomalie 428]](https://gitlab.com/ultreia.io/ird-observe/issues/428) **La migration 4.0->4.0.1.1 plante sur PostgreSQL 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 410]](https://gitlab.com/ultreia.io/ird-observe/issues/410) **[PS] Question calculs taille/poids** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0.1](https://gitlab.com/ultreia.io/ird-observe/milestones/58) 

*(from redmine: created on 2015-06-08)* @@ -527,124 +439,7 @@ Status: **_Staging_** * [[Anomalie 422]](https://gitlab.com/ultreia.io/ird-observe/issues/422) **[ObServeLL] champs Distance et Nombre inversés dans formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 402]](https://gitlab.com/ultreia.io/ird-observe/issues/402) **Utilisation codelutinpom 2.3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 424]](https://gitlab.com/ultreia.io/ird-observe/issues/424) **Permettre la configuration des logs au niveau utilisateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC8](https://gitlab.com/ultreia.io/ird-observe/milestones/57) -

*(from redmine: created on 2015-05-29)* - -**Closed at 2015-05-29.** - - -### Issues - * [[Anomalie 393]](https://gitlab.com/ultreia.io/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC7](https://gitlab.com/ultreia.io/ird-observe/milestones/56) -

*(from redmine: created on 2015-05-26)* - -**Closed at 2015-05-28.** - - -### Issues - * [[Anomalie 386]](https://gitlab.com/ultreia.io/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 390]](https://gitlab.com/ultreia.io/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 392]](https://gitlab.com/ultreia.io/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 387]](https://gitlab.com/ultreia.io/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 388]](https://gitlab.com/ultreia.io/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 389]](https://gitlab.com/ultreia.io/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 391]](https://gitlab.com/ultreia.io/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC6](https://gitlab.com/ultreia.io/ird-observe/milestones/54) -

*(from redmine: created on 2015-05-06)* - -**Closed at 2015-05-23.** - - -### Issues - * [[Anomalie 374]](https://gitlab.com/ultreia.io/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 384]](https://gitlab.com/ultreia.io/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 385]](https://gitlab.com/ultreia.io/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 367]](https://gitlab.com/ultreia.io/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 378]](https://gitlab.com/ultreia.io/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 379]](https://gitlab.com/ultreia.io/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 380]](https://gitlab.com/ultreia.io/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 381]](https://gitlab.com/ultreia.io/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 382]](https://gitlab.com/ultreia.io/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 383]](https://gitlab.com/ultreia.io/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC5](https://gitlab.com/ultreia.io/ird-observe/milestones/53) -

*(from redmine: created on 2015-04-22)* - -**Closed at 2015-05-11.** - - -### Issues - * [[Anomalie 368]](https://gitlab.com/ultreia.io/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 371]](https://gitlab.com/ultreia.io/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 373]](https://gitlab.com/ultreia.io/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 375]](https://gitlab.com/ultreia.io/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 369]](https://gitlab.com/ultreia.io/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 372]](https://gitlab.com/ultreia.io/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC4](https://gitlab.com/ultreia.io/ird-observe/milestones/52) -

*(from redmine: created on 2015-04-15)* - -**Closed at 2015-04-23.** - - -### Issues - * [[Anomalie 360]](https://gitlab.com/ultreia.io/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 363]](https://gitlab.com/ultreia.io/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 364]](https://gitlab.com/ultreia.io/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 333]](https://gitlab.com/ultreia.io/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 355]](https://gitlab.com/ultreia.io/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 356]](https://gitlab.com/ultreia.io/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 358]](https://gitlab.com/ultreia.io/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 359]](https://gitlab.com/ultreia.io/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 361]](https://gitlab.com/ultreia.io/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 362]](https://gitlab.com/ultreia.io/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC3](https://gitlab.com/ultreia.io/ird-observe/milestones/51) -

*(from redmine: created on 2015-04-10)* - -**Closed at 2015-04-17.** - - -### Issues - * [[Anomalie 334]](https://gitlab.com/ultreia.io/ird-observe/issues/334) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 335]](https://gitlab.com/ultreia.io/ird-observe/issues/335) **La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 337]](https://gitlab.com/ultreia.io/ird-observe/issues/337) **Le bouton "Ajouter l'opération de pêche" ne doit être disponible que pour une activité de type "Opération de pêche"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 338]](https://gitlab.com/ultreia.io/ird-observe/issues/338) **L'export d'une marée vers la base centrale échoue** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 339]](https://gitlab.com/ultreia.io/ird-observe/issues/339) **[PS] Problèmes d'utilisation du nouvel écran 'Equipements'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 340]](https://gitlab.com/ultreia.io/ird-observe/issues/340) **[PS] Les équipements devraient avoir des caractéristiques par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 345]](https://gitlab.com/ultreia.io/ird-observe/issues/345) **[LL] Comportements erronés du widget des positions en LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 348]](https://gitlab.com/ultreia.io/ird-observe/issues/348) **[LL] Non reprise du quadrant lors de la création d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 349]](https://gitlab.com/ultreia.io/ird-observe/issues/349) **[LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 350]](https://gitlab.com/ultreia.io/ird-observe/issues/350) **Quadrant mal initialisé lors de l'arrvié sur un écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 351]](https://gitlab.com/ultreia.io/ird-observe/issues/351) **Renommage du navire Palengirer inconnu en Palengrier inconnu** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 336]](https://gitlab.com/ultreia.io/ird-observe/issues/336) **Problème technique lors de la tentative d'accès au formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 341]](https://gitlab.com/ultreia.io/ird-observe/issues/341) **[PS] Mise en page formulaire Calée / Mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 342]](https://gitlab.com/ultreia.io/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 346]](https://gitlab.com/ultreia.io/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 347]](https://gitlab.com/ultreia.io/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC2](https://gitlab.com/ultreia.io/ird-observe/milestones/50) -

*(from redmine: created on 2015-04-07)* - -**Closed at 2015-04-11.** - - -### Issues - * [[Anomalie 323]](https://gitlab.com/ultreia.io/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 324]](https://gitlab.com/ultreia.io/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 325]](https://gitlab.com/ultreia.io/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 326]](https://gitlab.com/ultreia.io/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 328]](https://gitlab.com/ultreia.io/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 329]](https://gitlab.com/ultreia.io/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 330]](https://gitlab.com/ultreia.io/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 332]](https://gitlab.com/ultreia.io/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 321]](https://gitlab.com/ultreia.io/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 322]](https://gitlab.com/ultreia.io/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 327]](https://gitlab.com/ultreia.io/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 331]](https://gitlab.com/ultreia.io/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 423]](https://gitlab.com/ultreia.io/ird-observe/issues/423) **Remplacer un script sql dans la distribution V4.x par celui-ci** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.15.1](https://gitlab.com/ultreia.io/ird-observe/milestones/49) 

*(from redmine: created on 2015-03-22)* @@ -662,21 +457,6 @@ Status: **_Staging_** * [[Evolution 195]](https://gitlab.com/ultreia.io/ird-observe/issues/195) **Comportement du masque de saisie des coordonnées + ordre des boutons radio** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 313]](https://gitlab.com/ultreia.io/ird-observe/issues/313) **Amélioration de la migration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [4.0-RC1](https://gitlab.com/ultreia.io/ird-observe/milestones/48) -

*(from redmine: created on 2015-03-16)* - -**Closed at 2015-04-07.** - - -### Issues - * [[Anomalie 266]](https://gitlab.com/ultreia.io/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 316]](https://gitlab.com/ultreia.io/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 318]](https://gitlab.com/ultreia.io/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 320]](https://gitlab.com/ultreia.io/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 272]](https://gitlab.com/ultreia.io/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 317]](https://gitlab.com/ultreia.io/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 319]](https://gitlab.com/ultreia.io/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - ## Version [3.15](https://gitlab.com/ultreia.io/ird-observe/milestones/46) 

*(from redmine: created on 2015-01-27)* @@ -728,6 +508,7 @@ Status: **_Staging_** * [[Anomalie 258]](https://gitlab.com/ultreia.io/ird-observe/issues/258) **Mauvaise gestion des flags targetsample.discarded et targetlength.discarded** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 261]](https://gitlab.com/ultreia.io/ird-observe/issues/261) **Impossible d'afficher l'écran Estimation banc** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 255]](https://gitlab.com/ultreia.io/ird-observe/issues/255) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 260]](https://gitlab.com/ultreia.io/ird-observe/issues/260) **Supprimer un champs redondant sur l'opération de pêche (LL)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.13](https://gitlab.com/ultreia.io/ird-observe/milestones/44) 

*(from redmine: created on 2015-01-16)* @@ -780,6 +561,8 @@ Status: **_Staging_** * [[Evolution 231]](https://gitlab.com/ultreia.io/ird-observe/issues/231) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 232]](https://gitlab.com/ultreia.io/ird-observe/issues/232) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 234]](https://gitlab.com/ultreia.io/ird-observe/issues/234) **Modifier simultannement les états des composants d'heure et de position géographique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 220]](https://gitlab.com/ultreia.io/ird-observe/issues/220) **Revoir la sélection de la position sur une palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 233]](https://gitlab.com/ultreia.io/ird-observe/issues/233) **Mise à jour du script Postgis pour les activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.10](https://gitlab.com/ultreia.io/ird-observe/milestones/40) 

*(from redmine: created on 2014-12-07)* @@ -833,6 +616,7 @@ Status: **_Staging_** * [[Evolution 209]](https://gitlab.com/ultreia.io/ird-observe/issues/209) **Mettre sur les onglets un icon quand il y a des erreurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 210]](https://gitlab.com/ultreia.io/ird-observe/issues/210) **Écran capture** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 211]](https://gitlab.com/ultreia.io/ird-observe/issues/211) **Mettre par defaut la format DMS sur les éditeurs de coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 214]](https://gitlab.com/ultreia.io/ird-observe/issues/214) **Replir le référentiel SensorDataFormat** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.7.1](https://gitlab.com/ultreia.io/ird-observe/milestones/37) 

*(from redmine: created on 2014-11-25)* @@ -896,6 +680,7 @@ Status: **_Staging_** * [[Evolution 171]](https://gitlab.com/ultreia.io/ird-observe/issues/171) **Finalisation de l'entité CatchLongline** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 173]](https://gitlab.com/ultreia.io/ird-observe/issues/173) **Finalisation de l'entité Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 175]](https://gitlab.com/ultreia.io/ird-observe/issues/175) **Mise à jour des listes d'espèces pour le modèle ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 159]](https://gitlab.com/ultreia.io/ird-observe/issues/159) **Découper le module business en deux** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.6](https://gitlab.com/ultreia.io/ird-observe/milestones/34) Intégration des référentiels longline + diverses évolutions et corrections

*(from redmine: created on 2014-07-24)* @@ -917,6 +702,7 @@ Intégration des référentiels longline + diverses évolutions et corrections&# * [[Evolution 151]](https://gitlab.com/ultreia.io/ird-observe/issues/151) **Ajout des référentiels longline** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 152]](https://gitlab.com/ultreia.io/ird-observe/issues/152) **Changement du type reference.code en String** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 154]](https://gitlab.com/ultreia.io/ird-observe/issues/154) **Ajout d'un champs gearType sur les programmes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 153]](https://gitlab.com/ultreia.io/ird-observe/issues/153) **Ajout des traductions du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0](https://gitlab.com/ultreia.io/ird-observe/milestones/33) ObserveLL

*(from redmine: created on 2014-06-23)* @@ -928,13 +714,84 @@ ObserveLL

*(from redmine: created on 2014-06-23)* ### Issues * [[Anomalie 199]](https://gitlab.com/ultreia.io/ird-observe/issues/199) **Comportement du contrôle sur les vitesses entre activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 266]](https://gitlab.com/ultreia.io/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 316]](https://gitlab.com/ultreia.io/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 318]](https://gitlab.com/ultreia.io/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 320]](https://gitlab.com/ultreia.io/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 323]](https://gitlab.com/ultreia.io/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 324]](https://gitlab.com/ultreia.io/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 325]](https://gitlab.com/ultreia.io/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 326]](https://gitlab.com/ultreia.io/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 328]](https://gitlab.com/ultreia.io/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 329]](https://gitlab.com/ultreia.io/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 330]](https://gitlab.com/ultreia.io/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 332]](https://gitlab.com/ultreia.io/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 334]](https://gitlab.com/ultreia.io/ird-observe/issues/334) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 335]](https://gitlab.com/ultreia.io/ird-observe/issues/335) **La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 337]](https://gitlab.com/ultreia.io/ird-observe/issues/337) **Le bouton "Ajouter l'opération de pêche" ne doit être disponible que pour une activité de type "Opération de pêche"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 338]](https://gitlab.com/ultreia.io/ird-observe/issues/338) **L'export d'une marée vers la base centrale échoue** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 339]](https://gitlab.com/ultreia.io/ird-observe/issues/339) **[PS] Problèmes d'utilisation du nouvel écran 'Equipements'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 340]](https://gitlab.com/ultreia.io/ird-observe/issues/340) **[PS] Les équipements devraient avoir des caractéristiques par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 345]](https://gitlab.com/ultreia.io/ird-observe/issues/345) **[LL] Comportements erronés du widget des positions en LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 348]](https://gitlab.com/ultreia.io/ird-observe/issues/348) **[LL] Non reprise du quadrant lors de la création d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 349]](https://gitlab.com/ultreia.io/ird-observe/issues/349) **[LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 350]](https://gitlab.com/ultreia.io/ird-observe/issues/350) **Quadrant mal initialisé lors de l'arrvié sur un écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 351]](https://gitlab.com/ultreia.io/ird-observe/issues/351) **Renommage du navire Palengirer inconnu en Palengrier inconnu** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 360]](https://gitlab.com/ultreia.io/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 363]](https://gitlab.com/ultreia.io/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 364]](https://gitlab.com/ultreia.io/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 368]](https://gitlab.com/ultreia.io/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Anomalie 370]](https://gitlab.com/ultreia.io/ird-observe/issues/370) **[ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons)** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 371]](https://gitlab.com/ultreia.io/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 373]](https://gitlab.com/ultreia.io/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 374]](https://gitlab.com/ultreia.io/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 375]](https://gitlab.com/ultreia.io/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 384]](https://gitlab.com/ultreia.io/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 385]](https://gitlab.com/ultreia.io/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 386]](https://gitlab.com/ultreia.io/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 390]](https://gitlab.com/ultreia.io/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 392]](https://gitlab.com/ultreia.io/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 393]](https://gitlab.com/ultreia.io/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 394]](https://gitlab.com/ultreia.io/ird-observe/issues/394) **Erreur de légende pour la cartographie des marées ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 125]](https://gitlab.com/ultreia.io/ird-observe/issues/125) **ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 172]](https://gitlab.com/ultreia.io/ird-observe/issues/172) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 178]](https://gitlab.com/ultreia.io/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 245]](https://gitlab.com/ultreia.io/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 272]](https://gitlab.com/ultreia.io/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 317]](https://gitlab.com/ultreia.io/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 319]](https://gitlab.com/ultreia.io/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 321]](https://gitlab.com/ultreia.io/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 322]](https://gitlab.com/ultreia.io/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 327]](https://gitlab.com/ultreia.io/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 331]](https://gitlab.com/ultreia.io/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 333]](https://gitlab.com/ultreia.io/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 336]](https://gitlab.com/ultreia.io/ird-observe/issues/336) **Problème technique lors de la tentative d'accès au formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 341]](https://gitlab.com/ultreia.io/ird-observe/issues/341) **[PS] Mise en page formulaire Calée / Mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 342]](https://gitlab.com/ultreia.io/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 346]](https://gitlab.com/ultreia.io/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 347]](https://gitlab.com/ultreia.io/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 355]](https://gitlab.com/ultreia.io/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 356]](https://gitlab.com/ultreia.io/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 358]](https://gitlab.com/ultreia.io/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 359]](https://gitlab.com/ultreia.io/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 361]](https://gitlab.com/ultreia.io/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 362]](https://gitlab.com/ultreia.io/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 367]](https://gitlab.com/ultreia.io/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 369]](https://gitlab.com/ultreia.io/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 372]](https://gitlab.com/ultreia.io/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 378]](https://gitlab.com/ultreia.io/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 379]](https://gitlab.com/ultreia.io/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 380]](https://gitlab.com/ultreia.io/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 381]](https://gitlab.com/ultreia.io/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 382]](https://gitlab.com/ultreia.io/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 383]](https://gitlab.com/ultreia.io/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 387]](https://gitlab.com/ultreia.io/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 388]](https://gitlab.com/ultreia.io/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 389]](https://gitlab.com/ultreia.io/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 391]](https://gitlab.com/ultreia.io/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 396]](https://gitlab.com/ultreia.io/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 246]](https://gitlab.com/ultreia.io/ird-observe/issues/246) **Traductions à améliorer** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Tâche 262]](https://gitlab.com/ultreia.io/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ## Version [5.0](https://gitlab.com/ultreia.io/ird-observe/milestones/32) Mise en place web services

*(from redmine: created on 2014-02-05)* @@ -946,36 +803,122 @@ Mise en place web services

*(from redmine: created on 2014-02-05)* * [Serveur (observe-5.0.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) ### Issues + * [[Anomalie 105]](https://gitlab.com/ultreia.io/ird-observe/issues/105) **Valeurs nulles autorisées dans les champs contenant des topiaid de clés étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 112]](https://gitlab.com/ultreia.io/ird-observe/issues/112) **Réplication des données non cloisonnée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 131]](https://gitlab.com/ultreia.io/ird-observe/issues/131) **Problème de création d'une base locale depuis la base centrale si trop de marées sélectionnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 259]](https://gitlab.com/ultreia.io/ird-observe/issues/259) **[PS] Formulaire "rejet de thon"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 421]](https://gitlab.com/ultreia.io/ird-observe/issues/421) **Comportement de l'assistant de chargement d'une sauvegarde** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 451]](https://gitlab.com/ultreia.io/ird-observe/issues/451) **[LL] l'export de marées LL est exagérément long** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 498]](https://gitlab.com/ultreia.io/ird-observe/issues/498) **Certains Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 499]](https://gitlab.com/ultreia.io/ird-observe/issues/499) **Des clics multiples sur "Charger la source de données/Utiliser" provoquent une exception** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 501]](https://gitlab.com/ultreia.io/ird-observe/issues/501) **[PS] Calculs taille/poids : Problème sur recalcul** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 503]](https://gitlab.com/ultreia.io/ird-observe/issues/503) **Imposible de renseigner un date si la valeur d'origine est null** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 509]](https://gitlab.com/ultreia.io/ird-observe/issues/509) **[EQUIPEMENT BATEAU] Mieux gérer le cas où une caractéristique n'a pas de mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 534]](https://gitlab.com/ultreia.io/ird-observe/issues/534) **[PS] Problème carte ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 539]](https://gitlab.com/ultreia.io/ird-observe/issues/539) **La fonction "Créer l'activité de fin de veille plante"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 541]](https://gitlab.com/ultreia.io/ird-observe/issues/541) **Dans Route/Activité/Calée/Estimation du banc, un champ ne devrait pas être obligatoire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 544]](https://gitlab.com/ultreia.io/ird-observe/issues/544) **Id de virage obligatoire sur sur la schéma de palangre ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 550]](https://gitlab.com/ultreia.io/ird-observe/issues/550) **Import de commentaire dont la ligne fini par un ";"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 553]](https://gitlab.com/ultreia.io/ird-observe/issues/553) **[UI] Mauvais fonctionnement dans les caractéristiques d'équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 556]](https://gitlab.com/ultreia.io/ird-observe/issues/556) **[EQUIPEMENT] La version 4.0.6 permet toujours de saisir des caractéristiques d'équipement sans valeur associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 567]](https://gitlab.com/ultreia.io/ird-observe/issues/567) **[PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 583]](https://gitlab.com/ultreia.io/ird-observe/issues/583) **[LL] Problème de valeur nulle dans le schéma de palangres, haulingIdentifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 588]](https://gitlab.com/ultreia.io/ird-observe/issues/588) **[UI] Impossible d'ajouter son pays à un port** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 590]](https://gitlab.com/ultreia.io/ird-observe/issues/590) **[Actions] [Validation] Problème de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 592]](https://gitlab.com/ultreia.io/ird-observe/issues/592) **[Source de données] Pas de résumé lors de l'import du dernier référentiel chargé (dump)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 593]](https://gitlab.com/ultreia.io/ird-observe/issues/593) **[Source de données] Il manque les templates de wizzard de source de données pour la langue anglaise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 595]](https://gitlab.com/ultreia.io/ird-observe/issues/595) **[Carte] Il manque des symboles dans la légende et aussi dans la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 596]](https://gitlab.com/ultreia.io/ird-observe/issues/596) **[I18n] Chaines non traduites** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 598]](https://gitlab.com/ultreia.io/ird-observe/issues/598) **[Source de données] Erreur d'import des marées avec PJ (oid/blob?)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 599]](https://gitlab.com/ultreia.io/ird-observe/issues/599) **[Carte] La carte ne s'affiche plus en server distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 600]](https://gitlab.com/ultreia.io/ird-observe/issues/600) **[DCP] Message de suppression d'un DCP en serveur distant incorrect** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 601]](https://gitlab.com/ultreia.io/ird-observe/issues/601) **Revoir le chargement de l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 602]](https://gitlab.com/ultreia.io/ird-observe/issues/602) **[Reférentiel] Les actions ne sont pas bien connectés avec la sélection dans la liste** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 603]](https://gitlab.com/ultreia.io/ird-observe/issues/603) **[Calee/Rejet de thon] Niveau de validation du champ "Poids estimé"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 604]](https://gitlab.com/ultreia.io/ird-observe/issues/604) **[Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 605]](https://gitlab.com/ultreia.io/ird-observe/issues/605) **[Actions] Exception lors de la validation des données référentiel en serveur distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 606]](https://gitlab.com/ultreia.io/ird-observe/issues/606) **[Action] Erreur lors de la validation d'une marée LL avec capteur utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 609]](https://gitlab.com/ultreia.io/ird-observe/issues/609) **[GEAR][PS][LL] Le formulaire d'enregistrement des équipements peut produire des enregistrements corrompus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 610]](https://gitlab.com/ultreia.io/ird-observe/issues/610) **Regroupement de petits défauts sur les messages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 119]](https://gitlab.com/ultreia.io/ird-observe/issues/119) **Synchronisation de marées entre bases centrales** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 120]](https://gitlab.com/ultreia.io/ird-observe/issues/120) **Synchronisation de référentiel : plus de possibilités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 121]](https://gitlab.com/ultreia.io/ird-observe/issues/121) **Menu contextuel sur l'arbre de navigation & traitements par lots** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 164]](https://gitlab.com/ultreia.io/ird-observe/issues/164) **Pouvoir sélectionner un ensemble de routes contiguës et les déplacer dans une autre marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 226]](https://gitlab.com/ultreia.io/ird-observe/issues/226) **Pouvoir sélectionner un ensemble d'activités contiguës et les déplacer dans une autre route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 227]](https://gitlab.com/ultreia.io/ird-observe/issues/227) **Mise en place de menus contextuels sur l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 427]](https://gitlab.com/ultreia.io/ird-observe/issues/427) **Migration vers ToPIA 3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 429]](https://gitlab.com/ultreia.io/ird-observe/issues/429) **Supprimer en base la notion d'ouverture ou fermeture de marées, routes, actitivés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 430]](https://gitlab.com/ultreia.io/ird-observe/issues/430) **Gestion de la date de dernière mise à jour des entités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 434]](https://gitlab.com/ultreia.io/ird-observe/issues/434) **[Actions] Migration de l'action de consolidation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 435]](https://gitlab.com/ultreia.io/ird-observe/issues/435) **[Actions] Migration de l'action de validation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 436]](https://gitlab.com/ultreia.io/ird-observe/issues/436) **Création du modèle de sécurité et gestion des utilisateurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 438]](https://gitlab.com/ultreia.io/ird-observe/issues/438) **[Actions] Migration de l'action des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 446]](https://gitlab.com/ultreia.io/ird-observe/issues/446) **Mise à jour du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 449]](https://gitlab.com/ultreia.io/ird-observe/issues/449) **Migration des écrans de saisie (utilisation des services)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 452]](https://gitlab.com/ultreia.io/ird-observe/issues/452) **[Actions] Migration des actions d'administration des sources de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 454]](https://gitlab.com/ultreia.io/ird-observe/issues/454) **Migration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 455]](https://gitlab.com/ultreia.io/ird-observe/issues/455) **[PS] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 456]](https://gitlab.com/ultreia.io/ird-observe/issues/456) **[LL] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 457]](https://gitlab.com/ultreia.io/ird-observe/issues/457) **[PS] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 458]](https://gitlab.com/ultreia.io/ird-observe/issues/458) **[LL] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 459]](https://gitlab.com/ultreia.io/ird-observe/issues/459) **[PS] Migration de l'écran des routes d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 460]](https://gitlab.com/ultreia.io/ird-observe/issues/460) **[PS] Migration de l'écran d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 461]](https://gitlab.com/ultreia.io/ird-observe/issues/461) **[LL] Migration de l'écran des activités d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 462]](https://gitlab.com/ultreia.io/ird-observe/issues/462) **[PS] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 463]](https://gitlab.com/ultreia.io/ird-observe/issues/463) **[LL] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 464]](https://gitlab.com/ultreia.io/ird-observe/issues/464) **[PS] Migration de l'écran des systèmes observés d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 465]](https://gitlab.com/ultreia.io/ird-observe/issues/465) **[PS] Migration de l'écran d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 466]](https://gitlab.com/ultreia.io/ird-observe/issues/466) **[PS] Migration de l'écran d'un objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 467]](https://gitlab.com/ultreia.io/ird-observe/issues/467) **[PS] Migration de l'écran des opération sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 468]](https://gitlab.com/ultreia.io/ird-observe/issues/468) **[PS] Migration de l'écran de l'estimation du banc objet sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 469]](https://gitlab.com/ultreia.io/ird-observe/issues/469) **[PS] Migration de l'écran de la faune observé sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 470]](https://gitlab.com/ultreia.io/ird-observe/issues/470) **[PS] Migration de l'écran de l'estimation du banc d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 471]](https://gitlab.com/ultreia.io/ird-observe/issues/471) **[PS] Migration de l'écran des captures cibles d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 472]](https://gitlab.com/ultreia.io/ird-observe/issues/472) **[PS] Migration de l'écran des rejets thon d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 473]](https://gitlab.com/ultreia.io/ird-observe/issues/473) **[PS] Migration de l'écran des échantillon thon rejeté d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 474]](https://gitlab.com/ultreia.io/ird-observe/issues/474) **[PS] Migration de l'écran des échantillons thon capturés d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 475]](https://gitlab.com/ultreia.io/ird-observe/issues/475) **[PS] Migration de l'écran des échantillons faune accessoire d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 476]](https://gitlab.com/ultreia.io/ird-observe/issues/476) **[PS] Migration de l'écran de la faune accessoire conservée ou rejetée d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 477]](https://gitlab.com/ultreia.io/ird-observe/issues/477) **[LL] Migration des écrans du détail de l'opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 478]](https://gitlab.com/ultreia.io/ird-observe/issues/478) **[LL] Migration de l'écran de la composition globale d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 479]](https://gitlab.com/ultreia.io/ird-observe/issues/479) **[LL] Migration de l'écran de définition du schéma de palangre d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 480]](https://gitlab.com/ultreia.io/ird-observe/issues/480) **[LL] Migration de l'écran des captures d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 481]](https://gitlab.com/ultreia.io/ird-observe/issues/481) **[LL] Migration de l'écran des enregistrements de profondeur d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 482]](https://gitlab.com/ultreia.io/ird-observe/issues/482) **[LL] Migration de l'écran des rencontres d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 483]](https://gitlab.com/ultreia.io/ird-observe/issues/483) **[LL] Migration de l'écran des capteurs utilisés d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 484]](https://gitlab.com/ultreia.io/ird-observe/issues/484) **Ajout de nouvelles fonctionnalités sur la liste des marées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 485]](https://gitlab.com/ultreia.io/ird-observe/issues/485) **[PS] Ajout de nouvelles fonctionnalités sur la liste des routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 486]](https://gitlab.com/ultreia.io/ird-observe/issues/486) **[PS] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 487]](https://gitlab.com/ultreia.io/ird-observe/issues/487) **[LL] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 491]](https://gitlab.com/ultreia.io/ird-observe/issues/491) **[Actions] Migration de l'action d'exportation des données observateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 496]](https://gitlab.com/ultreia.io/ird-observe/issues/496) **Suppression du champs TripSeine#datearriveeport** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 497]](https://gitlab.com/ultreia.io/ird-observe/issues/497) **Faire paraitre le type de marée dans le nom du programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 502]](https://gitlab.com/ultreia.io/ird-observe/issues/502) **Revue de l'algorithme de recherche d'une RTP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 504]](https://gitlab.com/ultreia.io/ird-observe/issues/504) **[Actions] Migration de l'action de synchronisation du referentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 505]](https://gitlab.com/ultreia.io/ird-observe/issues/505) **Mise à jour des librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 533]](https://gitlab.com/ultreia.io/ird-observe/issues/533) **Dans la gestion des équipements bateau, il est impossible d'ajouter une caractéristique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 536]](https://gitlab.com/ultreia.io/ird-observe/issues/536) **Faire disparaître les anciens codes espèces 3L de l'affichage dans les listes d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 548]](https://gitlab.com/ultreia.io/ird-observe/issues/548) **Serveur : Rendre configurable le delais d'expiration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 549]](https://gitlab.com/ultreia.io/ird-observe/issues/549) **recharger la source de donné apres expiration du token** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 561]](https://gitlab.com/ultreia.io/ird-observe/issues/561) **[Source de données] Migration du changement de source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 562]](https://gitlab.com/ultreia.io/ird-observe/issues/562) **[Source de données] Migration du rechargement de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 563]](https://gitlab.com/ultreia.io/ird-observe/issues/563) **[Source de données] Migration de la fermeture de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 564]](https://gitlab.com/ultreia.io/ird-observe/issues/564) **[Source de données] Migration de l'écran d'information de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 565]](https://gitlab.com/ultreia.io/ird-observe/issues/565) **[Source de données] Migration de l'import de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 566]](https://gitlab.com/ultreia.io/ird-observe/issues/566) **[Source de données] Migration de la sauvegarde d'une source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 582]](https://gitlab.com/ultreia.io/ird-observe/issues/582) **[Source de données] Migration du mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 611]](https://gitlab.com/ultreia.io/ird-observe/issues/611) **[SYNCHRO AVANCEE] Ergonomie sur l'écran de gestion avancée du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 447]](https://gitlab.com/ultreia.io/ird-observe/issues/447) **Création de bases pour l'environnement démo** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 543]](https://gitlab.com/ultreia.io/ird-observe/issues/543) **Passage en java 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 545]](https://gitlab.com/ultreia.io/ird-observe/issues/545) **Test Configuration des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 580]](https://gitlab.com/ultreia.io/ird-observe/issues/580) **Intégrer ce observe-reports.properties** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 594]](https://gitlab.com/ultreia.io/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 597]](https://gitlab.com/ultreia.io/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0-2](https://gitlab.com/ultreia.io/ird-observe/milestones/31) Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* @@ -1017,6 +960,9 @@ Traduction modèle + ajout modèle Longline

*(from redmine: created on * [[Evolution 146]](https://gitlab.com/ultreia.io/ird-observe/issues/146) **Add FpaZone reference** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 147]](https://gitlab.com/ultreia.io/ird-observe/issues/147) **Ajout des référentiels du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 148]](https://gitlab.com/ultreia.io/ird-observe/issues/148) **utilisation de schéma sql** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 137]](https://gitlab.com/ultreia.io/ird-observe/issues/137) **Mise à jour librairies nuiton** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 138]](https://gitlab.com/ultreia.io/ird-observe/issues/138) **Supprimer la fonctionnalité d'import depuis les bases accès** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 139]](https://gitlab.com/ultreia.io/ird-observe/issues/139) **Supprimer les anciennes migrations** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.1.1](https://gitlab.com/ultreia.io/ird-observe/milestones/29) 

*(from redmine: created on 2013-10-10)* @@ -1027,7 +973,7 @@ Traduction modèle + ajout modèle Longline

*(from redmine: created on * [Application (observe-3.1.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.…) ### Issues -No issue. + * [[Tâche 101]](https://gitlab.com/ultreia.io/ird-observe/issues/101) **Updates topia to 2.8.1.3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.1](https://gitlab.com/ultreia.io/ird-observe/milestones/28) 

*(from redmine: created on 2013-07-18)* @@ -1044,6 +990,7 @@ No issue. * [[Anomalie 97]](https://gitlab.com/ultreia.io/ird-observe/issues/97) **Doublons et absence de clé primaire dans especefaune_ocean et especethon_ocean** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 99]](https://gitlab.com/ultreia.io/ird-observe/issues/99) **Gros problèmes avec une base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 96]](https://gitlab.com/ultreia.io/ird-observe/issues/96) **Ajouter ce fichier à la distribution** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 100]](https://gitlab.com/ultreia.io/ird-observe/issues/100) **Updates topia to 2.8.1.2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.0-rc-4](https://gitlab.com/ultreia.io/ird-observe/milestones/27) 

*(from redmine: created on 2013-07-17)* @@ -1058,6 +1005,8 @@ No issue. * [[Anomalie 83]](https://gitlab.com/ultreia.io/ird-observe/issues/83) **Manque la vitesse sur le controle des vitesse au niveau de la route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 86]](https://gitlab.com/ultreia.io/ird-observe/issues/86) **Export central -> local : est-ce une erreur ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 88]](https://gitlab.com/ultreia.io/ird-observe/issues/88) **Ajout d'un nouvel onglet dans l'écran À propos pour les traductions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 87]](https://gitlab.com/ultreia.io/ird-observe/issues/87) **Mise à jour du fichier des reports** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 89]](https://gitlab.com/ultreia.io/ird-observe/issues/89) **updates mavenpom to 3.4.13** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.0-rc-3](https://gitlab.com/ultreia.io/ird-observe/milestones/26) 

*(from redmine: created on 2013-07-12)* @@ -1096,6 +1045,9 @@ No issue. ### Issues * [[Anomalie 90]](https://gitlab.com/ultreia.io/ird-observe/issues/90) **Création BD centrale sans référentiel -> initialisation d'un programme -> l'arbre ne montre pas le programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 84]](https://gitlab.com/ultreia.io/ird-observe/issues/84) **Ajout champs Maree#iders** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 69]](https://gitlab.com/ultreia.io/ird-observe/issues/69) **Mettre à jour les traductions espagnoles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 92]](https://gitlab.com/ultreia.io/ird-observe/issues/92) **Updates mavenpom to 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 93]](https://gitlab.com/ultreia.io/ird-observe/issues/93) **Updates h2 to 1.3.173** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.0-rc-1](https://gitlab.com/ultreia.io/ird-observe/milestones/23) 3.0 Release candidate 1

*(from redmine: created on 2013-06-25)* @@ -1145,6 +1097,10 @@ No issue. * [[Evolution 62]](https://gitlab.com/ultreia.io/ird-observe/issues/62) **[TECH] Ne permettre l'utilisation lors de la création de la même base pour faire l'import du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 63]](https://gitlab.com/ultreia.io/ird-observe/issues/63) **[EchantillonThon] Pouvoir modifier l'espèce et la classe de taille en mode effectif** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 64]](https://gitlab.com/ultreia.io/ird-observe/issues/64) **Algorithme de colmatage des données de taille/poids manquantes sur les captures de faune associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 29]](https://gitlab.com/ultreia.io/ird-observe/issues/29) **Mise à jour de librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 35]](https://gitlab.com/ultreia.io/ird-observe/issues/35) **Suppression des modules inutiles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 65]](https://gitlab.com/ultreia.io/ird-observe/issues/65) **[Validation] Mettre tous les validateurs dans le module dédié** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 66]](https://gitlab.com/ultreia.io/ird-observe/issues/66) **Changer la disposition des libellés de traductions dans les formulaire du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [1.1](https://gitlab.com/ultreia.io/ird-observe/milestones/21) 

*(from redmine: created on 2011-08-02)* @@ -1189,6 +1145,9 @@ No issue. * [[Anomalie 19]](https://gitlab.com/ultreia.io/ird-observe/issues/19) **Lors d'une erreur dans les actions, on ne voit pas bien les erreurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 20]](https://gitlab.com/ultreia.io/ird-observe/issues/20) **L'ajout de nouvelles entitées via la synchronisation ne fonctionne pas pour les liasions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 10]](https://gitlab.com/ultreia.io/ird-observe/issues/10) **Mettre à jour la doc avec les PJ ici présentes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 1]](https://gitlab.com/ultreia.io/ird-observe/issues/1) **Migrates from labs.libre-entreprise.org to forge.codelutin.com** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 3]](https://gitlab.com/ultreia.io/ird-observe/issues/3) **Upgrades libraries** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 23]](https://gitlab.com/ultreia.io/ird-observe/issues/23) **Ne plus déployer observe-cli** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [2.4](https://gitlab.com/ultreia.io/ird-observe/milestones/18) 

*(from redmine: created on 2011-08-02)* ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log @@ -41,7 +41,7 @@ fi echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" rm -rf target/gitlab_cache -mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 ===================================== bin/stage_drop.sh ===================================== --- a/bin/stage_drop.sh +++ b/bin/stage_drop.sh @@ -1,11 +1,11 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master -DEVELOP=develop STAGE=frirdobserve -LOG_DIR=/tmp/${PROJECT}-stage +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) +VERSION=${VERSION/-SNAPSHOT/} +LOG_DIR=/tmp/${PROJECT}-${VERSION} echo "log dir: $LOG_DIR" rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} @@ -14,4 +14,4 @@ echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" -mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log ===================================== bin/stage_release.sh ===================================== --- a/bin/stage_release.sh +++ b/bin/stage_release.sh @@ -1,17 +1,17 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master -DEVELOP=develop STAGE=frirdobserve -LOG_DIR=/tmp/${PROJECT}-stage +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) +VERSION=${VERSION/-SNAPSHOT/} +LOG_DIR=/tmp/${PROJECT}-${VERSION} echo "log dir: $LOG_DIR" rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-5</jaxxVersion> + <jaxxVersion>3.0-alpha-6</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -28,7 +28,7 @@ import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.*; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -145,8 +145,30 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser DeleteSqlStatementGenerator sqlStatementGenerator = new DeleteSqlStatementGenerator(metadataEntity); for (String id : request.getReferentialToRemove()) { - String sql = sqlStatementGenerator.generateSql(id); - result.add(sql); + if (SpeciesDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","species", id)); + + // also remove species_specieslist association + result.add(sqlStatementGenerator.generateAssociationSql("species_specieslist","species", id)); + } + if (OceanDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); + } + if (GearDto.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); + } + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); + } + result.add(sqlStatementGenerator.generateSql(id)); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java @@ -40,6 +40,7 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { private static final Log log = LogFactory.getLog(DeleteSqlStatementGenerator.class); private static final String DELETE_STATEMENT = "DELETE FROM %s.%s WHERE topiaId = '%s';\n"; + private static final String DELETE_ASSOCIATION_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; private final String schemaName; private final String tableName; @@ -61,4 +62,16 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { } + public String generateAssociationSql(String tableName, String columnName, String id) { + + String result = String.format(DELETE_ASSOCIATION_STATEMENT, schemaName, tableName, columnName, id); + + if (log.isDebugEnabled()) { + log.debug("sql: " + result); + } + + return result; + + } + } View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/1357f34b03dfe077c92d180b9…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreia.io / ird-observe Commits: 8b442df0 by Tony CHEMIT at 2017-03-11T12:49:48+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/8b442df05f5e1aac6a593abaaa…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v6.0-RC-1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 8b442df0 by Tony CHEMIT at 2017-03-11T12:49:48+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 365fe5e3 by Tony CHEMIT at 2017-03-11T12:56:01+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - f0350492 by Tony CHEMIT at 2017-03-11T12:56:05+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 76b52572 by Tony CHEMIT at 2017-03-11T12:56:05+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - ebf49628 by Tony CHEMIT at 2017-03-11T12:56:06+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/5c4ba81edb6e05953509ef0f9…

1 0

[Git][ultreia.io/ird-observe][develop] 3 commits: fix scripts
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 069012b8 by Tony CHEMIT at 2017-03-11T12:47:32+01:00 fix scripts - - - - - fd44c369 by Tony CHEMIT at 2017-03-11T12:48:55+01:00 fix scripts - - - - - 5c4ba81e by Tony CHEMIT at 2017-03-11T12:49:31+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 28 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - bin/stage_drop.sh - bin/stage_release.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log ===================================== bin/stage_drop.sh ===================================== --- a/bin/stage_drop.sh +++ b/bin/stage_drop.sh @@ -1,11 +1,11 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master -DEVELOP=develop STAGE=frirdobserve -LOG_DIR=/tmp/${PROJECT}-stage +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) +VERSION=${VERSION/-SNAPSHOT/} +LOG_DIR=/tmp/${PROJECT}-${VERSION} echo "log dir: $LOG_DIR" rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} @@ -14,4 +14,4 @@ echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" -mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log ===================================== bin/stage_release.sh ===================================== --- a/bin/stage_release.sh +++ b/bin/stage_release.sh @@ -1,17 +1,17 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master -DEVELOP=develop STAGE=frirdobserve -LOG_DIR=/tmp/${PROJECT}-stage +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) +VERSION=${VERSION/-SNAPSHOT/} +LOG_DIR=/tmp/${PROJECT}-${VERSION} echo "log dir: $LOG_DIR" rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/b3d6eb71b218d015048f79776…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] reroll release 6.0-RC-1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: b3d6eb71 by Tony CHEMIT at 2017-03-11T12:44:26+01:00 reroll release 6.0-RC-1 - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-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>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-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>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/b3d6eb71b218d015048f79776e…

1 0

[Git][ultreia.io/ird-observe] Deleted tag v6.0-RC-1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag v6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] use last jaxx version
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 5f3c3f84 by Tony CHEMIT at 2017-03-11T12:43:11+01:00 use last jaxx version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-5</jaxxVersion> + <jaxxVersion>3.0-alpha-6</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/5f3c3f84c563762b6efb5e68ba…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release script
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 24ed6789 by Tony CHEMIT at 2017-03-11T10:24:15+01:00 fix release script - - - - - 1 changed file: - bin/release_create.sh Changes: ===================================== bin/release_create.sh ===================================== --- a/bin/release_create.sh +++ b/bin/release_create.sh @@ -39,4 +39,4 @@ if [ ! "$?" == "0" ]; then fi echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/24ed67892bb7da0a0c4c44c37c…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT deleted branch release/5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed new tag v5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/5.3.3] [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch release/5.3.3 at ultreia.io / ird-observe Commits: f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</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>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/f3a42991e6d262a325f70939b3…

1 0

[Git][ultreia.io/ird-observe][master-5.x] 9 commits: [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 41d3e28f by Tony CHEMIT at 2017-03-10T16:06:44+01:00 [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development - - - - - 43a830c6 by Tony CHEMIT at 2017-03-10T16:14:02+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 3bbd1da0 by Tony CHEMIT at 2017-03-10T16:14:03+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - b3a14be8 by Tony CHEMIT at 2017-03-10T16:14:04+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - beff6db1 by Tony CHEMIT at 2017-03-10T16:26:09+01:00 improve scripts - - - - - fb124529 by Tony CHEMIT at 2017-03-10T16:46:07+01:00 will replay version 5.3.3 - - - - - c9db738c by Tony CHEMIT at 2017-03-10T16:46:50+01:00 fix some type (See #744) - - - - - f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 1ab6d696 by Tony CHEMIT at 2017-03-10T16:55:02+01:00 [jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x' - - - - - 5 changed files: - bin/release_create.sh - bin/stage_create.sh - bin/stage_drop.sh - bin/stage_release.sh - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java Changes: ===================================== bin/release_create.sh ===================================== --- a/bin/release_create.sh +++ b/bin/release_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log @@ -39,4 +39,4 @@ if [ ! "$?" == "0" ]; then fi echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log ===================================== bin/stage_drop.sh ===================================== --- a/bin/stage_drop.sh +++ b/bin/stage_drop.sh @@ -11,7 +11,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 ) echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_release.sh ===================================== --- a/bin/stage_release.sh +++ b/bin/stage_release.sh @@ -1,8 +1,6 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master-5.x -DEVELOP=develop-5.x STAGE=frirdobserve LOG_DIR=/tmp/${PROJECT}-stage @@ -11,7 +9,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser // also remove ocean_species association result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); } - if (Gear.class.equals(request.getReferentialName())) { + if (GearDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); } - if (GearCaracteristic.class.equals(request.getReferentialName())) { + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/de3f1f57dcec9f9a32780f32b…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: f3a42991 by Tony CHEMIT at 2017-03-10T16:47:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 1ab6d696 by Tony CHEMIT at 2017-03-10T16:55:02+01:00 [jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x' - - - - - 130e5b95 by Tony CHEMIT at 2017-03-10T16:55:05+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - e2471f05 by Tony CHEMIT at 2017-03-10T16:55:06+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - ef647c78 by Tony CHEMIT at 2017-03-10T16:55:07+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/7a3b962feade6debcb666c953…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 7a3b962f by Tony CHEMIT at 2017-03-10T16:47:18+01:00 [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-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>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/7a3b962feade6debcb666c9539…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed new branch release/5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 2 commits: will replay version 5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: fb124529 by Tony CHEMIT at 2017-03-10T16:46:07+01:00 will replay version 5.3.3 - - - - - c9db738c by Tony CHEMIT at 2017-03-10T16:46:50+01:00 fix some type (See #744) - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.GearCaracteristicDto; +import fr.ird.observe.services.dto.referential.GearDto; import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; @@ -161,12 +161,12 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser // also remove ocean_species association result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); } - if (Gear.class.equals(request.getReferentialName())) { + if (GearDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); } - if (GearCaracteristic.class.equals(request.getReferentialName())) { + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { // also remove gear_gearcaracteristic association result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-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>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/beff6db191d295c3d60bb6f35…

1 0

[Git][ultreia.io/ird-observe] Deleted tag v5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT deleted tag v5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] report from 5.x (See #744)
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: fb928aa1 by Tony CHEMIT at 2017-03-10T16:44:54+01:00 report from 5.x (See #744) - - - - - 2 changed files: - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -28,7 +28,7 @@ import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.binder.BinderEngine; import fr.ird.observe.services.binder.referential.ReferentialBinderSupport; import fr.ird.observe.services.dto.reference.ReferentialReference; -import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.*; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -145,8 +145,30 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser DeleteSqlStatementGenerator sqlStatementGenerator = new DeleteSqlStatementGenerator(metadataEntity); for (String id : request.getReferentialToRemove()) { - String sql = sqlStatementGenerator.generateSql(id); - result.add(sql); + if (SpeciesDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","species", id)); + + // also remove species_specieslist association + result.add(sqlStatementGenerator.generateAssociationSql("species_specieslist","species", id)); + } + if (OceanDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); + } + if (GearDto.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); + } + if (GearCaracteristicDto.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); + } + result.add(sqlStatementGenerator.generateSql(id)); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java @@ -40,6 +40,7 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { private static final Log log = LogFactory.getLog(DeleteSqlStatementGenerator.class); private static final String DELETE_STATEMENT = "DELETE FROM %s.%s WHERE topiaId = '%s';\n"; + private static final String DELETE_ASSOCIATION_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; private final String schemaName; private final String tableName; @@ -61,4 +62,16 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { } + public String generateAssociationSql(String tableName, String columnName, String id) { + + String result = String.format(DELETE_ASSOCIATION_STATEMENT, schemaName, tableName, columnName, id); + + if (log.isDebugEnabled()) { + log.debug("sql: " + result); + } + + return result; + + } + } View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/fb928aa16ad9c2b5886cb5b23d…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 0e6a6770 by Tony CHEMIT at 2017-03-10T16:34:31+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -73,7 +73,7 @@ ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *In progress*.** +**Closed at *2017-03-08*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/0e6a677005f811630b2e57efb0…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: bb4205cd by Tony CHEMIT at 2017-03-10T16:33:59+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,20 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-10 00:56. + * Last generated at 2017-03-10 16:31. + +## Version [5.3.3](https://gitlab.com/ultreia.io/ird-observe/milestones/86) + +**Closed at 2017-03-10.** + +### Download +* [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.2.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 741]](https://gitlab.com/ultreia.io/ird-observe/issues/741) **[LL] Echec export marée LL vers base centrale** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 743]](https://gitlab.com/ultreia.io/ird-observe/issues/743) **[Synchro referentiel] Impossible d'appliquer un changement de référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 744]](https://gitlab.com/ultreia.io/ird-observe/issues/744) **[Synchro référentiel] Impossible de finir la synchro** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) @@ -324,133 +337,6 @@ **Closed at 2016-01-13.** -## Version [5.0](https://gitlab.com/ultreia.io/ird-observe/milestones/32) -Mise en place web services

*(from redmine: created on 2014-02-05)* - -**Closed at 2016-09-12.** - -### Download -* [Application (observe-5.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) -* [Serveur (observe-5.0.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) - -### Issues - * [[Anomalie 105]](https://gitlab.com/ultreia.io/ird-observe/issues/105) **Valeurs nulles autorisées dans les champs contenant des topiaid de clés étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 112]](https://gitlab.com/ultreia.io/ird-observe/issues/112) **Réplication des données non cloisonnée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 131]](https://gitlab.com/ultreia.io/ird-observe/issues/131) **Problème de création d'une base locale depuis la base centrale si trop de marées sélectionnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 259]](https://gitlab.com/ultreia.io/ird-observe/issues/259) **[PS] Formulaire "rejet de thon"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 421]](https://gitlab.com/ultreia.io/ird-observe/issues/421) **Comportement de l'assistant de chargement d'une sauvegarde** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 451]](https://gitlab.com/ultreia.io/ird-observe/issues/451) **[LL] l'export de marées LL est exagérément long** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 498]](https://gitlab.com/ultreia.io/ird-observe/issues/498) **Certains Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 499]](https://gitlab.com/ultreia.io/ird-observe/issues/499) **Des clics multiples sur "Charger la source de données/Utiliser" provoquent une exception** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 501]](https://gitlab.com/ultreia.io/ird-observe/issues/501) **[PS] Calculs taille/poids : Problème sur recalcul** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 503]](https://gitlab.com/ultreia.io/ird-observe/issues/503) **Imposible de renseigner un date si la valeur d'origine est null** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 509]](https://gitlab.com/ultreia.io/ird-observe/issues/509) **[EQUIPEMENT BATEAU] Mieux gérer le cas où une caractéristique n'a pas de mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 534]](https://gitlab.com/ultreia.io/ird-observe/issues/534) **[PS] Problème carte ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 539]](https://gitlab.com/ultreia.io/ird-observe/issues/539) **La fonction "Créer l'activité de fin de veille plante"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 541]](https://gitlab.com/ultreia.io/ird-observe/issues/541) **Dans Route/Activité/Calée/Estimation du banc, un champ ne devrait pas être obligatoire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 544]](https://gitlab.com/ultreia.io/ird-observe/issues/544) **Id de virage obligatoire sur sur la schéma de palangre ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 550]](https://gitlab.com/ultreia.io/ird-observe/issues/550) **Import de commentaire dont la ligne fini par un ";"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 553]](https://gitlab.com/ultreia.io/ird-observe/issues/553) **[UI] Mauvais fonctionnement dans les caractéristiques d'équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 556]](https://gitlab.com/ultreia.io/ird-observe/issues/556) **[EQUIPEMENT] La version 4.0.6 permet toujours de saisir des caractéristiques d'équipement sans valeur associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 567]](https://gitlab.com/ultreia.io/ird-observe/issues/567) **[PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 583]](https://gitlab.com/ultreia.io/ird-observe/issues/583) **[LL] Problème de valeur nulle dans le schéma de palangres, haulingIdentifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 588]](https://gitlab.com/ultreia.io/ird-observe/issues/588) **[UI] Impossible d'ajouter son pays à un port** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 590]](https://gitlab.com/ultreia.io/ird-observe/issues/590) **[Actions] [Validation] Problème de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 592]](https://gitlab.com/ultreia.io/ird-observe/issues/592) **[Source de données] Pas de résumé lors de l'import du dernier référentiel chargé (dump)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 593]](https://gitlab.com/ultreia.io/ird-observe/issues/593) **[Source de données] Il manque les templates de wizzard de source de données pour la langue anglaise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 595]](https://gitlab.com/ultreia.io/ird-observe/issues/595) **[Carte] Il manque des symboles dans la légende et aussi dans la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 596]](https://gitlab.com/ultreia.io/ird-observe/issues/596) **[I18n] Chaines non traduites** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 598]](https://gitlab.com/ultreia.io/ird-observe/issues/598) **[Source de données] Erreur d'import des marées avec PJ (oid/blob?)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 599]](https://gitlab.com/ultreia.io/ird-observe/issues/599) **[Carte] La carte ne s'affiche plus en server distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 600]](https://gitlab.com/ultreia.io/ird-observe/issues/600) **[DCP] Message de suppression d'un DCP en serveur distant incorrect** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 601]](https://gitlab.com/ultreia.io/ird-observe/issues/601) **Revoir le chargement de l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 602]](https://gitlab.com/ultreia.io/ird-observe/issues/602) **[Reférentiel] Les actions ne sont pas bien connectés avec la sélection dans la liste** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 603]](https://gitlab.com/ultreia.io/ird-observe/issues/603) **[Calee/Rejet de thon] Niveau de validation du champ "Poids estimé"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 604]](https://gitlab.com/ultreia.io/ird-observe/issues/604) **[Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 605]](https://gitlab.com/ultreia.io/ird-observe/issues/605) **[Actions] Exception lors de la validation des données référentiel en serveur distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 606]](https://gitlab.com/ultreia.io/ird-observe/issues/606) **[Action] Erreur lors de la validation d'une marée LL avec capteur utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 609]](https://gitlab.com/ultreia.io/ird-observe/issues/609) **[GEAR][PS][LL] Le formulaire d'enregistrement des équipements peut produire des enregistrements corrompus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 610]](https://gitlab.com/ultreia.io/ird-observe/issues/610) **Regroupement de petits défauts sur les messages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 119]](https://gitlab.com/ultreia.io/ird-observe/issues/119) **Synchronisation de marées entre bases centrales** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Evolution 120]](https://gitlab.com/ultreia.io/ird-observe/issues/120) **Synchronisation de référentiel : plus de possibilités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 121]](https://gitlab.com/ultreia.io/ird-observe/issues/121) **Menu contextuel sur l'arbre de navigation & traitements par lots** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 164]](https://gitlab.com/ultreia.io/ird-observe/issues/164) **Pouvoir sélectionner un ensemble de routes contiguës et les déplacer dans une autre marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 226]](https://gitlab.com/ultreia.io/ird-observe/issues/226) **Pouvoir sélectionner un ensemble d'activités contiguës et les déplacer dans une autre route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 227]](https://gitlab.com/ultreia.io/ird-observe/issues/227) **Mise en place de menus contextuels sur l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 427]](https://gitlab.com/ultreia.io/ird-observe/issues/427) **Migration vers ToPIA 3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 429]](https://gitlab.com/ultreia.io/ird-observe/issues/429) **Supprimer en base la notion d'ouverture ou fermeture de marées, routes, actitivés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 430]](https://gitlab.com/ultreia.io/ird-observe/issues/430) **Gestion de la date de dernière mise à jour des entités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 434]](https://gitlab.com/ultreia.io/ird-observe/issues/434) **[Actions] Migration de l'action de consolidation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 435]](https://gitlab.com/ultreia.io/ird-observe/issues/435) **[Actions] Migration de l'action de validation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 436]](https://gitlab.com/ultreia.io/ird-observe/issues/436) **Création du modèle de sécurité et gestion des utilisateurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 438]](https://gitlab.com/ultreia.io/ird-observe/issues/438) **[Actions] Migration de l'action des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 446]](https://gitlab.com/ultreia.io/ird-observe/issues/446) **Mise à jour du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 449]](https://gitlab.com/ultreia.io/ird-observe/issues/449) **Migration des écrans de saisie (utilisation des services)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 452]](https://gitlab.com/ultreia.io/ird-observe/issues/452) **[Actions] Migration des actions d'administration des sources de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 454]](https://gitlab.com/ultreia.io/ird-observe/issues/454) **Migration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 455]](https://gitlab.com/ultreia.io/ird-observe/issues/455) **[PS] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 456]](https://gitlab.com/ultreia.io/ird-observe/issues/456) **[LL] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 457]](https://gitlab.com/ultreia.io/ird-observe/issues/457) **[PS] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 458]](https://gitlab.com/ultreia.io/ird-observe/issues/458) **[LL] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 459]](https://gitlab.com/ultreia.io/ird-observe/issues/459) **[PS] Migration de l'écran des routes d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 460]](https://gitlab.com/ultreia.io/ird-observe/issues/460) **[PS] Migration de l'écran d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 461]](https://gitlab.com/ultreia.io/ird-observe/issues/461) **[LL] Migration de l'écran des activités d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 462]](https://gitlab.com/ultreia.io/ird-observe/issues/462) **[PS] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 463]](https://gitlab.com/ultreia.io/ird-observe/issues/463) **[LL] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 464]](https://gitlab.com/ultreia.io/ird-observe/issues/464) **[PS] Migration de l'écran des systèmes observés d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 465]](https://gitlab.com/ultreia.io/ird-observe/issues/465) **[PS] Migration de l'écran d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 466]](https://gitlab.com/ultreia.io/ird-observe/issues/466) **[PS] Migration de l'écran d'un objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 467]](https://gitlab.com/ultreia.io/ird-observe/issues/467) **[PS] Migration de l'écran des opération sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 468]](https://gitlab.com/ultreia.io/ird-observe/issues/468) **[PS] Migration de l'écran de l'estimation du banc objet sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 469]](https://gitlab.com/ultreia.io/ird-observe/issues/469) **[PS] Migration de l'écran de la faune observé sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 470]](https://gitlab.com/ultreia.io/ird-observe/issues/470) **[PS] Migration de l'écran de l'estimation du banc d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 471]](https://gitlab.com/ultreia.io/ird-observe/issues/471) **[PS] Migration de l'écran des captures cibles d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 472]](https://gitlab.com/ultreia.io/ird-observe/issues/472) **[PS] Migration de l'écran des rejets thon d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 473]](https://gitlab.com/ultreia.io/ird-observe/issues/473) **[PS] Migration de l'écran des échantillon thon rejeté d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 474]](https://gitlab.com/ultreia.io/ird-observe/issues/474) **[PS] Migration de l'écran des échantillons thon capturés d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 475]](https://gitlab.com/ultreia.io/ird-observe/issues/475) **[PS] Migration de l'écran des échantillons faune accessoire d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 476]](https://gitlab.com/ultreia.io/ird-observe/issues/476) **[PS] Migration de l'écran de la faune accessoire conservée ou rejetée d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 477]](https://gitlab.com/ultreia.io/ird-observe/issues/477) **[LL] Migration des écrans du détail de l'opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 478]](https://gitlab.com/ultreia.io/ird-observe/issues/478) **[LL] Migration de l'écran de la composition globale d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 479]](https://gitlab.com/ultreia.io/ird-observe/issues/479) **[LL] Migration de l'écran de définition du schéma de palangre d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 480]](https://gitlab.com/ultreia.io/ird-observe/issues/480) **[LL] Migration de l'écran des captures d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 481]](https://gitlab.com/ultreia.io/ird-observe/issues/481) **[LL] Migration de l'écran des enregistrements de profondeur d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 482]](https://gitlab.com/ultreia.io/ird-observe/issues/482) **[LL] Migration de l'écran des rencontres d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 483]](https://gitlab.com/ultreia.io/ird-observe/issues/483) **[LL] Migration de l'écran des capteurs utilisés d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 484]](https://gitlab.com/ultreia.io/ird-observe/issues/484) **Ajout de nouvelles fonctionnalités sur la liste des marées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 485]](https://gitlab.com/ultreia.io/ird-observe/issues/485) **[PS] Ajout de nouvelles fonctionnalités sur la liste des routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 486]](https://gitlab.com/ultreia.io/ird-observe/issues/486) **[PS] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 487]](https://gitlab.com/ultreia.io/ird-observe/issues/487) **[LL] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 491]](https://gitlab.com/ultreia.io/ird-observe/issues/491) **[Actions] Migration de l'action d'exportation des données observateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 496]](https://gitlab.com/ultreia.io/ird-observe/issues/496) **Suppression du champs TripSeine#datearriveeport** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 497]](https://gitlab.com/ultreia.io/ird-observe/issues/497) **Faire paraitre le type de marée dans le nom du programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 502]](https://gitlab.com/ultreia.io/ird-observe/issues/502) **Revue de l'algorithme de recherche d'une RTP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 504]](https://gitlab.com/ultreia.io/ird-observe/issues/504) **[Actions] Migration de l'action de synchronisation du referentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 505]](https://gitlab.com/ultreia.io/ird-observe/issues/505) **Mise à jour des librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 533]](https://gitlab.com/ultreia.io/ird-observe/issues/533) **Dans la gestion des équipements bateau, il est impossible d'ajouter une caractéristique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 536]](https://gitlab.com/ultreia.io/ird-observe/issues/536) **Faire disparaître les anciens codes espèces 3L de l'affichage dans les listes d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 548]](https://gitlab.com/ultreia.io/ird-observe/issues/548) **Serveur : Rendre configurable le delais d'expiration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 549]](https://gitlab.com/ultreia.io/ird-observe/issues/549) **recharger la source de donné apres expiration du token** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 561]](https://gitlab.com/ultreia.io/ird-observe/issues/561) **[Source de données] Migration du changement de source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 562]](https://gitlab.com/ultreia.io/ird-observe/issues/562) **[Source de données] Migration du rechargement de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 563]](https://gitlab.com/ultreia.io/ird-observe/issues/563) **[Source de données] Migration de la fermeture de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 564]](https://gitlab.com/ultreia.io/ird-observe/issues/564) **[Source de données] Migration de l'écran d'information de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 565]](https://gitlab.com/ultreia.io/ird-observe/issues/565) **[Source de données] Migration de l'import de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 566]](https://gitlab.com/ultreia.io/ird-observe/issues/566) **[Source de données] Migration de la sauvegarde d'une source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 582]](https://gitlab.com/ultreia.io/ird-observe/issues/582) **[Source de données] Migration du mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 611]](https://gitlab.com/ultreia.io/ird-observe/issues/611) **[SYNCHRO AVANCEE] Ergonomie sur l'écran de gestion avancée du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 447]](https://gitlab.com/ultreia.io/ird-observe/issues/447) **Création de bases pour l'environnement démo** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 543]](https://gitlab.com/ultreia.io/ird-observe/issues/543) **Passage en java 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 545]](https://gitlab.com/ultreia.io/ird-observe/issues/545) **Test Configuration des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 580]](https://gitlab.com/ultreia.io/ird-observe/issues/580) **Intégrer ce observe-reports.properties** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 594]](https://gitlab.com/ultreia.io/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 597]](https://gitlab.com/ultreia.io/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - ### Download * [Application (observe-4.0.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) @@ -555,113 +441,6 @@ Mise en place web services

*(from redmine: created on 2014-02-05)* * [[Evolution 424]](https://gitlab.com/ultreia.io/ird-observe/issues/424) **Permettre la configuration des logs au niveau utilisateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 423]](https://gitlab.com/ultreia.io/ird-observe/issues/423) **Remplacer un script sql dans la distribution V4.x par celui-ci** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [4.0-2](https://gitlab.com/ultreia.io/ird-observe/milestones/31) -Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* - -**Closed at 2015-06-08.** - - -### Issues - * [[Anomalie 103]](https://gitlab.com/ultreia.io/ird-observe/issues/103) **[Synchro Référentiel] L'association species.ocean n'est pas synchronisée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 85]](https://gitlab.com/ultreia.io/ird-observe/issues/85) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 109]](https://gitlab.com/ultreia.io/ird-observe/issues/109) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 111]](https://gitlab.com/ultreia.io/ird-observe/issues/111) **Amélioration de performances** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 113]](https://gitlab.com/ultreia.io/ird-observe/issues/113) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 114]](https://gitlab.com/ultreia.io/ird-observe/issues/114) **Ajout de caractéristiques bateau sur une marée (et non dans le référentiel)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 115]](https://gitlab.com/ultreia.io/ird-observe/issues/115) **Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 117]](https://gitlab.com/ultreia.io/ird-observe/issues/117) **Gestion du pool de balises d'objets flottants exploité par le bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 118]](https://gitlab.com/ultreia.io/ird-observe/issues/118) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 133]](https://gitlab.com/ultreia.io/ird-observe/issues/133) **Faire passer le contrôle sur les distances entre activités en warning** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0](https://gitlab.com/ultreia.io/ird-observe/milestones/33) -ObserveLL

*(from redmine: created on 2014-06-23)* - -**Closed at 2015-06-08.** - -### Download -* [Application (observe-4.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.0/…) - -### Issues - * [[Anomalie 199]](https://gitlab.com/ultreia.io/ird-observe/issues/199) **Comportement du contrôle sur les vitesses entre activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 266]](https://gitlab.com/ultreia.io/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 316]](https://gitlab.com/ultreia.io/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 318]](https://gitlab.com/ultreia.io/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 320]](https://gitlab.com/ultreia.io/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 323]](https://gitlab.com/ultreia.io/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 324]](https://gitlab.com/ultreia.io/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 325]](https://gitlab.com/ultreia.io/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 326]](https://gitlab.com/ultreia.io/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 328]](https://gitlab.com/ultreia.io/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 329]](https://gitlab.com/ultreia.io/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 330]](https://gitlab.com/ultreia.io/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 332]](https://gitlab.com/ultreia.io/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 334]](https://gitlab.com/ultreia.io/ird-observe/issues/334) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 335]](https://gitlab.com/ultreia.io/ird-observe/issues/335) **La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 337]](https://gitlab.com/ultreia.io/ird-observe/issues/337) **Le bouton "Ajouter l'opération de pêche" ne doit être disponible que pour une activité de type "Opération de pêche"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 338]](https://gitlab.com/ultreia.io/ird-observe/issues/338) **L'export d'une marée vers la base centrale échoue** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 339]](https://gitlab.com/ultreia.io/ird-observe/issues/339) **[PS] Problèmes d'utilisation du nouvel écran 'Equipements'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 340]](https://gitlab.com/ultreia.io/ird-observe/issues/340) **[PS] Les équipements devraient avoir des caractéristiques par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 345]](https://gitlab.com/ultreia.io/ird-observe/issues/345) **[LL] Comportements erronés du widget des positions en LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 348]](https://gitlab.com/ultreia.io/ird-observe/issues/348) **[LL] Non reprise du quadrant lors de la création d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 349]](https://gitlab.com/ultreia.io/ird-observe/issues/349) **[LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 350]](https://gitlab.com/ultreia.io/ird-observe/issues/350) **Quadrant mal initialisé lors de l'arrvié sur un écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 351]](https://gitlab.com/ultreia.io/ird-observe/issues/351) **Renommage du navire Palengirer inconnu en Palengrier inconnu** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 360]](https://gitlab.com/ultreia.io/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 363]](https://gitlab.com/ultreia.io/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 364]](https://gitlab.com/ultreia.io/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 368]](https://gitlab.com/ultreia.io/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 370]](https://gitlab.com/ultreia.io/ird-observe/issues/370) **[ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons)** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 371]](https://gitlab.com/ultreia.io/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 373]](https://gitlab.com/ultreia.io/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 374]](https://gitlab.com/ultreia.io/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 375]](https://gitlab.com/ultreia.io/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 384]](https://gitlab.com/ultreia.io/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 385]](https://gitlab.com/ultreia.io/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 386]](https://gitlab.com/ultreia.io/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 390]](https://gitlab.com/ultreia.io/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 392]](https://gitlab.com/ultreia.io/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 393]](https://gitlab.com/ultreia.io/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 394]](https://gitlab.com/ultreia.io/ird-observe/issues/394) **Erreur de légende pour la cartographie des marées ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 125]](https://gitlab.com/ultreia.io/ird-observe/issues/125) **ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 172]](https://gitlab.com/ultreia.io/ird-observe/issues/172) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 178]](https://gitlab.com/ultreia.io/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 245]](https://gitlab.com/ultreia.io/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 272]](https://gitlab.com/ultreia.io/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 317]](https://gitlab.com/ultreia.io/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 319]](https://gitlab.com/ultreia.io/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Evolution 321]](https://gitlab.com/ultreia.io/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 322]](https://gitlab.com/ultreia.io/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 327]](https://gitlab.com/ultreia.io/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 331]](https://gitlab.com/ultreia.io/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 333]](https://gitlab.com/ultreia.io/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 336]](https://gitlab.com/ultreia.io/ird-observe/issues/336) **Problème technique lors de la tentative d'accès au formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 341]](https://gitlab.com/ultreia.io/ird-observe/issues/341) **[PS] Mise en page formulaire Calée / Mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 342]](https://gitlab.com/ultreia.io/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 346]](https://gitlab.com/ultreia.io/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 347]](https://gitlab.com/ultreia.io/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 355]](https://gitlab.com/ultreia.io/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 356]](https://gitlab.com/ultreia.io/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 358]](https://gitlab.com/ultreia.io/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 359]](https://gitlab.com/ultreia.io/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 361]](https://gitlab.com/ultreia.io/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 362]](https://gitlab.com/ultreia.io/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 367]](https://gitlab.com/ultreia.io/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 369]](https://gitlab.com/ultreia.io/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 372]](https://gitlab.com/ultreia.io/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 378]](https://gitlab.com/ultreia.io/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 379]](https://gitlab.com/ultreia.io/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 380]](https://gitlab.com/ultreia.io/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 381]](https://gitlab.com/ultreia.io/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 382]](https://gitlab.com/ultreia.io/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 383]](https://gitlab.com/ultreia.io/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 387]](https://gitlab.com/ultreia.io/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 388]](https://gitlab.com/ultreia.io/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 389]](https://gitlab.com/ultreia.io/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 391]](https://gitlab.com/ultreia.io/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 396]](https://gitlab.com/ultreia.io/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 246]](https://gitlab.com/ultreia.io/ird-observe/issues/246) **Traductions à améliorer** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Tâche 262]](https://gitlab.com/ultreia.io/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - ## Version [3.15.1](https://gitlab.com/ultreia.io/ird-observe/milestones/49) 

*(from redmine: created on 2015-03-22)* @@ -925,6 +704,240 @@ Intégration des référentiels longline + diverses évolutions et corrections&# * [[Evolution 154]](https://gitlab.com/ultreia.io/ird-observe/issues/154) **Ajout d'un champs gearType sur les programmes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 153]](https://gitlab.com/ultreia.io/ird-observe/issues/153) **Ajout des traductions du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [4.0](https://gitlab.com/ultreia.io/ird-observe/milestones/33) +ObserveLL

*(from redmine: created on 2014-06-23)* + +**Closed at 2015-06-08.** + +### Download +* [Application (observe-4.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.0/…) + +### Issues + * [[Anomalie 199]](https://gitlab.com/ultreia.io/ird-observe/issues/199) **Comportement du contrôle sur les vitesses entre activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 266]](https://gitlab.com/ultreia.io/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 316]](https://gitlab.com/ultreia.io/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 318]](https://gitlab.com/ultreia.io/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 320]](https://gitlab.com/ultreia.io/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 323]](https://gitlab.com/ultreia.io/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 324]](https://gitlab.com/ultreia.io/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 325]](https://gitlab.com/ultreia.io/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 326]](https://gitlab.com/ultreia.io/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 328]](https://gitlab.com/ultreia.io/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 329]](https://gitlab.com/ultreia.io/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 330]](https://gitlab.com/ultreia.io/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 332]](https://gitlab.com/ultreia.io/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 334]](https://gitlab.com/ultreia.io/ird-observe/issues/334) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 335]](https://gitlab.com/ultreia.io/ird-observe/issues/335) **La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 337]](https://gitlab.com/ultreia.io/ird-observe/issues/337) **Le bouton "Ajouter l'opération de pêche" ne doit être disponible que pour une activité de type "Opération de pêche"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 338]](https://gitlab.com/ultreia.io/ird-observe/issues/338) **L'export d'une marée vers la base centrale échoue** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 339]](https://gitlab.com/ultreia.io/ird-observe/issues/339) **[PS] Problèmes d'utilisation du nouvel écran 'Equipements'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 340]](https://gitlab.com/ultreia.io/ird-observe/issues/340) **[PS] Les équipements devraient avoir des caractéristiques par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 345]](https://gitlab.com/ultreia.io/ird-observe/issues/345) **[LL] Comportements erronés du widget des positions en LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 348]](https://gitlab.com/ultreia.io/ird-observe/issues/348) **[LL] Non reprise du quadrant lors de la création d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 349]](https://gitlab.com/ultreia.io/ird-observe/issues/349) **[LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 350]](https://gitlab.com/ultreia.io/ird-observe/issues/350) **Quadrant mal initialisé lors de l'arrvié sur un écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 351]](https://gitlab.com/ultreia.io/ird-observe/issues/351) **Renommage du navire Palengirer inconnu en Palengrier inconnu** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 360]](https://gitlab.com/ultreia.io/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 363]](https://gitlab.com/ultreia.io/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 364]](https://gitlab.com/ultreia.io/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 368]](https://gitlab.com/ultreia.io/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 370]](https://gitlab.com/ultreia.io/ird-observe/issues/370) **[ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons)** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 371]](https://gitlab.com/ultreia.io/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 373]](https://gitlab.com/ultreia.io/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 374]](https://gitlab.com/ultreia.io/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 375]](https://gitlab.com/ultreia.io/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 384]](https://gitlab.com/ultreia.io/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 385]](https://gitlab.com/ultreia.io/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 386]](https://gitlab.com/ultreia.io/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 390]](https://gitlab.com/ultreia.io/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 392]](https://gitlab.com/ultreia.io/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 393]](https://gitlab.com/ultreia.io/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 394]](https://gitlab.com/ultreia.io/ird-observe/issues/394) **Erreur de légende pour la cartographie des marées ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 125]](https://gitlab.com/ultreia.io/ird-observe/issues/125) **ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 172]](https://gitlab.com/ultreia.io/ird-observe/issues/172) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 178]](https://gitlab.com/ultreia.io/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 245]](https://gitlab.com/ultreia.io/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 272]](https://gitlab.com/ultreia.io/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 317]](https://gitlab.com/ultreia.io/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 319]](https://gitlab.com/ultreia.io/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 321]](https://gitlab.com/ultreia.io/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 322]](https://gitlab.com/ultreia.io/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 327]](https://gitlab.com/ultreia.io/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 331]](https://gitlab.com/ultreia.io/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 333]](https://gitlab.com/ultreia.io/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 336]](https://gitlab.com/ultreia.io/ird-observe/issues/336) **Problème technique lors de la tentative d'accès au formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 341]](https://gitlab.com/ultreia.io/ird-observe/issues/341) **[PS] Mise en page formulaire Calée / Mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 342]](https://gitlab.com/ultreia.io/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 346]](https://gitlab.com/ultreia.io/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 347]](https://gitlab.com/ultreia.io/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 355]](https://gitlab.com/ultreia.io/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 356]](https://gitlab.com/ultreia.io/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 358]](https://gitlab.com/ultreia.io/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 359]](https://gitlab.com/ultreia.io/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 361]](https://gitlab.com/ultreia.io/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 362]](https://gitlab.com/ultreia.io/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 367]](https://gitlab.com/ultreia.io/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 369]](https://gitlab.com/ultreia.io/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 372]](https://gitlab.com/ultreia.io/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 378]](https://gitlab.com/ultreia.io/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 379]](https://gitlab.com/ultreia.io/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 380]](https://gitlab.com/ultreia.io/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 381]](https://gitlab.com/ultreia.io/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 382]](https://gitlab.com/ultreia.io/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 383]](https://gitlab.com/ultreia.io/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 387]](https://gitlab.com/ultreia.io/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 388]](https://gitlab.com/ultreia.io/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 389]](https://gitlab.com/ultreia.io/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 391]](https://gitlab.com/ultreia.io/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 396]](https://gitlab.com/ultreia.io/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 246]](https://gitlab.com/ultreia.io/ird-observe/issues/246) **Traductions à améliorer** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Tâche 262]](https://gitlab.com/ultreia.io/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + +## Version [5.0](https://gitlab.com/ultreia.io/ird-observe/milestones/32) +Mise en place web services

*(from redmine: created on 2014-02-05)* + +**Closed at 2016-09-12.** + +### Download +* [Application (observe-5.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) +* [Serveur (observe-5.0.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) + +### Issues + * [[Anomalie 105]](https://gitlab.com/ultreia.io/ird-observe/issues/105) **Valeurs nulles autorisées dans les champs contenant des topiaid de clés étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 112]](https://gitlab.com/ultreia.io/ird-observe/issues/112) **Réplication des données non cloisonnée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 131]](https://gitlab.com/ultreia.io/ird-observe/issues/131) **Problème de création d'une base locale depuis la base centrale si trop de marées sélectionnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 259]](https://gitlab.com/ultreia.io/ird-observe/issues/259) **[PS] Formulaire "rejet de thon"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 421]](https://gitlab.com/ultreia.io/ird-observe/issues/421) **Comportement de l'assistant de chargement d'une sauvegarde** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 451]](https://gitlab.com/ultreia.io/ird-observe/issues/451) **[LL] l'export de marées LL est exagérément long** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 498]](https://gitlab.com/ultreia.io/ird-observe/issues/498) **Certains Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 499]](https://gitlab.com/ultreia.io/ird-observe/issues/499) **Des clics multiples sur "Charger la source de données/Utiliser" provoquent une exception** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 501]](https://gitlab.com/ultreia.io/ird-observe/issues/501) **[PS] Calculs taille/poids : Problème sur recalcul** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 503]](https://gitlab.com/ultreia.io/ird-observe/issues/503) **Imposible de renseigner un date si la valeur d'origine est null** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 509]](https://gitlab.com/ultreia.io/ird-observe/issues/509) **[EQUIPEMENT BATEAU] Mieux gérer le cas où une caractéristique n'a pas de mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 534]](https://gitlab.com/ultreia.io/ird-observe/issues/534) **[PS] Problème carte ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 539]](https://gitlab.com/ultreia.io/ird-observe/issues/539) **La fonction "Créer l'activité de fin de veille plante"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 541]](https://gitlab.com/ultreia.io/ird-observe/issues/541) **Dans Route/Activité/Calée/Estimation du banc, un champ ne devrait pas être obligatoire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 544]](https://gitlab.com/ultreia.io/ird-observe/issues/544) **Id de virage obligatoire sur sur la schéma de palangre ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 550]](https://gitlab.com/ultreia.io/ird-observe/issues/550) **Import de commentaire dont la ligne fini par un ";"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 553]](https://gitlab.com/ultreia.io/ird-observe/issues/553) **[UI] Mauvais fonctionnement dans les caractéristiques d'équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 556]](https://gitlab.com/ultreia.io/ird-observe/issues/556) **[EQUIPEMENT] La version 4.0.6 permet toujours de saisir des caractéristiques d'équipement sans valeur associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 567]](https://gitlab.com/ultreia.io/ird-observe/issues/567) **[PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 583]](https://gitlab.com/ultreia.io/ird-observe/issues/583) **[LL] Problème de valeur nulle dans le schéma de palangres, haulingIdentifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 588]](https://gitlab.com/ultreia.io/ird-observe/issues/588) **[UI] Impossible d'ajouter son pays à un port** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 590]](https://gitlab.com/ultreia.io/ird-observe/issues/590) **[Actions] [Validation] Problème de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 592]](https://gitlab.com/ultreia.io/ird-observe/issues/592) **[Source de données] Pas de résumé lors de l'import du dernier référentiel chargé (dump)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 593]](https://gitlab.com/ultreia.io/ird-observe/issues/593) **[Source de données] Il manque les templates de wizzard de source de données pour la langue anglaise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 595]](https://gitlab.com/ultreia.io/ird-observe/issues/595) **[Carte] Il manque des symboles dans la légende et aussi dans la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 596]](https://gitlab.com/ultreia.io/ird-observe/issues/596) **[I18n] Chaines non traduites** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 598]](https://gitlab.com/ultreia.io/ird-observe/issues/598) **[Source de données] Erreur d'import des marées avec PJ (oid/blob?)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 599]](https://gitlab.com/ultreia.io/ird-observe/issues/599) **[Carte] La carte ne s'affiche plus en server distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 600]](https://gitlab.com/ultreia.io/ird-observe/issues/600) **[DCP] Message de suppression d'un DCP en serveur distant incorrect** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 601]](https://gitlab.com/ultreia.io/ird-observe/issues/601) **Revoir le chargement de l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 602]](https://gitlab.com/ultreia.io/ird-observe/issues/602) **[Reférentiel] Les actions ne sont pas bien connectés avec la sélection dans la liste** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 603]](https://gitlab.com/ultreia.io/ird-observe/issues/603) **[Calee/Rejet de thon] Niveau de validation du champ "Poids estimé"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 604]](https://gitlab.com/ultreia.io/ird-observe/issues/604) **[Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 605]](https://gitlab.com/ultreia.io/ird-observe/issues/605) **[Actions] Exception lors de la validation des données référentiel en serveur distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 606]](https://gitlab.com/ultreia.io/ird-observe/issues/606) **[Action] Erreur lors de la validation d'une marée LL avec capteur utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 609]](https://gitlab.com/ultreia.io/ird-observe/issues/609) **[GEAR][PS][LL] Le formulaire d'enregistrement des équipements peut produire des enregistrements corrompus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 610]](https://gitlab.com/ultreia.io/ird-observe/issues/610) **Regroupement de petits défauts sur les messages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 119]](https://gitlab.com/ultreia.io/ird-observe/issues/119) **Synchronisation de marées entre bases centrales** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 120]](https://gitlab.com/ultreia.io/ird-observe/issues/120) **Synchronisation de référentiel : plus de possibilités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 121]](https://gitlab.com/ultreia.io/ird-observe/issues/121) **Menu contextuel sur l'arbre de navigation & traitements par lots** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 164]](https://gitlab.com/ultreia.io/ird-observe/issues/164) **Pouvoir sélectionner un ensemble de routes contiguës et les déplacer dans une autre marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 226]](https://gitlab.com/ultreia.io/ird-observe/issues/226) **Pouvoir sélectionner un ensemble d'activités contiguës et les déplacer dans une autre route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 227]](https://gitlab.com/ultreia.io/ird-observe/issues/227) **Mise en place de menus contextuels sur l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 427]](https://gitlab.com/ultreia.io/ird-observe/issues/427) **Migration vers ToPIA 3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 429]](https://gitlab.com/ultreia.io/ird-observe/issues/429) **Supprimer en base la notion d'ouverture ou fermeture de marées, routes, actitivés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 430]](https://gitlab.com/ultreia.io/ird-observe/issues/430) **Gestion de la date de dernière mise à jour des entités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 434]](https://gitlab.com/ultreia.io/ird-observe/issues/434) **[Actions] Migration de l'action de consolidation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 435]](https://gitlab.com/ultreia.io/ird-observe/issues/435) **[Actions] Migration de l'action de validation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 436]](https://gitlab.com/ultreia.io/ird-observe/issues/436) **Création du modèle de sécurité et gestion des utilisateurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 438]](https://gitlab.com/ultreia.io/ird-observe/issues/438) **[Actions] Migration de l'action des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 446]](https://gitlab.com/ultreia.io/ird-observe/issues/446) **Mise à jour du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 449]](https://gitlab.com/ultreia.io/ird-observe/issues/449) **Migration des écrans de saisie (utilisation des services)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 452]](https://gitlab.com/ultreia.io/ird-observe/issues/452) **[Actions] Migration des actions d'administration des sources de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 454]](https://gitlab.com/ultreia.io/ird-observe/issues/454) **Migration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 455]](https://gitlab.com/ultreia.io/ird-observe/issues/455) **[PS] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 456]](https://gitlab.com/ultreia.io/ird-observe/issues/456) **[LL] Migration de l'écran d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 457]](https://gitlab.com/ultreia.io/ird-observe/issues/457) **[PS] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 458]](https://gitlab.com/ultreia.io/ird-observe/issues/458) **[LL] Migration de l'écran des équipements d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 459]](https://gitlab.com/ultreia.io/ird-observe/issues/459) **[PS] Migration de l'écran des routes d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 460]](https://gitlab.com/ultreia.io/ird-observe/issues/460) **[PS] Migration de l'écran d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 461]](https://gitlab.com/ultreia.io/ird-observe/issues/461) **[LL] Migration de l'écran des activités d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 462]](https://gitlab.com/ultreia.io/ird-observe/issues/462) **[PS] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 463]](https://gitlab.com/ultreia.io/ird-observe/issues/463) **[LL] Migration de l'écran d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 464]](https://gitlab.com/ultreia.io/ird-observe/issues/464) **[PS] Migration de l'écran des systèmes observés d'une activité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 465]](https://gitlab.com/ultreia.io/ird-observe/issues/465) **[PS] Migration de l'écran d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 466]](https://gitlab.com/ultreia.io/ird-observe/issues/466) **[PS] Migration de l'écran d'un objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 467]](https://gitlab.com/ultreia.io/ird-observe/issues/467) **[PS] Migration de l'écran des opération sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 468]](https://gitlab.com/ultreia.io/ird-observe/issues/468) **[PS] Migration de l'écran de l'estimation du banc objet sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 469]](https://gitlab.com/ultreia.io/ird-observe/issues/469) **[PS] Migration de l'écran de la faune observé sur objet flottant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 470]](https://gitlab.com/ultreia.io/ird-observe/issues/470) **[PS] Migration de l'écran de l'estimation du banc d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 471]](https://gitlab.com/ultreia.io/ird-observe/issues/471) **[PS] Migration de l'écran des captures cibles d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 472]](https://gitlab.com/ultreia.io/ird-observe/issues/472) **[PS] Migration de l'écran des rejets thon d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 473]](https://gitlab.com/ultreia.io/ird-observe/issues/473) **[PS] Migration de l'écran des échantillon thon rejeté d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 474]](https://gitlab.com/ultreia.io/ird-observe/issues/474) **[PS] Migration de l'écran des échantillons thon capturés d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 475]](https://gitlab.com/ultreia.io/ird-observe/issues/475) **[PS] Migration de l'écran des échantillons faune accessoire d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 476]](https://gitlab.com/ultreia.io/ird-observe/issues/476) **[PS] Migration de l'écran de la faune accessoire conservée ou rejetée d'une calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 477]](https://gitlab.com/ultreia.io/ird-observe/issues/477) **[LL] Migration des écrans du détail de l'opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 478]](https://gitlab.com/ultreia.io/ird-observe/issues/478) **[LL] Migration de l'écran de la composition globale d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 479]](https://gitlab.com/ultreia.io/ird-observe/issues/479) **[LL] Migration de l'écran de définition du schéma de palangre d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 480]](https://gitlab.com/ultreia.io/ird-observe/issues/480) **[LL] Migration de l'écran des captures d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 481]](https://gitlab.com/ultreia.io/ird-observe/issues/481) **[LL] Migration de l'écran des enregistrements de profondeur d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 482]](https://gitlab.com/ultreia.io/ird-observe/issues/482) **[LL] Migration de l'écran des rencontres d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 483]](https://gitlab.com/ultreia.io/ird-observe/issues/483) **[LL] Migration de l'écran des capteurs utilisés d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 484]](https://gitlab.com/ultreia.io/ird-observe/issues/484) **Ajout de nouvelles fonctionnalités sur la liste des marées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 485]](https://gitlab.com/ultreia.io/ird-observe/issues/485) **[PS] Ajout de nouvelles fonctionnalités sur la liste des routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 486]](https://gitlab.com/ultreia.io/ird-observe/issues/486) **[PS] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 487]](https://gitlab.com/ultreia.io/ird-observe/issues/487) **[LL] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 491]](https://gitlab.com/ultreia.io/ird-observe/issues/491) **[Actions] Migration de l'action d'exportation des données observateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 496]](https://gitlab.com/ultreia.io/ird-observe/issues/496) **Suppression du champs TripSeine#datearriveeport** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 497]](https://gitlab.com/ultreia.io/ird-observe/issues/497) **Faire paraitre le type de marée dans le nom du programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 502]](https://gitlab.com/ultreia.io/ird-observe/issues/502) **Revue de l'algorithme de recherche d'une RTP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 504]](https://gitlab.com/ultreia.io/ird-observe/issues/504) **[Actions] Migration de l'action de synchronisation du referentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 505]](https://gitlab.com/ultreia.io/ird-observe/issues/505) **Mise à jour des librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 533]](https://gitlab.com/ultreia.io/ird-observe/issues/533) **Dans la gestion des équipements bateau, il est impossible d'ajouter une caractéristique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 536]](https://gitlab.com/ultreia.io/ird-observe/issues/536) **Faire disparaître les anciens codes espèces 3L de l'affichage dans les listes d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 548]](https://gitlab.com/ultreia.io/ird-observe/issues/548) **Serveur : Rendre configurable le delais d'expiration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 549]](https://gitlab.com/ultreia.io/ird-observe/issues/549) **recharger la source de donné apres expiration du token** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 561]](https://gitlab.com/ultreia.io/ird-observe/issues/561) **[Source de données] Migration du changement de source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 562]](https://gitlab.com/ultreia.io/ird-observe/issues/562) **[Source de données] Migration du rechargement de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 563]](https://gitlab.com/ultreia.io/ird-observe/issues/563) **[Source de données] Migration de la fermeture de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 564]](https://gitlab.com/ultreia.io/ird-observe/issues/564) **[Source de données] Migration de l'écran d'information de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 565]](https://gitlab.com/ultreia.io/ird-observe/issues/565) **[Source de données] Migration de l'import de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 566]](https://gitlab.com/ultreia.io/ird-observe/issues/566) **[Source de données] Migration de la sauvegarde d'une source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 582]](https://gitlab.com/ultreia.io/ird-observe/issues/582) **[Source de données] Migration du mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 611]](https://gitlab.com/ultreia.io/ird-observe/issues/611) **[SYNCHRO AVANCEE] Ergonomie sur l'écran de gestion avancée du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 447]](https://gitlab.com/ultreia.io/ird-observe/issues/447) **Création de bases pour l'environnement démo** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 543]](https://gitlab.com/ultreia.io/ird-observe/issues/543) **Passage en java 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 545]](https://gitlab.com/ultreia.io/ird-observe/issues/545) **Test Configuration des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 580]](https://gitlab.com/ultreia.io/ird-observe/issues/580) **Intégrer ce observe-reports.properties** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 594]](https://gitlab.com/ultreia.io/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 597]](https://gitlab.com/ultreia.io/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + +## Version [4.0-2](https://gitlab.com/ultreia.io/ird-observe/milestones/31) +Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* + +**Closed at 2015-06-08.** + + +### Issues + * [[Anomalie 103]](https://gitlab.com/ultreia.io/ird-observe/issues/103) **[Synchro Référentiel] L'association species.ocean n'est pas synchronisée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 85]](https://gitlab.com/ultreia.io/ird-observe/issues/85) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 109]](https://gitlab.com/ultreia.io/ird-observe/issues/109) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 111]](https://gitlab.com/ultreia.io/ird-observe/issues/111) **Amélioration de performances** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 113]](https://gitlab.com/ultreia.io/ird-observe/issues/113) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 114]](https://gitlab.com/ultreia.io/ird-observe/issues/114) **Ajout de caractéristiques bateau sur une marée (et non dans le référentiel)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 115]](https://gitlab.com/ultreia.io/ird-observe/issues/115) **Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 117]](https://gitlab.com/ultreia.io/ird-observe/issues/117) **Gestion du pool de balises d'objets flottants exploité par le bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 118]](https://gitlab.com/ultreia.io/ird-observe/issues/118) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 133]](https://gitlab.com/ultreia.io/ird-observe/issues/133) **Faire passer le contrôle sur les distances entre activités en warning** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + ## Version [3.5](https://gitlab.com/ultreia.io/ird-observe/milestones/30) Traduction modèle + ajout modèle Longline

*(from redmine: created on 2014-01-09)* View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/bb4205cda7d33fa1ce09e05b46…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] improve scripts
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: beff6db1 by Tony CHEMIT at 2017-03-10T16:26:09+01:00 improve scripts - - - - - 4 changed files: - bin/release_create.sh - bin/stage_create.sh - bin/stage_drop.sh - bin/stage_release.sh Changes: ===================================== bin/release_create.sh ===================================== --- a/bin/release_create.sh +++ b/bin/release_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log @@ -39,4 +39,4 @@ if [ ! "$?" == "0" ]; then fi echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log ===================================== bin/stage_drop.sh ===================================== --- a/bin/stage_drop.sh +++ b/bin/stage_drop.sh @@ -11,7 +11,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 ) echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_release.sh ===================================== --- a/bin/stage_release.sh +++ b/bin/stage_release.sh @@ -1,8 +1,6 @@ #!/usr/bin/env sh PROJECT=ird-observe -MASTER=master-5.x -DEVELOP=develop-5.x STAGE=frirdobserve LOG_DIR=/tmp/${PROJECT}-stage @@ -11,7 +9,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') +STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log +mvn nexus-staging:release -N -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/beff6db191d295c3d60bb6f354…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT deleted branch release/5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/5.3.3] [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch release/5.3.3 at ultreia.io / ird-observe Commits: 61782029 by Tony CHEMIT at 2017-03-10T16:07:05+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</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>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.3</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/6178202933b10ac0bbf8d74aa5…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed new tag v5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master-5.x] 15 commits: [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 6bfea487 by Tony CHEMIT at 2017-03-03T19:55:52+01:00 [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development - - - - - 5b6b0c9a by Tony CHEMIT at 2017-03-03T20:02:13+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - e1486af1 by Tony CHEMIT at 2017-03-03T20:02:13+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - ee3efe8c by Tony CHEMIT at 2017-03-03T20:02:14+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 5a2ddf61 by Tony CHEMIT at 2017-03-06T08:19:42+01:00 upate changelog [skip ci] - - - - - 4c54fbcd by Tony CHEMIT at 2017-03-06T09:24:50+01:00 add release scripts [skip ci] - - - - - ca18ac86 by Tony CHEMIT at 2017-03-06T09:33:57+01:00 improve release script [skip ci] - - - - - c3791225 by Tony CHEMIT at 2017-03-08T14:10:05+01:00 update readme - - - - - 69dbca6f by Tony CHEMIT at 2017-03-10T14:03:37+01:00 update scripts - - - - - 737de3ce by Tony CHEMIT at 2017-03-10T14:41:26+01:00 [Synchro referentiel] Impossible d'appliquer un changement de référentiel (See #743) - - - - - d6ac3871 by Tony CHEMIT at 2017-03-10T15:48:57+01:00 [Synchro référentiel] Impossible de finir la synchro (See #744) - - - - - 176aeeea by Tony CHEMIT at 2017-03-10T16:01:49+01:00 [LL] Echec export marée LL vers base centrale (See #741) - - - - - fc93c94c by Tony CHEMIT at 2017-03-10T16:06:13+01:00 improve + add script - - - - - 61782029 by Tony CHEMIT at 2017-03-10T16:07:05+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - de3f1f57 by Tony CHEMIT at 2017-03-10T16:13:59+01:00 [jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - application-web-configuration/pom.xml - application-web/pom.xml - + bin/release_create.sh - + bin/stage_create.sh - + bin/stage_drop.sh - + bin/stage_release.sh - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/b699eabfd1a5c3e4dab878ac3…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 61782029 by Tony CHEMIT at 2017-03-10T16:07:05+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.3' with non-snapshot versions - - - - - de3f1f57 by Tony CHEMIT at 2017-03-10T16:13:59+01:00 [jgitflow-maven-plugin]merging 'release/5.3.3' into 'master-5.x' - - - - - 43a830c6 by Tony CHEMIT at 2017-03-10T16:14:02+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 3bbd1da0 by Tony CHEMIT at 2017-03-10T16:14:03+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - b3a14be8 by Tony CHEMIT at 2017-03-10T16:14:04+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/41d3e28f42301552296e66908…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 41d3e28f by Tony CHEMIT at 2017-03-10T16:06:44+01:00 [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-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>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.3-SNAPSHOT</version> + <version>5.3.4-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/41d3e28f42301552296e66908d…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/5.3.3
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed new branch release/5.3.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop-5.x] improve + add script
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: fc93c94c by Tony CHEMIT at 2017-03-10T16:06:13+01:00 improve + add script - - - - - 3 changed files: - + bin/release_create.sh - bin/stage_create.sh - pom.xml Changes: ===================================== bin/release_create.sh ===================================== --- /dev/null +++ b/bin/release_create.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash + +PROJECT=ird-observe +MASTER=master-5.x +DEVELOP=develop-5.x +STAGE=frirdobserve + +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) +VERSION=${VERSION/-SNAPSHOT/} +LOG_DIR=/tmp/${PROJECT}-${VERSION} +echo "version to release: $VERSION" +echo "log dir: $LOG_DIR" +rm -rf ${LOG_DIR} +mkdir -p ${LOG_DIR} + +git checkout -B ${MASTER} +git checkout -B ${DEVELOP} + +echo "Start release: $VERSION ($LOG_DIR/release-start.log)" +mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi +echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" +mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi +echo "Get staging id..." +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') + +echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi + +echo "Release stage: $STAGE_ID ($LOG_DIR/stage-release.log)" +mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -31,7 +31,7 @@ fi echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') -echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" +echo "Closing stage: $STAGE_ID ($LOG_DIR/stage-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log if [ ! "$?" == "0" ]; then echo "Error" ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -165,8 +165,6 @@ <organizationId>ultreia.io</organizationId> <projectId>ird-observe</projectId> - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>2.42</jaxxVersion> @@ -214,7 +212,7 @@ <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> - <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> + <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/fc93c94c386bfdb3e65279e603…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] [LL] Echec export marée LL vers base centrale (See #741)
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 176aeeea by Tony CHEMIT at 2017-03-10T16:01:49+01:00 [LL] Echec export marée LL vers base centrale (See #741) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -256,7 +256,7 @@ public class ExportUIHandler extends AdminTabUIHandler { for (TripEntry tripEntry : tripEntries) { - ExportTripRequest exportTripRequest = new ExportTripRequest(false, tripEntry.getProgramId(), tripEntry.getTripId()); + ExportTripRequest exportTripRequest = new ExportTripRequest(true, tripEntry.getProgramId(), tripEntry.getTripId()); ExportTripResult exportTripResult = localTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.exportData.result.export.trip"), exportTripResult, View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/176aeeeac33a76db62c6d1f27b…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] [Synchro référentiel] Impossible de finir la synchro (See #744)
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: d6ac3871 by Tony CHEMIT at 2017-03-10T15:48:57+01:00 [Synchro référentiel] Impossible de finir la synchro (See #744) - - - - - 3 changed files: - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java - services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java Changes: ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -23,9 +23,13 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy */ import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.entities.referentiel.Gear; +import fr.ird.observe.entities.referentiel.GearCaracteristic; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; +import fr.ird.observe.services.dto.referential.OceanDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.service.LastUpdateDateService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService; import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeRequest; @@ -144,8 +148,30 @@ public class UnidirectionalReferentialSynchronizeLocalServiceTopia extends Obser DeleteSqlStatementGenerator sqlStatementGenerator = new DeleteSqlStatementGenerator(metadataEntity); for (String id : request.getReferentialToRemove()) { - String sql = sqlStatementGenerator.generateSql(id); - result.add(sql); + if (SpeciesDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","species", id)); + + // also remove species_specieslist association + result.add(sqlStatementGenerator.generateAssociationSql("species_specieslist","species", id)); + } + if (OceanDto.class.equals(request.getReferentialName())) { + + // also remove ocean_species association + result.add(sqlStatementGenerator.generateAssociationSql("ocean_species","ocean", id)); + } + if (Gear.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gear", id)); + } + if (GearCaracteristic.class.equals(request.getReferentialName())) { + + // also remove gear_gearcaracteristic association + result.add(sqlStatementGenerator.generateAssociationSql("gear_gearcaracteristic","gearcaracteristic", id)); + } + result.add(sqlStatementGenerator.generateSql(id)); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/DeleteSqlStatementGenerator.java @@ -40,6 +40,7 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { private static final Log log = LogFactory.getLog(DeleteSqlStatementGenerator.class); private static final String DELETE_STATEMENT = "DELETE FROM %s.%s WHERE topiaId = '%s';\n"; + private static final String DELETE_ASSOCIATION_STATEMENT = "DELETE FROM %s.%s WHERE %s = '%s';\n"; private final String schemaName; private final String tableName; @@ -61,4 +62,16 @@ public class DeleteSqlStatementGenerator<R extends ReferentialDto> { } + public String generateAssociationSql(String tableName, String columnName, String id) { + + String result = String.format(DELETE_ASSOCIATION_STATEMENT, schemaName, tableName, columnName, id); + + if (log.isDebugEnabled()) { + log.debug("sql: " + result); + } + + return result; + + } + } ===================================== services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java +++ b/services/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java @@ -102,7 +102,7 @@ public class UnidirectionalReferentialSynchronizeEngine { if (needCallback && callbackResults.containsReferentialName(referentialName)) { // l'utilisateur a agit sur ce référentiel - UnidirectionalReferentialSynchronizeCallbackResult callbackResult = callbackResults.getCallbackResult(referentialName); + UnidirectionalReferentialSynchronizeCallbackResult<?> callbackResult = callbackResults.getCallbackResult(referentialName); Map<String, String> ids = callbackResult.getIds(); View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/d6ac387162989fae56f6e7c46b…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 2 commits: update scripts
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 69dbca6f by Tony CHEMIT at 2017-03-10T14:03:37+01:00 update scripts - - - - - 737de3ce by Tony CHEMIT at 2017-03-10T14:41:26+01:00 [Synchro referentiel] Impossible d'appliquer un changement de référentiel (See #743) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java - bin/stage_create.sh - bin/stage_drop.sh - bin/stage_release.sh - pom.xml Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -262,7 +262,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler { box.setBean(this); box.setProperty("safeEntity"); box.setShowReset(true); - box.addPropertyChangeListener("selectedItem", evt -> updateCanApply()); + box.addPropertyChangeListener(BeanComboBox.PROPERTY_SELECTED_ITEM, evt -> updateCanApply()); safeRefsPanel.add(box, key); box.init(decorator, data); ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -18,29 +18,33 @@ git checkout -B ${DEVELOP} echo "Start release: $VERSION ($LOG_DIR/release-start.log)" mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log - -echo "Update changelog ($LOG_DIR/release-changelog.log)" -mvn -N -Pupdate-staging-changelog -Dgitlab.milestone=${VERSION} -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} --log-file ${LOG_DIR}/release-changelog.log - -git commit -m "Update changelog for version $VERSION" CHANGELOG.md - -git stash -git checkout ${PROJECT}-${VERSION} - -echo "Generate site: ($LOG_DIR/release-site.log)" -mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log - -echo "Deploy demo: ($LOG_DIR/release-demo.log)" -mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log - -git stash -git checkout ${DEVELOP} \ No newline at end of file +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi + +echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" +rm -rf target/gitlab_cache + +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi + +git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== bin/stage_drop.sh ===================================== --- a/bin/stage_drop.sh +++ b/bin/stage_drop.sh @@ -11,7 +11,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_release.sh ===================================== --- a/bin/stage_release.sh +++ b/bin/stage_release.sh @@ -11,7 +11,7 @@ rm -rf ${LOG_DIR} mkdir -p ${LOG_DIR} echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2</version> + <version>4</version> </parent> <groupId>fr.ird.observe</groupId> @@ -169,7 +169,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>2.41</jaxxVersion> + <jaxxVersion>2.42</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/c3791225e9ebec0eb2587c802…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 10, 2017

March 10, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 4af51fc1 by Tony CHEMIT at 2017-03-10T00:59:56+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-10 00:23. + * Last generated at 2017-03-10 00:56. ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) @@ -60,7 +60,7 @@ ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *2017-03-09*.** +**Closed at *In progress*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) @@ -319,38 +319,42 @@ * [[Evolution 614]](https://gitlab.com/ultreia.io/ird-observe/issues/614) **[VALIDATION] Remettre en route le contrôle des position avec possibilité de le désactiver** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 617]](https://gitlab.com/ultreia.io/ird-observe/issues/617) **Simplification de la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [5.0-RC-3](https://gitlab.com/ultreia.io/ird-observe/milestones/68) -

*(from redmine: created on 2016-09-05)* - -**Closed at 2016-09-07.** - +## Version [4.0.6](https://gitlab.com/ultreia.io/ird-observe/milestones/64) +

*(from redmine: created on 2015-11-04)* -### Issues - * [[Anomalie 421]](https://gitlab.com/ultreia.io/ird-observe/issues/421) **Comportement de l'assistant de chargement d'une sauvegarde** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 553]](https://gitlab.com/ultreia.io/ird-observe/issues/553) **[UI] Mauvais fonctionnement dans les caractéristiques d'équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 603]](https://gitlab.com/ultreia.io/ird-observe/issues/603) **[Calee/Rejet de thon] Niveau de validation du champ "Poids estimé"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 604]](https://gitlab.com/ultreia.io/ird-observe/issues/604) **[Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 605]](https://gitlab.com/ultreia.io/ird-observe/issues/605) **[Actions] Exception lors de la validation des données référentiel en serveur distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 606]](https://gitlab.com/ultreia.io/ird-observe/issues/606) **[Action] Erreur lors de la validation d'une marée LL avec capteur utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 594]](https://gitlab.com/ultreia.io/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +**Closed at 2016-01-13.** -## Version [5.0-RC-2](https://gitlab.com/ultreia.io/ird-observe/milestones/67) -

*(from redmine: created on 2016-09-01)* +## Version [5.0](https://gitlab.com/ultreia.io/ird-observe/milestones/32) +Mise en place web services

*(from redmine: created on 2014-02-05)* -**Closed at 2016-09-05.** +**Closed at 2016-09-12.** +### Download +* [Application (observe-5.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) +* [Serveur (observe-5.0.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) ### Issues * [[Anomalie 105]](https://gitlab.com/ultreia.io/ird-observe/issues/105) **Valeurs nulles autorisées dans les champs contenant des topiaid de clés étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 112]](https://gitlab.com/ultreia.io/ird-observe/issues/112) **Réplication des données non cloisonnée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 131]](https://gitlab.com/ultreia.io/ird-observe/issues/131) **Problème de création d'une base locale depuis la base centrale si trop de marées sélectionnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 259]](https://gitlab.com/ultreia.io/ird-observe/issues/259) **[PS] Formulaire "rejet de thon"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 421]](https://gitlab.com/ultreia.io/ird-observe/issues/421) **Comportement de l'assistant de chargement d'une sauvegarde** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 451]](https://gitlab.com/ultreia.io/ird-observe/issues/451) **[LL] l'export de marées LL est exagérément long** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 498]](https://gitlab.com/ultreia.io/ird-observe/issues/498) **Certains Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 499]](https://gitlab.com/ultreia.io/ird-observe/issues/499) **Des clics multiples sur "Charger la source de données/Utiliser" provoquent une exception** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 501]](https://gitlab.com/ultreia.io/ird-observe/issues/501) **[PS] Calculs taille/poids : Problème sur recalcul** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 503]](https://gitlab.com/ultreia.io/ird-observe/issues/503) **Imposible de renseigner un date si la valeur d'origine est null** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 509]](https://gitlab.com/ultreia.io/ird-observe/issues/509) **[EQUIPEMENT BATEAU] Mieux gérer le cas où une caractéristique n'a pas de mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 534]](https://gitlab.com/ultreia.io/ird-observe/issues/534) **[PS] Problème carte ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 539]](https://gitlab.com/ultreia.io/ird-observe/issues/539) **La fonction "Créer l'activité de fin de veille plante"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 541]](https://gitlab.com/ultreia.io/ird-observe/issues/541) **Dans Route/Activité/Calée/Estimation du banc, un champ ne devrait pas être obligatoire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 544]](https://gitlab.com/ultreia.io/ird-observe/issues/544) **Id de virage obligatoire sur sur la schéma de palangre ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 550]](https://gitlab.com/ultreia.io/ird-observe/issues/550) **Import de commentaire dont la ligne fini par un ";"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 553]](https://gitlab.com/ultreia.io/ird-observe/issues/553) **[UI] Mauvais fonctionnement dans les caractéristiques d'équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 556]](https://gitlab.com/ultreia.io/ird-observe/issues/556) **[EQUIPEMENT] La version 4.0.6 permet toujours de saisir des caractéristiques d'équipement sans valeur associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 567]](https://gitlab.com/ultreia.io/ird-observe/issues/567) **[PS] Rajouter la contrainte de clé étrangère de nontargetlength.sex vers la table sex** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 583]](https://gitlab.com/ultreia.io/ird-observe/issues/583) **[LL] Problème de valeur nulle dans le schéma de palangres, haulingIdentifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 588]](https://gitlab.com/ultreia.io/ird-observe/issues/588) **[UI] Impossible d'ajouter son pays à un port** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 590]](https://gitlab.com/ultreia.io/ird-observe/issues/590) **[Actions] [Validation] Problème de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 592]](https://gitlab.com/ultreia.io/ird-observe/issues/592) **[Source de données] Pas de résumé lors de l'import du dernier référentiel chargé (dump)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 593]](https://gitlab.com/ultreia.io/ird-observe/issues/593) **[Source de données] Il manque les templates de wizzard de source de données pour la langue anglaise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -361,24 +365,30 @@ * [[Anomalie 600]](https://gitlab.com/ultreia.io/ird-observe/issues/600) **[DCP] Message de suppression d'un DCP en serveur distant incorrect** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 601]](https://gitlab.com/ultreia.io/ird-observe/issues/601) **Revoir le chargement de l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 602]](https://gitlab.com/ultreia.io/ird-observe/issues/602) **[Reférentiel] Les actions ne sont pas bien connectés avec la sélection dans la liste** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 597]](https://gitlab.com/ultreia.io/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [5.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/65) -

*(from redmine: created on 2016-03-01)* - -**Closed at 2016-09-01.** - - -### Issues + * [[Anomalie 603]](https://gitlab.com/ultreia.io/ird-observe/issues/603) **[Calee/Rejet de thon] Niveau de validation du champ "Poids estimé"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 604]](https://gitlab.com/ultreia.io/ird-observe/issues/604) **[Actions] Mise à jour du référentiel, le bouton suivant est actif même si la base de référence n'est pas configurée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 605]](https://gitlab.com/ultreia.io/ird-observe/issues/605) **[Actions] Exception lors de la validation des données référentiel en serveur distant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 606]](https://gitlab.com/ultreia.io/ird-observe/issues/606) **[Action] Erreur lors de la validation d'une marée LL avec capteur utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 609]](https://gitlab.com/ultreia.io/ird-observe/issues/609) **[GEAR][PS][LL] Le formulaire d'enregistrement des équipements peut produire des enregistrements corrompus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 610]](https://gitlab.com/ultreia.io/ird-observe/issues/610) **Regroupement de petits défauts sur les messages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 119]](https://gitlab.com/ultreia.io/ird-observe/issues/119) **Synchronisation de marées entre bases centrales** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Evolution 120]](https://gitlab.com/ultreia.io/ird-observe/issues/120) **Synchronisation de référentiel : plus de possibilités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 121]](https://gitlab.com/ultreia.io/ird-observe/issues/121) **Menu contextuel sur l'arbre de navigation & traitements par lots** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 164]](https://gitlab.com/ultreia.io/ird-observe/issues/164) **Pouvoir sélectionner un ensemble de routes contiguës et les déplacer dans une autre marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 226]](https://gitlab.com/ultreia.io/ird-observe/issues/226) **Pouvoir sélectionner un ensemble d'activités contiguës et les déplacer dans une autre route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 227]](https://gitlab.com/ultreia.io/ird-observe/issues/227) **Mise en place de menus contextuels sur l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 427]](https://gitlab.com/ultreia.io/ird-observe/issues/427) **Migration vers ToPIA 3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 429]](https://gitlab.com/ultreia.io/ird-observe/issues/429) **Supprimer en base la notion d'ouverture ou fermeture de marées, routes, actitivés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 430]](https://gitlab.com/ultreia.io/ird-observe/issues/430) **Gestion de la date de dernière mise à jour des entités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 434]](https://gitlab.com/ultreia.io/ird-observe/issues/434) **[Actions] Migration de l'action de consolidation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 435]](https://gitlab.com/ultreia.io/ird-observe/issues/435) **[Actions] Migration de l'action de validation des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 436]](https://gitlab.com/ultreia.io/ird-observe/issues/436) **Création du modèle de sécurité et gestion des utilisateurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 438]](https://gitlab.com/ultreia.io/ird-observe/issues/438) **[Actions] Migration de l'action des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 446]](https://gitlab.com/ultreia.io/ird-observe/issues/446) **Mise à jour du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 449]](https://gitlab.com/ultreia.io/ird-observe/issues/449) **Migration des écrans de saisie (utilisation des services)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 452]](https://gitlab.com/ultreia.io/ird-observe/issues/452) **[Actions] Migration des actions d'administration des sources de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 454]](https://gitlab.com/ultreia.io/ird-observe/issues/454) **Migration de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -411,10 +421,18 @@ * [[Evolution 481]](https://gitlab.com/ultreia.io/ird-observe/issues/481) **[LL] Migration de l'écran des enregistrements de profondeur d'une opération** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 482]](https://gitlab.com/ultreia.io/ird-observe/issues/482) **[LL] Migration de l'écran des rencontres d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 483]](https://gitlab.com/ultreia.io/ird-observe/issues/483) **[LL] Migration de l'écran des capteurs utilisés d'une opération de pêche** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 484]](https://gitlab.com/ultreia.io/ird-observe/issues/484) **Ajout de nouvelles fonctionnalités sur la liste des marées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 485]](https://gitlab.com/ultreia.io/ird-observe/issues/485) **[PS] Ajout de nouvelles fonctionnalités sur la liste des routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 486]](https://gitlab.com/ultreia.io/ird-observe/issues/486) **[PS] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 487]](https://gitlab.com/ultreia.io/ird-observe/issues/487) **[LL] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 491]](https://gitlab.com/ultreia.io/ird-observe/issues/491) **[Actions] Migration de l'action d'exportation des données observateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 496]](https://gitlab.com/ultreia.io/ird-observe/issues/496) **Suppression du champs TripSeine#datearriveeport** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 497]](https://gitlab.com/ultreia.io/ird-observe/issues/497) **Faire paraitre le type de marée dans le nom du programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 502]](https://gitlab.com/ultreia.io/ird-observe/issues/502) **Revue de l'algorithme de recherche d'une RTP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 504]](https://gitlab.com/ultreia.io/ird-observe/issues/504) **[Actions] Migration de l'action de synchronisation du referentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 505]](https://gitlab.com/ultreia.io/ird-observe/issues/505) **Mise à jour des librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 533]](https://gitlab.com/ultreia.io/ird-observe/issues/533) **Dans la gestion des équipements bateau, il est impossible d'ajouter une caractéristique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 536]](https://gitlab.com/ultreia.io/ird-observe/issues/536) **Faire disparaître les anciens codes espèces 3L de l'affichage dans les listes d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 548]](https://gitlab.com/ultreia.io/ird-observe/issues/548) **Serveur : Rendre configurable le delais d'expiration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 549]](https://gitlab.com/ultreia.io/ird-observe/issues/549) **recharger la source de donné apres expiration du token** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 561]](https://gitlab.com/ultreia.io/ird-observe/issues/561) **[Source de données] Migration du changement de source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -424,12 +442,14 @@ * [[Evolution 565]](https://gitlab.com/ultreia.io/ird-observe/issues/565) **[Source de données] Migration de l'import de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 566]](https://gitlab.com/ultreia.io/ird-observe/issues/566) **[Source de données] Migration de la sauvegarde d'une source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 582]](https://gitlab.com/ultreia.io/ird-observe/issues/582) **[Source de données] Migration du mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 611]](https://gitlab.com/ultreia.io/ird-observe/issues/611) **[SYNCHRO AVANCEE] Ergonomie sur l'écran de gestion avancée du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 447]](https://gitlab.com/ultreia.io/ird-observe/issues/447) **Création de bases pour l'environnement démo** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 543]](https://gitlab.com/ultreia.io/ird-observe/issues/543) **Passage en java 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 545]](https://gitlab.com/ultreia.io/ird-observe/issues/545) **Test Configuration des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0.6](https://gitlab.com/ultreia.io/ird-observe/milestones/64) -

*(from redmine: created on 2015-11-04)* - -**Closed at 2016-01-13.** + * [[Tâche 580]](https://gitlab.com/ultreia.io/ird-observe/issues/580) **Intégrer ce observe-reports.properties** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 594]](https://gitlab.com/ultreia.io/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 597]](https://gitlab.com/ultreia.io/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ### Download * [Application (observe-4.0.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.…) @@ -535,87 +555,46 @@ * [[Evolution 424]](https://gitlab.com/ultreia.io/ird-observe/issues/424) **Permettre la configuration des logs au niveau utilisateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 423]](https://gitlab.com/ultreia.io/ird-observe/issues/423) **Remplacer un script sql dans la distribution V4.x par celui-ci** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [4.0-RC8](https://gitlab.com/ultreia.io/ird-observe/milestones/57) -

*(from redmine: created on 2015-05-29)* - -**Closed at 2015-05-29.** - - -### Issues - * [[Anomalie 393]](https://gitlab.com/ultreia.io/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC7](https://gitlab.com/ultreia.io/ird-observe/milestones/56) -

*(from redmine: created on 2015-05-26)* - -**Closed at 2015-05-28.** - - -### Issues - * [[Anomalie 386]](https://gitlab.com/ultreia.io/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 390]](https://gitlab.com/ultreia.io/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 392]](https://gitlab.com/ultreia.io/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 387]](https://gitlab.com/ultreia.io/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 388]](https://gitlab.com/ultreia.io/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 389]](https://gitlab.com/ultreia.io/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 391]](https://gitlab.com/ultreia.io/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC6](https://gitlab.com/ultreia.io/ird-observe/milestones/54) -

*(from redmine: created on 2015-05-06)* - -**Closed at 2015-05-23.** - - -### Issues - * [[Anomalie 374]](https://gitlab.com/ultreia.io/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 384]](https://gitlab.com/ultreia.io/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 385]](https://gitlab.com/ultreia.io/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 367]](https://gitlab.com/ultreia.io/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 378]](https://gitlab.com/ultreia.io/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 379]](https://gitlab.com/ultreia.io/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 380]](https://gitlab.com/ultreia.io/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 381]](https://gitlab.com/ultreia.io/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 382]](https://gitlab.com/ultreia.io/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 383]](https://gitlab.com/ultreia.io/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC5](https://gitlab.com/ultreia.io/ird-observe/milestones/53) -

*(from redmine: created on 2015-04-22)* - -**Closed at 2015-05-11.** - - -### Issues - * [[Anomalie 368]](https://gitlab.com/ultreia.io/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 371]](https://gitlab.com/ultreia.io/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 373]](https://gitlab.com/ultreia.io/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 375]](https://gitlab.com/ultreia.io/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 369]](https://gitlab.com/ultreia.io/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 372]](https://gitlab.com/ultreia.io/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-RC4](https://gitlab.com/ultreia.io/ird-observe/milestones/52) -

*(from redmine: created on 2015-04-15)* +## Version [4.0-2](https://gitlab.com/ultreia.io/ird-observe/milestones/31) +Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* -**Closed at 2015-04-23.** +**Closed at 2015-06-08.** ### Issues - * [[Anomalie 360]](https://gitlab.com/ultreia.io/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 363]](https://gitlab.com/ultreia.io/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 364]](https://gitlab.com/ultreia.io/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 333]](https://gitlab.com/ultreia.io/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 355]](https://gitlab.com/ultreia.io/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 356]](https://gitlab.com/ultreia.io/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 358]](https://gitlab.com/ultreia.io/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 359]](https://gitlab.com/ultreia.io/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 361]](https://gitlab.com/ultreia.io/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 362]](https://gitlab.com/ultreia.io/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 103]](https://gitlab.com/ultreia.io/ird-observe/issues/103) **[Synchro Référentiel] L'association species.ocean n'est pas synchronisée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 85]](https://gitlab.com/ultreia.io/ird-observe/issues/85) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 109]](https://gitlab.com/ultreia.io/ird-observe/issues/109) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 111]](https://gitlab.com/ultreia.io/ird-observe/issues/111) **Amélioration de performances** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 113]](https://gitlab.com/ultreia.io/ird-observe/issues/113) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 114]](https://gitlab.com/ultreia.io/ird-observe/issues/114) **Ajout de caractéristiques bateau sur une marée (et non dans le référentiel)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 115]](https://gitlab.com/ultreia.io/ird-observe/issues/115) **Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 117]](https://gitlab.com/ultreia.io/ird-observe/issues/117) **Gestion du pool de balises d'objets flottants exploité par le bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 118]](https://gitlab.com/ultreia.io/ird-observe/issues/118) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 133]](https://gitlab.com/ultreia.io/ird-observe/issues/133) **Faire passer le contrôle sur les distances entre activités en warning** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [4.0-RC3](https://gitlab.com/ultreia.io/ird-observe/milestones/51) -

*(from redmine: created on 2015-04-10)* +## Version [4.0](https://gitlab.com/ultreia.io/ird-observe/milestones/33) +ObserveLL

*(from redmine: created on 2014-06-23)* -**Closed at 2015-04-17.** +**Closed at 2015-06-08.** +### Download +* [Application (observe-4.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.0/…) ### Issues + * [[Anomalie 199]](https://gitlab.com/ultreia.io/ird-observe/issues/199) **Comportement du contrôle sur les vitesses entre activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 266]](https://gitlab.com/ultreia.io/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 316]](https://gitlab.com/ultreia.io/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 318]](https://gitlab.com/ultreia.io/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 320]](https://gitlab.com/ultreia.io/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 323]](https://gitlab.com/ultreia.io/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 324]](https://gitlab.com/ultreia.io/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 325]](https://gitlab.com/ultreia.io/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 326]](https://gitlab.com/ultreia.io/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 328]](https://gitlab.com/ultreia.io/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 329]](https://gitlab.com/ultreia.io/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 330]](https://gitlab.com/ultreia.io/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 332]](https://gitlab.com/ultreia.io/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 334]](https://gitlab.com/ultreia.io/ird-observe/issues/334) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité a été ajoutée à une display list d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 335]](https://gitlab.com/ultreia.io/ird-observe/issues/335) **La sauvegarde de marées de la base centrale vers la base locale semble ne pas fonctionner** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Anomalie 337]](https://gitlab.com/ultreia.io/ird-observe/issues/337) **Le bouton "Ajouter l'opération de pêche" ne doit être disponible que pour une activité de type "Opération de pêche"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -627,32 +606,61 @@ * [[Anomalie 349]](https://gitlab.com/ultreia.io/ird-observe/issues/349) **[LL] Lors de l'enregistrement d'une opérationde pêche, perte de l'infromation sur les quadrants** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 350]](https://gitlab.com/ultreia.io/ird-observe/issues/350) **Quadrant mal initialisé lors de l'arrvié sur un écran** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 351]](https://gitlab.com/ultreia.io/ird-observe/issues/351) **Renommage du navire Palengirer inconnu en Palengrier inconnu** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 360]](https://gitlab.com/ultreia.io/ird-observe/issues/360) **[ObServePS] Impossible de rajouter des mises en oeuvre de caractéristique à un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 363]](https://gitlab.com/ultreia.io/ird-observe/issues/363) **2 migrations of 4.0-RC3 ne sont pas jouées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 364]](https://gitlab.com/ultreia.io/ird-observe/issues/364) **[ObServePS] Les équipements ne sont pas synchonisés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 368]](https://gitlab.com/ultreia.io/ird-observe/issues/368) **[ObserveLL] libellé position verticale d'un tdr** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 370]](https://gitlab.com/ultreia.io/ird-observe/issues/370) **[ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons)** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 371]](https://gitlab.com/ultreia.io/ird-observe/issues/371) **[ObservePS] Le controle sur la durée d'une calée ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 373]](https://gitlab.com/ultreia.io/ird-observe/issues/373) **[LL/PS] Problème de libellé lors de la suppression d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 374]](https://gitlab.com/ultreia.io/ird-observe/issues/374) **Problème de lancement de calcul avec la jdk 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 375]](https://gitlab.com/ultreia.io/ird-observe/issues/375) **[LL] Définition du schéma de la palangre -> indisponibilité du bouton enregistrer** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 384]](https://gitlab.com/ultreia.io/ird-observe/issues/384) **Problème technique lors de la synchro de référentiel central -> local, lorsqu'une entité de type SpeciesGroup a été modifiée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 385]](https://gitlab.com/ultreia.io/ird-observe/issues/385) **Mauvais topiaid sur les entités GearUseFeaturesMeasurementSeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 386]](https://gitlab.com/ultreia.io/ird-observe/issues/386) **Echec de la mise à jour de la version 4.0 RC5 vers RC6 en base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 390]](https://gitlab.com/ultreia.io/ird-observe/issues/390) **[PS] Après migration, la senne de toutes les marées anciennes devrait être marquée comme "utilisée pendant la marée"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 392]](https://gitlab.com/ultreia.io/ird-observe/issues/392) **[PS/LL] La fonction Action/Valider les données plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 393]](https://gitlab.com/ultreia.io/ird-observe/issues/393) **La 4 RC7 migrer en RC6, est-ce normal ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 394]](https://gitlab.com/ultreia.io/ird-observe/issues/394) **Erreur de légende pour la cartographie des marées ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 125]](https://gitlab.com/ultreia.io/ird-observe/issues/125) **ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 172]](https://gitlab.com/ultreia.io/ird-observe/issues/172) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 178]](https://gitlab.com/ultreia.io/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 245]](https://gitlab.com/ultreia.io/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 272]](https://gitlab.com/ultreia.io/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 317]](https://gitlab.com/ultreia.io/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 319]](https://gitlab.com/ultreia.io/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 321]](https://gitlab.com/ultreia.io/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 322]](https://gitlab.com/ultreia.io/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 327]](https://gitlab.com/ultreia.io/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 331]](https://gitlab.com/ultreia.io/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 333]](https://gitlab.com/ultreia.io/ird-observe/issues/333) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 336]](https://gitlab.com/ultreia.io/ird-observe/issues/336) **Problème technique lors de la tentative d'accès au formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 341]](https://gitlab.com/ultreia.io/ird-observe/issues/341) **[PS] Mise en page formulaire Calée / Mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 342]](https://gitlab.com/ultreia.io/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 346]](https://gitlab.com/ultreia.io/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 347]](https://gitlab.com/ultreia.io/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 355]](https://gitlab.com/ultreia.io/ird-observe/issues/355) **Nommer les clef étrangères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 356]](https://gitlab.com/ultreia.io/ird-observe/issues/356) **Améliorer l'affichage des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 358]](https://gitlab.com/ultreia.io/ird-observe/issues/358) **Pouvoir utiliser la scrollbar même lorsque l'écran est vérouillé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 359]](https://gitlab.com/ultreia.io/ird-observe/issues/359) **[ObServePS] Avoir plus de place pour saisir les mises en oeuvre d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 361]](https://gitlab.com/ultreia.io/ird-observe/issues/361) **[ObServePS] Pouvoir supprimer une mise en oeuvre de caractéristique d'un équipement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 362]](https://gitlab.com/ultreia.io/ird-observe/issues/362) **[ObServeLL] Ajout de l'écran des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 367]](https://gitlab.com/ultreia.io/ird-observe/issues/367) **La synchronisation de marées se base sur la clé métier code bateau#date de débarquement et pas sur le topiaid** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 369]](https://gitlab.com/ultreia.io/ird-observe/issues/369) **[ObserveLL] Contrôle abusif longueur orin entre sections** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 372]](https://gitlab.com/ultreia.io/ird-observe/issues/372) **Ne pas afficher la carte tant qu'elle n'est pas chargée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 378]](https://gitlab.com/ultreia.io/ird-observe/issues/378) **[LL] Caractéristiques de la carte LL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 379]](https://gitlab.com/ultreia.io/ird-observe/issues/379) **[PS] Petites améliorations souhaitées sur la carte PS** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 380]](https://gitlab.com/ultreia.io/ird-observe/issues/380) **[PS] Orthongel - Nouvelle requête Répartition des calées par cuve** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 381]](https://gitlab.com/ultreia.io/ird-observe/issues/381) **Optimisation des mises à jour de dates de fin sur les marées et routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 382]](https://gitlab.com/ultreia.io/ird-observe/issues/382) **[PS] Orthongel - Nouvelle requête Distribution des tailles par espèce non ciblées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 383]](https://gitlab.com/ultreia.io/ird-observe/issues/383) **[PS] Orthongel - Nouvelles requêtes Distribution des tailles par espèce ciblées (type de mesure LD1 ou LF)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 387]](https://gitlab.com/ultreia.io/ird-observe/issues/387) **Optimisation des requêtes pour les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 388]](https://gitlab.com/ultreia.io/ird-observe/issues/388) **Mise à jour librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 389]](https://gitlab.com/ultreia.io/ird-observe/issues/389) **Quelques ajustements sur les nouvelles requêtes des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 391]](https://gitlab.com/ultreia.io/ird-observe/issues/391) **Amélioration sur la carte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 396]](https://gitlab.com/ultreia.io/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 246]](https://gitlab.com/ultreia.io/ird-observe/issues/246) **Traductions à améliorer** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - -## Version [4.0-RC2](https://gitlab.com/ultreia.io/ird-observe/milestones/50) -

*(from redmine: created on 2015-04-07)* - -**Closed at 2015-04-11.** - - -### Issues - * [[Anomalie 323]](https://gitlab.com/ultreia.io/ird-observe/issues/323) **Problème de création de base distante (avec recopie de données)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 324]](https://gitlab.com/ultreia.io/ird-observe/issues/324) **Problème de création d'une nouvelle base (suppression schéma public)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 325]](https://gitlab.com/ultreia.io/ird-observe/issues/325) **Mauvais libéllé lors de la création d'une base distante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 326]](https://gitlab.com/ultreia.io/ird-observe/issues/326) **Problème de création d'une nouvelle base (table tms_version non créée)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 328]](https://gitlab.com/ultreia.io/ird-observe/issues/328) **bug à l'exportation données vers base centrale** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 329]](https://gitlab.com/ultreia.io/ird-observe/issues/329) **Problème sur la type de Program.geartype** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 330]](https://gitlab.com/ultreia.io/ird-observe/issues/330) **Problème lors de la synchronisation des référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 332]](https://gitlab.com/ultreia.io/ird-observe/issues/332) **Une case à cocher est toujours présente mais sans libellé dans les actions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 321]](https://gitlab.com/ultreia.io/ird-observe/issues/321) **Inclure ce fichier observe-report.properties dans la 4.0 RC2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 322]](https://gitlab.com/ultreia.io/ird-observe/issues/322) **Amélioration des temps d'ouverture de l'arbre de navigation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 327]](https://gitlab.com/ultreia.io/ird-observe/issues/327) **Amélioration du script apply-extra.sh** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 331]](https://gitlab.com/ultreia.io/ird-observe/issues/331) **[ObServeLL] Revue de la fonctionnalité d'export de marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 262]](https://gitlab.com/ultreia.io/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ## Version [3.15.1](https://gitlab.com/ultreia.io/ird-observe/milestones/49) 

*(from redmine: created on 2015-03-22)* @@ -670,21 +678,6 @@ * [[Evolution 195]](https://gitlab.com/ultreia.io/ird-observe/issues/195) **Comportement du masque de saisie des coordonnées + ordre des boutons radio** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 313]](https://gitlab.com/ultreia.io/ird-observe/issues/313) **Amélioration de la migration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [4.0-RC1](https://gitlab.com/ultreia.io/ird-observe/milestones/48) -

*(from redmine: created on 2015-03-16)* - -**Closed at 2015-04-07.** - - -### Issues - * [[Anomalie 266]](https://gitlab.com/ultreia.io/ird-observe/issues/266) **[ObserveLL] La sauvegarde d'une marée de type palangre ne conserve pas les Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 316]](https://gitlab.com/ultreia.io/ird-observe/issues/316) **[ObServeLL] Echec de la mise à jour de la version 3.14 -> 3.15.1** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 318]](https://gitlab.com/ultreia.io/ird-observe/issues/318) **[ObServeLL] Mise en page du formulaireComposition détaillée/Détail avançon** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 320]](https://gitlab.com/ultreia.io/ird-observe/issues/320) **[ObServePS] Mauvais disposition sur l'écran des activités senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 272]](https://gitlab.com/ultreia.io/ird-observe/issues/272) **LL/PS - Libellé des marées dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 317]](https://gitlab.com/ultreia.io/ird-observe/issues/317) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 319]](https://gitlab.com/ultreia.io/ird-observe/issues/319) **[ObServeLL] Association d'une capture à un TDR** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - ## Version [3.15](https://gitlab.com/ultreia.io/ird-observe/milestones/46) 

*(from redmine: created on 2015-01-27)* @@ -932,87 +925,6 @@ Intégration des référentiels longline + diverses évolutions et corrections&# * [[Evolution 154]](https://gitlab.com/ultreia.io/ird-observe/issues/154) **Ajout d'un champs gearType sur les programmes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 153]](https://gitlab.com/ultreia.io/ird-observe/issues/153) **Ajout des traductions du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [4.0](https://gitlab.com/ultreia.io/ird-observe/milestones/33) -ObserveLL

*(from redmine: created on 2014-06-23)* - -**Closed at 2015-06-08.** - -### Download -* [Application (observe-4.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/4.0/…) - -### Issues - * [[Anomalie 199]](https://gitlab.com/ultreia.io/ird-observe/issues/199) **Comportement du contrôle sur les vitesses entre activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 370]](https://gitlab.com/ultreia.io/ird-observe/issues/370) **[ObserveLL] Schéma de palangre (composition détaillée) : problème de clic droit sous Windows (empêche la suppression de paniers ou avancons)** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - * [[Anomalie 394]](https://gitlab.com/ultreia.io/ird-observe/issues/394) **Erreur de légende pour la cartographie des marées ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 125]](https://gitlab.com/ultreia.io/ird-observe/issues/125) **ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 172]](https://gitlab.com/ultreia.io/ird-observe/issues/172) **Ajout de la nationalité de la balise sur le formulaire Opération sur balise** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 178]](https://gitlab.com/ultreia.io/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 245]](https://gitlab.com/ultreia.io/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 396]](https://gitlab.com/ultreia.io/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 262]](https://gitlab.com/ultreia.io/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) - -## Version [5.0](https://gitlab.com/ultreia.io/ird-observe/milestones/32) -Mise en place web services

*(from redmine: created on 2014-02-05)* - -**Closed at 2016-09-12.** - -### Download -* [Application (observe-5.0.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) -* [Serveur (observe-5.0.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.0/…) - -### Issues - * [[Anomalie 131]](https://gitlab.com/ultreia.io/ird-observe/issues/131) **Problème de création d'une base locale depuis la base centrale si trop de marées sélectionnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 451]](https://gitlab.com/ultreia.io/ird-observe/issues/451) **[LL] l'export de marées LL est exagérément long** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 498]](https://gitlab.com/ultreia.io/ird-observe/issues/498) **Certains Actions sur une base ouverte sont disponibles alors que la base n'est pas ouverte** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 499]](https://gitlab.com/ultreia.io/ird-observe/issues/499) **Des clics multiples sur "Charger la source de données/Utiliser" provoquent une exception** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 501]](https://gitlab.com/ultreia.io/ird-observe/issues/501) **[PS] Calculs taille/poids : Problème sur recalcul** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 509]](https://gitlab.com/ultreia.io/ird-observe/issues/509) **[EQUIPEMENT BATEAU] Mieux gérer le cas où une caractéristique n'a pas de mesure** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 534]](https://gitlab.com/ultreia.io/ird-observe/issues/534) **[PS] Problème carte ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 539]](https://gitlab.com/ultreia.io/ird-observe/issues/539) **La fonction "Créer l'activité de fin de veille plante"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 541]](https://gitlab.com/ultreia.io/ird-observe/issues/541) **Dans Route/Activité/Calée/Estimation du banc, un champ ne devrait pas être obligatoire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 556]](https://gitlab.com/ultreia.io/ird-observe/issues/556) **[EQUIPEMENT] La version 4.0.6 permet toujours de saisir des caractéristiques d'équipement sans valeur associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 583]](https://gitlab.com/ultreia.io/ird-observe/issues/583) **[LL] Problème de valeur nulle dans le schéma de palangres, haulingIdentifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 588]](https://gitlab.com/ultreia.io/ird-observe/issues/588) **[UI] Impossible d'ajouter son pays à un port** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 609]](https://gitlab.com/ultreia.io/ird-observe/issues/609) **[GEAR][PS][LL] Le formulaire d'enregistrement des équipements peut produire des enregistrements corrompus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 610]](https://gitlab.com/ultreia.io/ird-observe/issues/610) **Regroupement de petits défauts sur les messages** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 121]](https://gitlab.com/ultreia.io/ird-observe/issues/121) **Menu contextuel sur l'arbre de navigation & traitements par lots** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 164]](https://gitlab.com/ultreia.io/ird-observe/issues/164) **Pouvoir sélectionner un ensemble de routes contiguës et les déplacer dans une autre marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 226]](https://gitlab.com/ultreia.io/ird-observe/issues/226) **Pouvoir sélectionner un ensemble d'activités contiguës et les déplacer dans une autre route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 227]](https://gitlab.com/ultreia.io/ird-observe/issues/227) **Mise en place de menus contextuels sur l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 429]](https://gitlab.com/ultreia.io/ird-observe/issues/429) **Supprimer en base la notion d'ouverture ou fermeture de marées, routes, actitivés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 436]](https://gitlab.com/ultreia.io/ird-observe/issues/436) **Création du modèle de sécurité et gestion des utilisateurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 446]](https://gitlab.com/ultreia.io/ird-observe/issues/446) **Mise à jour du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 484]](https://gitlab.com/ultreia.io/ird-observe/issues/484) **Ajout de nouvelles fonctionnalités sur la liste des marées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 485]](https://gitlab.com/ultreia.io/ird-observe/issues/485) **[PS] Ajout de nouvelles fonctionnalités sur la liste des routes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 486]](https://gitlab.com/ultreia.io/ird-observe/issues/486) **[PS] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 487]](https://gitlab.com/ultreia.io/ird-observe/issues/487) **[LL] Ajout de nouvelles fonctionnalités sur la liste des activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 496]](https://gitlab.com/ultreia.io/ird-observe/issues/496) **Suppression du champs TripSeine#datearriveeport** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 502]](https://gitlab.com/ultreia.io/ird-observe/issues/502) **Revue de l'algorithme de recherche d'une RTP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 533]](https://gitlab.com/ultreia.io/ird-observe/issues/533) **Dans la gestion des équipements bateau, il est impossible d'ajouter une caractéristique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 536]](https://gitlab.com/ultreia.io/ird-observe/issues/536) **Faire disparaître les anciens codes espèces 3L de l'affichage dans les listes d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 611]](https://gitlab.com/ultreia.io/ird-observe/issues/611) **[SYNCHRO AVANCEE] Ergonomie sur l'écran de gestion avancée du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 447]](https://gitlab.com/ultreia.io/ird-observe/issues/447) **Création de bases pour l'environnement démo** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 543]](https://gitlab.com/ultreia.io/ird-observe/issues/543) **Passage en java 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Tâche 580]](https://gitlab.com/ultreia.io/ird-observe/issues/580) **Intégrer ce observe-reports.properties** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - -## Version [4.0-2](https://gitlab.com/ultreia.io/ird-observe/milestones/31) -Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* - -**Closed at 2015-06-08.** - - -### Issues - * [[Anomalie 103]](https://gitlab.com/ultreia.io/ird-observe/issues/103) **[Synchro Référentiel] L'association species.ocean n'est pas synchronisée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 85]](https://gitlab.com/ultreia.io/ird-observe/issues/85) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 109]](https://gitlab.com/ultreia.io/ird-observe/issues/109) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 111]](https://gitlab.com/ultreia.io/ird-observe/issues/111) **Amélioration de performances** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 113]](https://gitlab.com/ultreia.io/ird-observe/issues/113) **Tracer une carte de la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 114]](https://gitlab.com/ultreia.io/ird-observe/issues/114) **Ajout de caractéristiques bateau sur une marée (et non dans le référentiel)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 115]](https://gitlab.com/ultreia.io/ird-observe/issues/115) **Programmation de 10 requêtes supplémentaires dans les tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 117]](https://gitlab.com/ultreia.io/ird-observe/issues/117) **Gestion du pool de balises d'objets flottants exploité par le bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 118]](https://gitlab.com/ultreia.io/ird-observe/issues/118) **Saisie générique des caractéristiques de l'équipement du bateau & migration senne** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Evolution 133]](https://gitlab.com/ultreia.io/ird-observe/issues/133) **Faire passer le contrôle sur les distances entre activités en warning** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - ## Version [3.5](https://gitlab.com/ultreia.io/ird-observe/milestones/30) Traduction modèle + ajout modèle Longline

*(from redmine: created on 2014-01-09)* View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4af51fc130a433aa677a9a1af3…

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC2
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC3
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC4
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC5
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC5 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC6
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC6 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC7
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC7 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0-RC8
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-4.0-RC8 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-5.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.0-RC-2
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-5.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.0-RC-3
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-5.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-2
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] improve release script
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 0e588de8 by Tony CHEMIT at 2017-03-10T00:26:35+01:00 improve release script - - - - - 1 changed file: - bin/stage_create.sh Changes: ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,7 +29,7 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/0e588de8a6a19dcfce114f7520…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: b4a80180 by Tony CHEMIT at 2017-03-10T00:23:43+01:00 update changelog - - - - - 2 changed files: - CHANGELOG.md - bin/stage_create.sh Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,15 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-10 00:19. + * Last generated at 2017-03-10 00:23. ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) **Closed at *In progress*.** +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -57,7 +60,7 @@ ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *In progress*.** +**Closed at *2017-03-09*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -41,7 +41,7 @@ fi echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" rm -rf target/gitlab_cache -mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/b4a801807f7f7a3fa2b35ec549…

1 0

[Git][ultreia.io/ird-observe][develop] Update changelog for staging version 6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: ae3033d5 by Tony CHEMIT at 2017-03-10T00:20:00+01:00 Update changelog for staging version 6.0-RC-1 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,12 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-08 20:41. + * Last generated at 2017-03-10 00:19. ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) -Status: **_Staging_** +**Closed at *In progress*.** -### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -55,11 +52,12 @@ Status: **_Staging_** * [[Evolution 653]](https://gitlab.com/ultreia.io/ird-observe/issues/653) **Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 695]](https://gitlab.com/ultreia.io/ird-observe/issues/695) **Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 652]](https://gitlab.com/ultreia.io/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at 2017-03-08.** +**Closed at *In progress*.** ### Download * [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) @@ -189,6 +187,7 @@ Status: **_Staging_** * [[Anomalie 666]](https://gitlab.com/ultreia.io/ird-observe/issues/666) **Mémorisation du dernier dossier utilisé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 667]](https://gitlab.com/ultreia.io/ird-observe/issues/667) **Problème de chargement du fichier des tableaux de synthèse** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 669]](https://gitlab.com/ultreia.io/ird-observe/issues/669) **[persistence] Toujours utiliser la configuration hibernate customisé même pour les services de topia** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 668]](https://gitlab.com/ultreia.io/ird-observe/issues/668) **Question sur l'assistant calcul de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.1.1](https://gitlab.com/ultreia.io/ird-observe/milestones/74) 

*(from redmine: created on 2016-12-08)* @@ -333,6 +332,7 @@ Status: **_Staging_** * [[Anomalie 607]](https://gitlab.com/ultreia.io/ird-observe/issues/607) **[Activité de fin de veille] Impossibe de créer une activité de fin de veille à la cloture d'une route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 608]](https://gitlab.com/ultreia.io/ird-observe/issues/608) **[Arbre] Les changements de routes d'ue marée à l'autre ou d'une activité d'une route à l'autre ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 401]](https://gitlab.com/ultreia.io/ird-observe/issues/401) **[Référentiel] Le passage des champs "code" en caractères n'est pas satisfaisant** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 594]](https://gitlab.com/ultreia.io/ird-observe/issues/594) **[Persistence] Vérifier la présence de tous les index nécessaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.0-RC-2](https://gitlab.com/ultreia.io/ird-observe/milestones/67) 

*(from redmine: created on 2016-09-01)* @@ -360,6 +360,7 @@ Status: **_Staging_** * [[Anomalie 602]](https://gitlab.com/ultreia.io/ird-observe/issues/602) **[Reférentiel] Les actions ne sont pas bien connectés avec la sélection dans la liste** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 448]](https://gitlab.com/ultreia.io/ird-observe/issues/448) **Dans les écrans de consultation des données de référence...** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 591]](https://gitlab.com/ultreia.io/ird-observe/issues/591) **Optimiser les dépendences** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 597]](https://gitlab.com/ultreia.io/ird-observe/issues/597) **Bien vérifer que tous les champs commentaires sont bien à 1024 caractères** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/65) 

*(from redmine: created on 2016-03-01)* @@ -420,6 +421,7 @@ Status: **_Staging_** * [[Evolution 565]](https://gitlab.com/ultreia.io/ird-observe/issues/565) **[Source de données] Migration de l'import de la source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 566]](https://gitlab.com/ultreia.io/ird-observe/issues/566) **[Source de données] Migration de la sauvegarde d'une source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 582]](https://gitlab.com/ultreia.io/ird-observe/issues/582) **[Source de données] Migration du mode serveur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 545]](https://gitlab.com/ultreia.io/ird-observe/issues/545) **Test Configuration des source de données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0.6](https://gitlab.com/ultreia.io/ird-observe/milestones/64) 

*(from redmine: created on 2015-11-04)* @@ -502,6 +504,7 @@ Status: **_Staging_** ### Issues * [[Anomalie 428]](https://gitlab.com/ultreia.io/ird-observe/issues/428) **La migration 4.0->4.0.1.1 plante sur PostgreSQL 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 410]](https://gitlab.com/ultreia.io/ird-observe/issues/410) **[PS] Question calculs taille/poids** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0.1](https://gitlab.com/ultreia.io/ird-observe/milestones/58) 

*(from redmine: created on 2015-06-08)* @@ -527,6 +530,7 @@ Status: **_Staging_** * [[Anomalie 422]](https://gitlab.com/ultreia.io/ird-observe/issues/422) **[ObServeLL] champs Distance et Nombre inversés dans formulaire Rencontres** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 402]](https://gitlab.com/ultreia.io/ird-observe/issues/402) **Utilisation codelutinpom 2.3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 424]](https://gitlab.com/ultreia.io/ird-observe/issues/424) **Permettre la configuration des logs au niveau utilisateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 423]](https://gitlab.com/ultreia.io/ird-observe/issues/423) **Remplacer un script sql dans la distribution V4.x par celui-ci** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0-RC8](https://gitlab.com/ultreia.io/ird-observe/milestones/57) 

*(from redmine: created on 2015-05-29)* @@ -625,6 +629,7 @@ Status: **_Staging_** * [[Evolution 342]](https://gitlab.com/ultreia.io/ird-observe/issues/342) **Menu Action / Calculer les données : ajouter une icône** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 346]](https://gitlab.com/ultreia.io/ird-observe/issues/346) **[PS] Migration des caractéristiques de la senne vers le nouveau système de gestion des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 347]](https://gitlab.com/ultreia.io/ird-observe/issues/347) **Import Access ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 246]](https://gitlab.com/ultreia.io/ird-observe/issues/246) **Traductions à améliorer** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ## Version [4.0-RC2](https://gitlab.com/ultreia.io/ird-observe/milestones/50) 

*(from redmine: created on 2015-04-07)* @@ -728,6 +733,7 @@ Status: **_Staging_** * [[Anomalie 258]](https://gitlab.com/ultreia.io/ird-observe/issues/258) **Mauvaise gestion des flags targetsample.discarded et targetlength.discarded** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 261]](https://gitlab.com/ultreia.io/ird-observe/issues/261) **Impossible d'afficher l'écran Estimation banc** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 255]](https://gitlab.com/ultreia.io/ird-observe/issues/255) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 260]](https://gitlab.com/ultreia.io/ird-observe/issues/260) **Supprimer un champs redondant sur l'opération de pêche (LL)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.13](https://gitlab.com/ultreia.io/ird-observe/milestones/44) 

*(from redmine: created on 2015-01-16)* @@ -780,6 +786,8 @@ Status: **_Staging_** * [[Evolution 231]](https://gitlab.com/ultreia.io/ird-observe/issues/231) **Réallocation du programme d'une marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 232]](https://gitlab.com/ultreia.io/ird-observe/issues/232) **Rendre le formulaire calée pleinement visible sur petits écrans** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 234]](https://gitlab.com/ultreia.io/ird-observe/issues/234) **Modifier simultannement les états des composants d'heure et de position géographique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 220]](https://gitlab.com/ultreia.io/ird-observe/issues/220) **Revoir la sélection de la position sur une palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 233]](https://gitlab.com/ultreia.io/ird-observe/issues/233) **Mise à jour du script Postgis pour les activités** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.10](https://gitlab.com/ultreia.io/ird-observe/milestones/40) 

*(from redmine: created on 2014-12-07)* @@ -833,6 +841,7 @@ Status: **_Staging_** * [[Evolution 209]](https://gitlab.com/ultreia.io/ird-observe/issues/209) **Mettre sur les onglets un icon quand il y a des erreurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 210]](https://gitlab.com/ultreia.io/ird-observe/issues/210) **Écran capture** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 211]](https://gitlab.com/ultreia.io/ird-observe/issues/211) **Mettre par defaut la format DMS sur les éditeurs de coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 214]](https://gitlab.com/ultreia.io/ird-observe/issues/214) **Replir le référentiel SensorDataFormat** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.7.1](https://gitlab.com/ultreia.io/ird-observe/milestones/37) 

*(from redmine: created on 2014-11-25)* @@ -896,6 +905,7 @@ Status: **_Staging_** * [[Evolution 171]](https://gitlab.com/ultreia.io/ird-observe/issues/171) **Finalisation de l'entité CatchLongline** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 173]](https://gitlab.com/ultreia.io/ird-observe/issues/173) **Finalisation de l'entité Tdr** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 175]](https://gitlab.com/ultreia.io/ird-observe/issues/175) **Mise à jour des listes d'espèces pour le modèle ObserveLL** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 159]](https://gitlab.com/ultreia.io/ird-observe/issues/159) **Découper le module business en deux** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.6](https://gitlab.com/ultreia.io/ird-observe/milestones/34) Intégration des référentiels longline + diverses évolutions et corrections

*(from redmine: created on 2014-07-24)* @@ -917,6 +927,7 @@ Intégration des référentiels longline + diverses évolutions et corrections&# * [[Evolution 151]](https://gitlab.com/ultreia.io/ird-observe/issues/151) **Ajout des référentiels longline** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 152]](https://gitlab.com/ultreia.io/ird-observe/issues/152) **Changement du type reference.code en String** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 154]](https://gitlab.com/ultreia.io/ird-observe/issues/154) **Ajout d'un champs gearType sur les programmes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 153]](https://gitlab.com/ultreia.io/ird-observe/issues/153) **Ajout des traductions du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0](https://gitlab.com/ultreia.io/ird-observe/milestones/33) ObserveLL

*(from redmine: created on 2014-06-23)* @@ -935,6 +946,7 @@ ObserveLL

*(from redmine: created on 2014-06-23)* * [[Evolution 178]](https://gitlab.com/ultreia.io/ird-observe/issues/178) **Suppression de champs obsolètes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 245]](https://gitlab.com/ultreia.io/ird-observe/issues/245) **Amélioration ou ajout de contrôles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 396]](https://gitlab.com/ultreia.io/ird-observe/issues/396) **Ajout d'une migration de base pour être en 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 262]](https://gitlab.com/ultreia.io/ird-observe/issues/262) **Dans les scripts de migration Sealor et Autoech, vérifier l'utilisation d'un champ** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ## Version [5.0](https://gitlab.com/ultreia.io/ird-observe/milestones/32) Mise en place web services

*(from redmine: created on 2014-02-05)* @@ -976,6 +988,9 @@ Mise en place web services

*(from redmine: created on 2014-02-05)* * [[Evolution 533]](https://gitlab.com/ultreia.io/ird-observe/issues/533) **Dans la gestion des équipements bateau, il est impossible d'ajouter une caractéristique** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 536]](https://gitlab.com/ultreia.io/ird-observe/issues/536) **Faire disparaître les anciens codes espèces 3L de l'affichage dans les listes d'espèces** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 611]](https://gitlab.com/ultreia.io/ird-observe/issues/611) **[SYNCHRO AVANCEE] Ergonomie sur l'écran de gestion avancée du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 447]](https://gitlab.com/ultreia.io/ird-observe/issues/447) **Création de bases pour l'environnement démo** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 543]](https://gitlab.com/ultreia.io/ird-observe/issues/543) **Passage en java 8** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 580]](https://gitlab.com/ultreia.io/ird-observe/issues/580) **Intégrer ce observe-reports.properties** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [4.0-2](https://gitlab.com/ultreia.io/ird-observe/milestones/31) Contrat "Armateurs"

*(from redmine: created on 2014-01-30)* @@ -1017,6 +1032,9 @@ Traduction modèle + ajout modèle Longline

*(from redmine: created on * [[Evolution 146]](https://gitlab.com/ultreia.io/ird-observe/issues/146) **Add FpaZone reference** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 147]](https://gitlab.com/ultreia.io/ird-observe/issues/147) **Ajout des référentiels du modèle Palangre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 148]](https://gitlab.com/ultreia.io/ird-observe/issues/148) **utilisation de schéma sql** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 137]](https://gitlab.com/ultreia.io/ird-observe/issues/137) **Mise à jour librairies nuiton** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 138]](https://gitlab.com/ultreia.io/ird-observe/issues/138) **Supprimer la fonctionnalité d'import depuis les bases accès** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 139]](https://gitlab.com/ultreia.io/ird-observe/issues/139) **Supprimer les anciennes migrations** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.1.1](https://gitlab.com/ultreia.io/ird-observe/milestones/29) 

*(from redmine: created on 2013-10-10)* @@ -1027,7 +1045,7 @@ Traduction modèle + ajout modèle Longline

*(from redmine: created on * [Application (observe-3.1.1.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/3.…) ### Issues -No issue. + * [[Tâche 101]](https://gitlab.com/ultreia.io/ird-observe/issues/101) **Updates topia to 2.8.1.3** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.1](https://gitlab.com/ultreia.io/ird-observe/milestones/28) 

*(from redmine: created on 2013-07-18)* @@ -1044,6 +1062,7 @@ No issue. * [[Anomalie 97]](https://gitlab.com/ultreia.io/ird-observe/issues/97) **Doublons et absence de clé primaire dans especefaune_ocean et especethon_ocean** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 99]](https://gitlab.com/ultreia.io/ird-observe/issues/99) **Gros problèmes avec une base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 96]](https://gitlab.com/ultreia.io/ird-observe/issues/96) **Ajouter ce fichier à la distribution** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 100]](https://gitlab.com/ultreia.io/ird-observe/issues/100) **Updates topia to 2.8.1.2** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.0-rc-4](https://gitlab.com/ultreia.io/ird-observe/milestones/27) 

*(from redmine: created on 2013-07-17)* @@ -1058,6 +1077,8 @@ No issue. * [[Anomalie 83]](https://gitlab.com/ultreia.io/ird-observe/issues/83) **Manque la vitesse sur le controle des vitesse au niveau de la route** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 86]](https://gitlab.com/ultreia.io/ird-observe/issues/86) **Export central -> local : est-ce une erreur ?** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 88]](https://gitlab.com/ultreia.io/ird-observe/issues/88) **Ajout d'un nouvel onglet dans l'écran À propos pour les traductions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 87]](https://gitlab.com/ultreia.io/ird-observe/issues/87) **Mise à jour du fichier des reports** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 89]](https://gitlab.com/ultreia.io/ird-observe/issues/89) **updates mavenpom to 3.4.13** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.0-rc-3](https://gitlab.com/ultreia.io/ird-observe/milestones/26) 

*(from redmine: created on 2013-07-12)* @@ -1096,6 +1117,9 @@ No issue. ### Issues * [[Anomalie 90]](https://gitlab.com/ultreia.io/ird-observe/issues/90) **Création BD centrale sans référentiel -> initialisation d'un programme -> l'arbre ne montre pas le programme** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 84]](https://gitlab.com/ultreia.io/ird-observe/issues/84) **Ajout champs Maree#iders** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 69]](https://gitlab.com/ultreia.io/ird-observe/issues/69) **Mettre à jour les traductions espagnoles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 92]](https://gitlab.com/ultreia.io/ird-observe/issues/92) **Updates mavenpom to 4.0** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 93]](https://gitlab.com/ultreia.io/ird-observe/issues/93) **Updates h2 to 1.3.173** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [3.0-rc-1](https://gitlab.com/ultreia.io/ird-observe/milestones/23) 3.0 Release candidate 1

*(from redmine: created on 2013-06-25)* @@ -1145,6 +1169,10 @@ No issue. * [[Evolution 62]](https://gitlab.com/ultreia.io/ird-observe/issues/62) **[TECH] Ne permettre l'utilisation lors de la création de la même base pour faire l'import du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 63]](https://gitlab.com/ultreia.io/ird-observe/issues/63) **[EchantillonThon] Pouvoir modifier l'espèce et la classe de taille en mode effectif** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 64]](https://gitlab.com/ultreia.io/ird-observe/issues/64) **Algorithme de colmatage des données de taille/poids manquantes sur les captures de faune associée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 29]](https://gitlab.com/ultreia.io/ird-observe/issues/29) **Mise à jour de librairies** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 35]](https://gitlab.com/ultreia.io/ird-observe/issues/35) **Suppression des modules inutiles** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 65]](https://gitlab.com/ultreia.io/ird-observe/issues/65) **[Validation] Mettre tous les validateurs dans le module dédié** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 66]](https://gitlab.com/ultreia.io/ird-observe/issues/66) **Changer la disposition des libellés de traductions dans les formulaire du référentiel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [1.1](https://gitlab.com/ultreia.io/ird-observe/milestones/21) 

*(from redmine: created on 2011-08-02)* @@ -1189,6 +1217,9 @@ No issue. * [[Anomalie 19]](https://gitlab.com/ultreia.io/ird-observe/issues/19) **Lors d'une erreur dans les actions, on ne voit pas bien les erreurs** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 20]](https://gitlab.com/ultreia.io/ird-observe/issues/20) **L'ajout de nouvelles entitées via la synchronisation ne fonctionne pas pour les liasions** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 10]](https://gitlab.com/ultreia.io/ird-observe/issues/10) **Mettre à jour la doc avec les PJ ici présentes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 1]](https://gitlab.com/ultreia.io/ird-observe/issues/1) **Migrates from labs.libre-entreprise.org to forge.codelutin.com** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 3]](https://gitlab.com/ultreia.io/ird-observe/issues/3) **Upgrades libraries** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Tâche 23]](https://gitlab.com/ultreia.io/ird-observe/issues/23) **Ne plus déployer observe-cli** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [2.4](https://gitlab.com/ultreia.io/ird-observe/milestones/18) 

*(from redmine: created on 2011-08-02)* View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ae3033d5d290c567723ee9354d…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed new tag v6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed new tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-2
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed new tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-3
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed new tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreia.io / ird-observe Commits: d53abacc by Tony CHEMIT at 2017-03-09T23:59:53+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/d53abacca644d3f9a0b9e1b74e…

1 0

[Git][ultreia.io/ird-observe][master] 11 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: df095a2f by Tony CHEMIT at 2017-03-08T18:29:54+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 61733edf by Tony CHEMIT at 2017-03-08T18:36:59+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 41648bab by Tony CHEMIT at 2017-03-08T18:37:00+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 725a1253 by Tony CHEMIT at 2017-03-08T18:37:01+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0568e640 by Tony CHEMIT at 2017-03-08T20:43:11+01:00 update changelog - - - - - 2656e427 by Tony CHEMIT at 2017-03-08T20:43:26+01:00 improve release script - - - - - 890f2bde by Tony CHEMIT at 2017-03-08T20:45:41+01:00 remove conf - - - - - cc336ced by Tony CHEMIT at 2017-03-09T22:19:14+01:00 improve maven resources managment - - - - - aced284b by Tony CHEMIT at 2017-03-09T23:57:44+01:00 prepare release 6.0-RC-1 - - - - - d53abacc by Tony CHEMIT at 2017-03-09T23:59:53+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 1357f34b by Tony CHEMIT at 2017-03-10T00:13:08+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 23 changed files: - CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/observeSwing.conf → application-swing-configuration/src/main/filtered-resources/observeSwing.conf - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/filters/observe-application.properties → application-swing/src/main/filtered-resources/observe-application.properties - application-swing/src/main/filters/observe-ui.properties → application-swing/src/main/resources/observe-ui.properties - application-web-configuration/pom.xml - application-web-configuration/src/main/resources/observeweb.conf → application-web-configuration/src/main/filtered-resources/observeweb.conf - application-web/pom.xml - application-web/src/main/resources/mapping → application-web/src/main/filtered-resources/mapping - bin/stage_create.sh - persistence/pom.xml - pom.xml - services-validation/pom.xml - services/pom.xml - services/src/main/filters/observe-reports.properties → services/src/main/resources/observe-reports.properties - src/site/markdown/install-serverPG.md - src/site/site_fr.xml - test/pom.xml - test/src/main/resources/observetest.properties → test/src/main/filtered-resources/observetest.properties - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,60 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-08 17:52. + * Last generated at 2017-03-08 20:41. + +## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) + +Status: **_Staging_** + +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 547]](https://gitlab.com/ultreia.io/ird-observe/issues/547) **[PS] Les écrans captures enregistrent parfois des captures sans code espèce associé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 646]](https://gitlab.com/ultreia.io/ird-observe/issues/646) **La fonctionnalité «Accéder à la marée» (ou route ou activité) ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 647]](https://gitlab.com/ultreia.io/ird-observe/issues/647) **La session ouverte n'est pas sauvegardée dans la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 648]](https://gitlab.com/ultreia.io/ird-observe/issues/648) **L'action «Annuler» sur l'édition d'un référentiel affiche un formulaire vide et non pas le formulaire du réferentiel en cours d'édition** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 649]](https://gitlab.com/ultreia.io/ird-observe/issues/649) **Mauvaise resitution de l'information «observé» ou «calculé» sur l'écran des échantillons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 696]](https://gitlab.com/ultreia.io/ird-observe/issues/696) **La boîte Informations sur la source n'affiche plus l'URL de la base** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 708]](https://gitlab.com/ultreia.io/ird-observe/issues/708) **le calendrier reste en anglais** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 67]](https://gitlab.com/ultreia.io/ird-observe/issues/67) **Réglage par défaut des proportions des volets de la fenêtre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 81]](https://gitlab.com/ultreia.io/ird-observe/issues/81) **Action/calculer les données : sélection de la marée par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 299]](https://gitlab.com/ultreia.io/ird-observe/issues/299) **[LL] Formulaire Captures : Tableaux tailles et poids - ajouter des fonctions clic droit** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 306]](https://gitlab.com/ultreia.io/ird-observe/issues/306) **[LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 352]](https://gitlab.com/ultreia.io/ird-observe/issues/352) **Permettre la MAJ du référentiel à partir d'un sql.gz** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 353]](https://gitlab.com/ultreia.io/ird-observe/issues/353) **[PS] Supprimer le champ floattingobject.supportvesselname** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 354]](https://gitlab.com/ultreia.io/ird-observe/issues/354) **[PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 357]](https://gitlab.com/ultreia.io/ird-observe/issues/357) **[PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 412]](https://gitlab.com/ultreia.io/ird-observe/issues/412) **[ObServeLL] Classement des listes déroulantes section/panier/avançon du formulaire capture** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 442]](https://gitlab.com/ultreia.io/ird-observe/issues/442) **Dans les listes d'espèces, ne plus montrer l'ancien code** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 443]](https://gitlab.com/ultreia.io/ird-observe/issues/443) **[PS] Unicité des enregistrements des rejets de thons à modifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 515]](https://gitlab.com/ultreia.io/ird-observe/issues/515) **[LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 516]](https://gitlab.com/ultreia.io/ird-observe/issues/516) **[WIDGET POSITIONS] absence de message d'erreur quand horodatage erronné (certains cas)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 520]](https://gitlab.com/ultreia.io/ird-observe/issues/520) **[LL] Nombre de coupures inconnu : cas problématique** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 523]](https://gitlab.com/ultreia.io/ird-observe/issues/523) **[LL] numérotation des captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 531]](https://gitlab.com/ultreia.io/ird-observe/issues/531) **Rajouter un champ Armateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 535]](https://gitlab.com/ultreia.io/ird-observe/issues/535) **Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 551]](https://gitlab.com/ultreia.io/ird-observe/issues/551) **[REFERENTIEL] Relations taille-poids - Ajout d'un champ texte 'source'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 557]](https://gitlab.com/ultreia.io/ird-observe/issues/557) **Retirer le champ relatif à l'utilisation du sonar pendant la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 558]](https://gitlab.com/ultreia.io/ird-observe/issues/558) **[PS] Ajout d'un champ sur les captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 559]](https://gitlab.com/ultreia.io/ird-observe/issues/559) **[PS] Limiter l'usage du formulaire DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 560]](https://gitlab.com/ultreia.io/ird-observe/issues/560) **[PS] Gestion plus intelligente des champs Devenir et Raison du rejet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 569]](https://gitlab.com/ultreia.io/ird-observe/issues/569) **[PS] Renommer 2 champs dans nontargetlength** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 570]](https://gitlab.com/ultreia.io/ird-observe/issues/570) **[PS] Saisie des échantillons de cible : modification de la gestion des types de taille** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 571]](https://gitlab.com/ultreia.io/ird-observe/issues/571) **[REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 575]](https://gitlab.com/ultreia.io/ird-observe/issues/575) **[TABLEAUX DE SYNTHESE] Nouvelle requête sur les équipements bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 581]](https://gitlab.com/ultreia.io/ird-observe/issues/581) **Gestion plus perfectionnée des calculs taille-poids** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 584]](https://gitlab.com/ultreia.io/ird-observe/issues/584) **Améliorer la gestion du focus et ajouter des racourcis clavier** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 587]](https://gitlab.com/ultreia.io/ird-observe/issues/587) **[REFERENTIEL] Ajouter des colonnes dans Vessel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 631]](https://gitlab.com/ultreia.io/ird-observe/issues/631) **Ajout de champs liés au marquage d'individus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 632]](https://gitlab.com/ultreia.io/ird-observe/issues/632) **Ajout du champ Sexe sur les échantillons de cible** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 637]](https://gitlab.com/ultreia.io/ird-observe/issues/637) **[PS] Sur les échantillons de non cible, ajouter un champ Devenir** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 653]](https://gitlab.com/ultreia.io/ird-observe/issues/653) **Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 695]](https://gitlab.com/ultreia.io/ird-observe/issues/695) **Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -101,17 +101,17 @@ <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <includes> - <include>observeSwing.conf</include> + <include>**/*</include> </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>observeSwing.conf</exclude> - </excludes> + <includes> + <include>**/*</include> + </includes> </resource> </resources> ===================================== application-swing-configuration/src/main/resources/observeSwing.conf → application-swing-configuration/src/main/filtered-resources/observeSwing.conf ===================================== --- a/application-swing-configuration/src/main/resources/observeSwing.conf +++ b/application-swing-configuration/src/main/filtered-resources/observeSwing.conf ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -93,14 +93,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <plugins> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -123,15 +123,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> <plugin> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -615,31 +615,16 @@ <resources> <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <filtering>true</filtering> <includes> <include>**/*</include> </includes> -  - <excludes> - <exclude>ftl/*.ftl</exclude> - </excludes> </resource> <resource> <directory>src/main/resources</directory> -  - <filtering>false</filtering> <includes> - <include>ftl/*.ftl</include> + <include>**/*</include> </includes> </resource> </resources> ===================================== application-swing/src/main/filters/observe-application.properties → application-swing/src/main/filtered-resources/observe-application.properties ===================================== --- a/application-swing/src/main/filters/observe-application.properties +++ b/application-swing/src/main/filtered-resources/observe-application.properties @@ -22,7 +22,7 @@ observe.devMode=${devMode} application.name=ObServe application.version=${project.version} -application.site.url=http://maven-site.forge.codelutin.com/observe +application.site.url=http://observe.ultreia.io application.organisation.name=${project.organization.name} application.organisation.url=${project.organization.url} ===================================== application-swing/src/main/filters/observe-ui.properties → application-swing/src/main/resources/observe-ui.properties ===================================== --- a/application-swing/src/main/filters/observe-ui.properties +++ b/application-swing/src/main/resources/observe-ui.properties ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -104,17 +104,17 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <includes> - <include>observeweb.conf</include> + <include>**/*</include> </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>observeweb.conf</exclude> - </excludes> + <includes> + <include>**/*</include> + </includes> </resource> </resources> ===================================== application-web-configuration/src/main/resources/observeweb.conf → application-web-configuration/src/main/filtered-resources/observeweb.conf ===================================== --- a/application-web-configuration/src/main/resources/observeweb.conf +++ b/application-web-configuration/src/main/filtered-resources/observeweb.conf ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -176,10 +176,10 @@ <resources> <resource> - <directory>${project.basedir}/src/main/resources</directory> + <directory>${project.basedir}/src/main/filtered-resources</directory> <filtering>true</filtering> <includes> - <include>mapping</include> + <include>**/*</include> </includes> </resource> ===================================== application-web/src/main/resources/mapping → application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/resources/mapping +++ b/application-web/src/main/filtered-resources/mapping ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -37,20 +37,14 @@ if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git checkout ${MASTER} -echo "Generate site: ($LOG_DIR/release-site.log)" -mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Deploy demo: ($LOG_DIR/release-demo.log)" -mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" +rm -rf target/gitlab_cache + +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git stash -git checkout ${DEVELOP} \ No newline at end of file +git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -151,6 +151,12 @@ <include>*.objectmodel-ext</include> </includes> </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> </resources> <pluginManagement> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2</version> + <version>4</version> </parent> <groupId>fr.ird.observe</groupId> @@ -158,8 +158,6 @@ <organizationId>ultreia.io</organizationId> <projectId>ird-observe</projectId> - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-5</jaxxVersion> @@ -207,7 +205,7 @@ <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> - <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> + <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> @@ -796,6 +794,11 @@ <artifactId>nuiton-version</artifactId> <version>${nuitonVersionVersion}</version> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> </dependencies> </plugin> @@ -898,6 +901,9 @@ <modules> <module>observe</module> </modules> + <properties> + <devMode>false</devMode> + </properties> </profile> <profile> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -105,15 +105,6 @@ </dependencies> <build> - <resources> - - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <plugins> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -138,22 +138,7 @@ <include>**/*</include> </includes> </resource> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> ===================================== services/src/main/filters/observe-reports.properties → services/src/main/resources/observe-reports.properties ===================================== --- a/services/src/main/filters/observe-reports.properties +++ b/services/src/main/resources/observe-reports.properties ===================================== src/site/markdown/install-serverPG.md ===================================== --- a/src/site/markdown/install-serverPG.md +++ b/src/site/markdown/install-serverPG.md @@ -133,6 +133,7 @@ le raccourci suivant : (cd obstuna-admin ; ./create-obstuna.sh) ``` ou + ``` ./obstuna-admin/create-obstuna.bat ``` @@ -145,9 +146,7 @@ de la base d'import de référentiel et des rôles de sécurité : - remplir le référentiel à partir de celui d'une autre base obstuna à jour (topia-service-migration) - appliquer la sécurité sur les rôles de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin create** +Note : le script appelle l'application avec l'action **--obstuna-admin create** ## Mise à jour d'une base obstuna @@ -159,6 +158,7 @@ raccourci suivant : (cd obstuna-admin ; ./update-obstuna.sh) ``` ou + ``` ./obstuna-admin/update-obstuna.bat ``` @@ -168,9 +168,7 @@ cible et des rôles de sécurité : - mettre à jour le schéma et les données via le service de migration intégré (topia) - appliquer la sécurité sur les rôles de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin update** +Note : le script appelle l'application avec l'action **--obstuna-admin update** ## Mise à jour de la sécurité @@ -189,6 +187,7 @@ suivant : (cd obstuna-admin ; ./update-security-obstuna.sh) ``` ou + ``` ./obstuna-admin/update-security-obstuna.bat ``` @@ -197,9 +196,7 @@ cible et des rôles de sécurité : - appliquer la sécurité sur les rôles de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin security** +Note : le script appelle l'application avec l'action **--obstuna-admin security** ## Vider une base obstuna @@ -210,6 +207,7 @@ lancer ObServe en mode *suppression obstuna* via le raccourci suivant : (cd obstuna-admin ; ./drop-obstuna.sh) ``` ou + ``` ./obstuna-admin/drop-obstuna.bat ``` @@ -218,9 +216,7 @@ cible : - supprimer toutes les tables gérer de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin drop** +Note : le script appelle l'application avec l'action **--obstuna-admin drop** ## Appliquer des scripts sql supplémentaires ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -22,14 +22,14 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.6</version> </skin> <custom> @@ -67,10 +67,7 @@ <body> - <head> - <script type="text/javascript" src="site.js"> </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> + <head> <![CDATA[ <script type="text/javascript" src="site.js"> </script><link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/>]]> </head> <links> <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> @@ -88,7 +85,7 @@ <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/master/changelog.md"/> + <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -101,14 +98,7 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='md' - scmwebeditor_skipFiles=',config-report,' - scmwebeditor_vmFiles=",index,"/> - </footer> + <footer> <![CDATA[<div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='md' scmwebeditor_skipFiles=',config-report,' scmwebeditor_vmFiles=",index,"/>]]> </footer> </body> </project> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -70,10 +70,10 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <filtering>true</filtering> <includes> - <include>*.properties</include> + <include>**/*</include> </includes> </resource> <resource> @@ -81,10 +81,6 @@ <includes> <include>**/*</include> </includes> - <excludes> - <exclude>*.properties</exclude> - </excludes> - <filtering>false</filtering> </resource> </resources> ===================================== test/src/main/resources/observetest.properties → test/src/main/filtered-resources/observetest.properties ===================================== --- a/test/src/main/resources/observetest.properties +++ b/test/src/main/filtered-resources/observetest.properties ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java @@ -87,7 +87,7 @@ public class GenerateWebmotionMappingMojo extends ToolboxMojoSupport { /** * The root directory where to generated. */ - @Parameter(property = "generateWebmotionMapping.mappingFile", defaultValue = "${project.basedir}/src/main/resources/mapping", required = true) + @Parameter(property = "generateWebmotionMapping.mappingFile", defaultValue = "${project.basedir}/src/main/filtered-resources/mapping", required = true) private File mappingFile; private Map<Class<?>, String> translationMap; View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/00104105b1ce302ef1449a3bc…

1 0

[Git][ultreia.io/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: d53abacc by Tony CHEMIT at 2017-03-09T23:59:53+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 1357f34b by Tony CHEMIT at 2017-03-10T00:13:08+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 92f92f5f by Tony CHEMIT at 2017-03-10T00:13:12+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 573b9180 by Tony CHEMIT at 2017-03-10T00:13:13+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - d8073921 by Tony CHEMIT at 2017-03-10T00:13:13+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/2e0e76bc471320e7bbd986565…

1 0

[Git][ultreia.io/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 2e0e76bc by Tony CHEMIT at 2017-03-09T23:59:05+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/2e0e76bc471320e7bbd9865656…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] 2 commits: improve maven resources managment
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: cc336ced by Tony CHEMIT at 2017-03-09T22:19:14+01:00 improve maven resources managment - - - - - aced284b by Tony CHEMIT at 2017-03-09T23:57:44+01:00 prepare release 6.0-RC-1 - - - - - 30 changed files: - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/observeSwing.conf → application-swing-configuration/src/main/filtered-resources/observeSwing.conf - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/filters/observe-application.properties → application-swing/src/main/filtered-resources/observe-application.properties - application-swing/src/main/filters/observe-ui.properties → application-swing/src/main/resources/observe-ui.properties - application-web-configuration/pom.xml - application-web-configuration/src/main/resources/observeweb.conf → application-web-configuration/src/main/filtered-resources/observeweb.conf - application-web/pom.xml - application-web/src/main/resources/mapping → application-web/src/main/filtered-resources/mapping - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - services/src/main/filters/observe-reports.properties → services/src/main/resources/observe-reports.properties - src/site/markdown/install-serverPG.md - src/site/site_fr.xml - test/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/890f2bde8f7709cc9e8fb5a07…

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-2
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-2
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT March 9, 2017

March 9, 2017

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag ird-observe-6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag ird-observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] 3 commits: update changelog
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 0568e640 by Tony CHEMIT at 2017-03-08T20:43:11+01:00 update changelog - - - - - 2656e427 by Tony CHEMIT at 2017-03-08T20:43:26+01:00 improve release script - - - - - 890f2bde by Tony CHEMIT at 2017-03-08T20:45:41+01:00 remove conf - - - - - 3 changed files: - CHANGELOG.md - bin/stage_create.sh - pom.xml Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,60 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-08 17:52. + * Last generated at 2017-03-08 20:41. + +## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) + +Status: **_Staging_** + +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 547]](https://gitlab.com/ultreia.io/ird-observe/issues/547) **[PS] Les écrans captures enregistrent parfois des captures sans code espèce associé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 646]](https://gitlab.com/ultreia.io/ird-observe/issues/646) **La fonctionnalité «Accéder à la marée» (ou route ou activité) ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 647]](https://gitlab.com/ultreia.io/ird-observe/issues/647) **La session ouverte n'est pas sauvegardée dans la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 648]](https://gitlab.com/ultreia.io/ird-observe/issues/648) **L'action «Annuler» sur l'édition d'un référentiel affiche un formulaire vide et non pas le formulaire du réferentiel en cours d'édition** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 649]](https://gitlab.com/ultreia.io/ird-observe/issues/649) **Mauvaise resitution de l'information «observé» ou «calculé» sur l'écran des échantillons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 696]](https://gitlab.com/ultreia.io/ird-observe/issues/696) **La boîte Informations sur la source n'affiche plus l'URL de la base** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 708]](https://gitlab.com/ultreia.io/ird-observe/issues/708) **le calendrier reste en anglais** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 67]](https://gitlab.com/ultreia.io/ird-observe/issues/67) **Réglage par défaut des proportions des volets de la fenêtre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 81]](https://gitlab.com/ultreia.io/ird-observe/issues/81) **Action/calculer les données : sélection de la marée par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 299]](https://gitlab.com/ultreia.io/ird-observe/issues/299) **[LL] Formulaire Captures : Tableaux tailles et poids - ajouter des fonctions clic droit** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 306]](https://gitlab.com/ultreia.io/ird-observe/issues/306) **[LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 352]](https://gitlab.com/ultreia.io/ird-observe/issues/352) **Permettre la MAJ du référentiel à partir d'un sql.gz** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 353]](https://gitlab.com/ultreia.io/ird-observe/issues/353) **[PS] Supprimer le champ floattingobject.supportvesselname** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 354]](https://gitlab.com/ultreia.io/ird-observe/issues/354) **[PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 357]](https://gitlab.com/ultreia.io/ird-observe/issues/357) **[PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 412]](https://gitlab.com/ultreia.io/ird-observe/issues/412) **[ObServeLL] Classement des listes déroulantes section/panier/avançon du formulaire capture** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 442]](https://gitlab.com/ultreia.io/ird-observe/issues/442) **Dans les listes d'espèces, ne plus montrer l'ancien code** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 443]](https://gitlab.com/ultreia.io/ird-observe/issues/443) **[PS] Unicité des enregistrements des rejets de thons à modifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 515]](https://gitlab.com/ultreia.io/ird-observe/issues/515) **[LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 516]](https://gitlab.com/ultreia.io/ird-observe/issues/516) **[WIDGET POSITIONS] absence de message d'erreur quand horodatage erronné (certains cas)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 520]](https://gitlab.com/ultreia.io/ird-observe/issues/520) **[LL] Nombre de coupures inconnu : cas problématique** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 523]](https://gitlab.com/ultreia.io/ird-observe/issues/523) **[LL] numérotation des captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 531]](https://gitlab.com/ultreia.io/ird-observe/issues/531) **Rajouter un champ Armateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 535]](https://gitlab.com/ultreia.io/ird-observe/issues/535) **Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 551]](https://gitlab.com/ultreia.io/ird-observe/issues/551) **[REFERENTIEL] Relations taille-poids - Ajout d'un champ texte 'source'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 557]](https://gitlab.com/ultreia.io/ird-observe/issues/557) **Retirer le champ relatif à l'utilisation du sonar pendant la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 558]](https://gitlab.com/ultreia.io/ird-observe/issues/558) **[PS] Ajout d'un champ sur les captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 559]](https://gitlab.com/ultreia.io/ird-observe/issues/559) **[PS] Limiter l'usage du formulaire DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 560]](https://gitlab.com/ultreia.io/ird-observe/issues/560) **[PS] Gestion plus intelligente des champs Devenir et Raison du rejet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 569]](https://gitlab.com/ultreia.io/ird-observe/issues/569) **[PS] Renommer 2 champs dans nontargetlength** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 570]](https://gitlab.com/ultreia.io/ird-observe/issues/570) **[PS] Saisie des échantillons de cible : modification de la gestion des types de taille** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 571]](https://gitlab.com/ultreia.io/ird-observe/issues/571) **[REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 575]](https://gitlab.com/ultreia.io/ird-observe/issues/575) **[TABLEAUX DE SYNTHESE] Nouvelle requête sur les équipements bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 581]](https://gitlab.com/ultreia.io/ird-observe/issues/581) **Gestion plus perfectionnée des calculs taille-poids** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 584]](https://gitlab.com/ultreia.io/ird-observe/issues/584) **Améliorer la gestion du focus et ajouter des racourcis clavier** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 587]](https://gitlab.com/ultreia.io/ird-observe/issues/587) **[REFERENTIEL] Ajouter des colonnes dans Vessel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 631]](https://gitlab.com/ultreia.io/ird-observe/issues/631) **Ajout de champs liés au marquage d'individus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 632]](https://gitlab.com/ultreia.io/ird-observe/issues/632) **Ajout du champ Sexe sur les échantillons de cible** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 637]](https://gitlab.com/ultreia.io/ird-observe/issues/637) **[PS] Sur les échantillons de non cible, ajouter un champ Devenir** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 653]](https://gitlab.com/ultreia.io/ird-observe/issues/653) **Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 695]](https://gitlab.com/ultreia.io/ird-observe/issues/695) **Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -37,20 +37,14 @@ if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git checkout ${MASTER} -echo "Generate site: ($LOG_DIR/release-site.log)" -mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Deploy demo: ($LOG_DIR/release-demo.log)" -mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" +rm -rf target/gitlab_cache + +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git stash -git checkout ${DEVELOP} \ No newline at end of file +git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -158,8 +158,6 @@ <organizationId>ultreia.io</organizationId> <projectId>ird-observe</projectId> - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-5</jaxxVersion> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/725a12538cefa4dd44db85ec5…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master] 12 commits: [jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: 4443e6d5 by Tony CHEMIT at 2017-03-08T18:01:18+01:00 [jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development - - - - - 09ecd5dd by Tony CHEMIT at 2017-03-08T18:09:49+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 290ef09a by Tony CHEMIT at 2017-03-08T18:09:50+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c98241e0 by Tony CHEMIT at 2017-03-08T18:09:51+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 27a26a87 by Tony CHEMIT at 2017-03-08T18:16:32+01:00 improve release scripts - - - - - d09ccb1e by Tony CHEMIT at 2017-03-08T18:23:16+01:00 prepare release 6.0-RC-1 + fix release - - - - - 683c6d4a by Tony CHEMIT at 2017-03-08T18:23:50+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 0bb38127 by Tony CHEMIT at 2017-03-08T18:27:03+01:00 prepare release 6.0-RC-1 + fix release - - - - - 963a8c2d by Tony CHEMIT at 2017-03-08T18:27:35+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 53885ecc by Tony CHEMIT at 2017-03-08T18:29:39+01:00 prepare release 6.0-RC-1 + fix release - - - - - d35566b2 by Tony CHEMIT at 2017-03-08T18:30:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 00104105 by Tony CHEMIT at 2017-03-08T18:36:55+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> @@ -35,7 +35,6 @@ <description>ObServe Application Swing</description> <properties> - <maven.deploy.skip>true</maven.deploy.skip>  <jaxx.validatorFactoryFQN> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> @@ -179,36 +179,4 @@ </build> - <profiles> - <profile> - <id>deploy-demo</id> - <properties> - <classifier>${project.version}</classifier> - </properties> - <build> - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <id>deploy-demo</id> - <phase>verify</phase> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> - <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> - <toFile>observe-${classifier}.war</toFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> @@ -39,18 +39,8 @@ <properties> <applicationName>observeweb</applicationName> - <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> -  - <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles> - -  - <redmine.releaseFiles>${project.build.directory}/${project.build.finalName}.war</redmine.releaseFiles> - -  - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <dependencies> @@ -296,5 +286,37 @@ </build> + <profiles> + <profile> + <id>deploy-demo</id> + <properties> + <classifier>${project.version}</classifier> + </properties> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>deploy-demo</id> + <phase>verify</phase> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> + <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> + <toFile>observe-${classifier}.war</toFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,10 +29,10 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> @@ -216,6 +216,9 @@  <observe.model.version>6.0</observe.model.version> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <dependencyManagement> @@ -1007,7 +1010,7 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="entities/src/main/xmi"> + <fileset dir="persistence/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> @@ -124,10 +124,6 @@ </dependencies> - <properties> -  - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <build> <plugins> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/2ac0abaf8113e65dcf72d3b54…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag ird-observe-6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new tag ird-observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreia.io / ird-observe Commits: d35566b2 by Tony CHEMIT at 2017-03-08T18:30:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/d35566b26551ad9f938938ce16…

1 0

[Git][ultreia.io/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: d35566b2 by Tony CHEMIT at 2017-03-08T18:30:17+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 00104105 by Tony CHEMIT at 2017-03-08T18:36:55+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 61733edf by Tony CHEMIT at 2017-03-08T18:36:59+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 41648bab by Tony CHEMIT at 2017-03-08T18:37:00+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 725a1253 by Tony CHEMIT at 2017-03-08T18:37:01+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/df095a2f3e95d47404ea5caf2…

1 0

[Git][ultreia.io/ird-observe][develop] 2 commits: prepare release 6.0-RC-1 + fix release
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 53885ecc by Tony CHEMIT at 2017-03-08T18:29:39+01:00 prepare release 6.0-RC-1 + fix release - - - - - df095a2f by Tony CHEMIT at 2017-03-08T18:29:54+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 2 changed files: - application-swing/pom.xml - toolbox-maven-plugin/pom.xml Changes: ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -35,7 +35,6 @@ <description>ObServe Application Swing</description> <properties> - <maven.deploy.skip>true</maven.deploy.skip>  <jaxx.validatorFactoryFQN> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -124,10 +124,6 @@ </dependencies> - <properties> -  - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <build> <plugins> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/963a8c2dc9f0ea781c3be75fb…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 963a8c2d by Tony CHEMIT at 2017-03-08T18:27:35+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/963a8c2dc9f0ea781c3be75fbc…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] prepare release 6.0-RC-1 + fix release
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 0bb38127 by Tony CHEMIT at 2017-03-08T18:27:03+01:00 prepare release 6.0-RC-1 + fix release - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-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>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-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>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/0bb38127b3ebc7976cc26ac6dd…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 683c6d4a by Tony CHEMIT at 2017-03-08T18:23:50+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-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>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/683c6d4adecc9b69bb1c00dfd5…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] 2 commits: improve release scripts
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 27a26a87 by Tony CHEMIT at 2017-03-08T18:16:32+01:00 improve release scripts - - - - - d09ccb1e by Tony CHEMIT at 2017-03-08T18:23:16+01:00 prepare release 6.0-RC-1 + fix release - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> @@ -179,36 +179,4 @@ </build> - <profiles> - <profile> - <id>deploy-demo</id> - <properties> - <classifier>${project.version}</classifier> - </properties> - <build> - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <id>deploy-demo</id> - <phase>verify</phase> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> - <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> - <toFile>observe-${classifier}.war</toFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> @@ -39,18 +39,8 @@ <properties> <applicationName>observeweb</applicationName> - <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> -  - <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles> - -  - <redmine.releaseFiles>${project.build.directory}/${project.build.finalName}.war</redmine.releaseFiles> - -  - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <dependencies> @@ -296,5 +286,37 @@ </build> + <profiles> + <profile> + <id>deploy-demo</id> + <properties> + <classifier>${project.version}</classifier> + </properties> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>deploy-demo</id> + <phase>verify</phase> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> + <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> + <toFile>observe-${classifier}.war</toFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,10 +29,10 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-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>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> @@ -216,6 +216,9 @@  <observe.model.version>6.0</observe.model.version> +  + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <dependencyManagement> @@ -1007,7 +1010,7 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="entities/src/main/xmi"> + <fileset dir="persistence/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-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>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/c98241e089a688c0886b4e1bf…

1 0

[Git][ultreia.io/ird-observe] Deleted tag ird-observe-3.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag ird-observe-3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-2
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/3.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted branch release/3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag observe-6.0-RC-3
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag ird-observe-3.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new tag ird-observe-3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/3.0-RC-1] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch release/3.0-RC-1 at ultreia.io / ird-observe Commits: 187db334 by Tony CHEMIT at 2017-03-08T18:01:38+01:00 [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions - - - - - 059ff71f by Tony CHEMIT at 2017-03-08T18:09:10+01:00 improve release script - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -18,23 +18,39 @@ git checkout -B ${DEVELOP} echo "Start release: $VERSION ($LOG_DIR/release-start.log)" mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git checkout ${MASTER} echo "Generate site: ($LOG_DIR/release-site.log)" mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Deploy demo: ($LOG_DIR/release-demo.log)" mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git stash git checkout ${DEVELOP} \ No newline at end of file ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</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>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</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>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1-SNAPSHOT</version> + <version>3.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/598082e53a9977e16cfb0dab9…

1 0

[Git][ultreia.io/ird-observe][master] 38 commits: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: 3c84b795 by Maven Release at 2017-01-01T19:20:39+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 28e1bfb3 by Maven Release at 2017-01-01T19:20:40+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - f38f98c1 by Maven Release at 2017-01-01T19:20:41+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 2012cc8f by Tony CHEMIT at 2017-01-04T12:04:07+01:00 La connexion serveur HTTPS ne fonctionne pas (Fixes #8914) - - - - - cc1674d7 by Tony CHEMIT at 2017-01-06T14:02:16+01:00 Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données (Fixes #8920) - - - - - 1e10c046 by Tony CHEMIT at 2017-01-06T14:02:34+01:00 revue des raccourcis claviers pour le lancement des opérations - - - - - 62c1f68e by Tony CHEMIT at 2017-01-06T15:32:55+01:00 fix method for admin actions - - - - - 3136d5d7 by Tony CHEMIT at 2017-01-06T15:35:19+01:00 ajout doc windows - - - - - e2d45556 by Tony CHEMIT at 2017-01-06T15:44:03+01:00 remove gitlab ci - - - - - e9f885a4 by Tony CHEMIT at 2017-01-10T09:07:19+01:00 La boîte Informations sur la source n'affiche plus l'URL de la base (Fixes #8933) - - - - - 2574d559 by Tony CHEMIT at 2017-01-10T10:06:43+01:00 La suppression d'un équipement dans le référentiel ne fonctionne pas (Fixes #8937) - - - - - 541900b9 by Tony CHEMIT at 2017-01-10T10:42:21+01:00 Lors de la suppression d'un programme, l'UI propose des programmes qui ne sont pas du type de la marée (Fixes #8935) - - - - - 1869d037 by Tony CHEMIT at 2017-01-10T11:26:00+01:00 Fix bad topia generation (Fixes #8934) - - - - - 52570ec0 by Tony CHEMIT at 2017-01-18T15:36:14+01:00 Petites mises au point sur le widget positions(fixes #8964) - - - - - 28561c46 by Tony CHEMIT at 2017-01-18T20:12:28+01:00 fix doc - - - - - 0f58afb1 by Tony CHEMIT at 2017-01-18T20:15:13+01:00 Le serveur ouvre une quantité astronomique de connexions (Fixes #8969) - - - - - 17384ba3 by Tony CHEMIT at 2017-01-18T20:18:53+01:00 le calendrier reste en anglais (fixes #8952) - - - - - 8663e1ac by Tony CHEMIT at 2017-01-18T20:22:12+01:00 Templates de traduction mis à jour (fixes #8967) - - - - - 3feb95ee by Tony CHEMIT at 2017-01-19T20:02:44+01:00 Ajout d'un mojo pour merger les trads (TODO a déplacer dans le projet i18n) - - - - - 81bb131e by Tony CHEMIT at 2017-01-19T20:12:55+01:00 Les corrections orthographiques (fixes #8975) - - - - - c4ab5c10 by Tony CHEMIT at 2017-01-30T18:13:29+01:00 Configuration pour générer le site dans une branche pages - - - - - 4f937a41 by Tony CHEMIT at 2017-01-30T18:13:40+01:00 Add missing license header - - - - - 0cd5a2e7 by Tony CHEMIT at 2017-01-30T21:17:44+01:00 add ci - - - - - df615478 by Tony CHEMIT at 2017-03-08T14:38:45+01:00 update project to fit to new gitlab instance - - - - - 4a553819 by Tony CHEMIT at 2017-03-08T14:41:25+01:00 add release module - - - - - c35accbd by Tony CHEMIT at 2017-03-08T14:58:31+01:00 add changelog - - - - - 096a5b7d by Tony CHEMIT at 2017-03-08T14:59:57+01:00 update license header - - - - - 626cb230 by Tony CHEMIT at 2017-03-08T15:06:20+01:00 upgrade site - - - - - 896bfa5f by Tony CHEMIT at 2017-03-08T15:06:34+01:00 add gitlab issue templates - - - - - 2086d578 by Tony CHEMIT at 2017-03-08T17:06:14+01:00 Report from version 5.x (See #742) - - - - - 877354fc by Tony CHEMIT at 2017-03-08T17:07:55+01:00 report builds from 5.x - - - - - 9d64efaa by Tony CHEMIT at 2017-03-08T17:54:00+01:00 update changelog for version 5.3.2 - - - - - f4a25c6a by Tony CHEMIT at 2017-03-08T17:57:03+01:00 update readme - - - - - c3db5b6d by Tony CHEMIT at 2017-03-08T17:59:24+01:00 add release scripts - - - - - 598082e5 by Tony CHEMIT at 2017-03-08T18:00:42+01:00 prepare release 6.0-RC-1 - - - - - 187db334 by Tony CHEMIT at 2017-03-08T18:01:38+01:00 [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions - - - - - 059ff71f by Tony CHEMIT at 2017-03-08T18:09:10+01:00 improve release script - - - - - 2ac0abaf by Tony CHEMIT at 2017-03-08T18:09:45+01:00 [jgitflow-maven-plugin]merging 'release/3.0-RC-1' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - + .gitlab/issue_templates/Bug-6.md - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Feature-6.md - + .gitlab/issue_templates/Feature-IRD.md - + .gitlab/issue_templates/Feature.md - + CHANGELOG.md - README.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-configuration/src/main/resources/log4j.properties - application-swing-configuration/src/main/resources/observe-log4j.properties - application-swing-configuration/src/main/resources/validators.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/54a7f32605b02a713edfa1a59…

1 0

[Git][ultreia.io/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 187db334 by Tony CHEMIT at 2017-03-08T18:01:38+01:00 [jgitflow-maven-plugin]updating poms for branch'release/3.0-RC-1' with non-snapshot versions - - - - - 059ff71f by Tony CHEMIT at 2017-03-08T18:09:10+01:00 improve release script - - - - - 2ac0abaf by Tony CHEMIT at 2017-03-08T18:09:45+01:00 [jgitflow-maven-plugin]merging 'release/3.0-RC-1' into 'master' - - - - - 09ecd5dd by Tony CHEMIT at 2017-03-08T18:09:49+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 290ef09a by Tony CHEMIT at 2017-03-08T18:09:50+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - c98241e0 by Tony CHEMIT at 2017-03-08T18:09:51+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 1 changed file: - bin/stage_create.sh Changes: ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -18,23 +18,39 @@ git checkout -B ${DEVELOP} echo "Start release: $VERSION ($LOG_DIR/release-start.log)" mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Get staging id..." STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git checkout ${MASTER} echo "Generate site: ($LOG_DIR/release-site.log)" mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log - +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi echo "Deploy demo: ($LOG_DIR/release-demo.log)" mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +if [ ! "$?" == "0" ]; then + echo "Error" + exit 1 +fi git stash git checkout ${DEVELOP} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/4443e6d5c2a78831cdf5ee836…

1 0

[Git][ultreia.io/ird-observe][develop] 3 commits: add release scripts
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: c3db5b6d by Tony CHEMIT at 2017-03-08T17:59:24+01:00 add release scripts - - - - - 598082e5 by Tony CHEMIT at 2017-03-08T18:00:42+01:00 prepare release 6.0-RC-1 - - - - - 4443e6d5 by Tony CHEMIT at 2017-03-08T18:01:18+01:00 [jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development - - - - - 28 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - + bin/stage_create.sh - + bin/stage_drop.sh - + bin/stage_release.sh - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== bin/stage_create.sh ===================================== --- /dev/null +++ b/bin/stage_create.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash + +PROJECT=ird-observe +MASTER=master +DEVELOP=develop +STAGE=frirdobserve + +VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) +VERSION=${VERSION/-SNAPSHOT/} +LOG_DIR=/tmp/${PROJECT}-${VERSION} +echo "version to release: $VERSION" +echo "log dir: $LOG_DIR" +rm -rf ${LOG_DIR} +mkdir -p ${LOG_DIR} + +git checkout -B ${MASTER} +git checkout -B ${DEVELOP} + +echo "Start release: $VERSION ($LOG_DIR/release-start.log)" +mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log + +echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" +mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log + +echo "Get staging id..." +STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) + +echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" +mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log + +git checkout ${MASTER} + +echo "Generate site: ($LOG_DIR/release-site.log)" +mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log + +echo "Deploy demo: ($LOG_DIR/release-demo.log)" +mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log + +git stash +git checkout ${DEVELOP} \ No newline at end of file ===================================== bin/stage_drop.sh ===================================== --- /dev/null +++ b/bin/stage_drop.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env sh + +PROJECT=ird-observe +MASTER=master +DEVELOP=develop +STAGE=frirdobserve + +LOG_DIR=/tmp/${PROJECT}-stage +echo "log dir: $LOG_DIR" +rm -rf ${LOG_DIR} +mkdir -p ${LOG_DIR} + +echo "Get staging id..." +STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) + +echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" +mvn nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== bin/stage_release.sh ===================================== --- /dev/null +++ b/bin/stage_release.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env sh + +PROJECT=ird-observe +MASTER=master +DEVELOP=develop +STAGE=frirdobserve + +LOG_DIR=/tmp/${PROJECT}-stage +echo "log dir: $LOG_DIR" +rm -rf ${LOG_DIR} +mkdir -p ${LOG_DIR} + +echo "Get staging id..." +STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) + +echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" +mvn nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file --log-file ${LOG_DIR}/stage-release.log ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-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>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-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>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-SNAPSHOT</version> + <version>3.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/f4a25c6af864e0c7101cddc34…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/3.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed new branch release/3.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] update readme
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: f4a25c6a by Tony CHEMIT at 2017-03-08T17:57:03+01:00 update readme - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,4 +1,21 @@ -To deploy new version of pom: mvn deploy To install localy: mvn install To run: mvn -Prun -Release +# ObServe -To do a release of this project (which now uses git, refer to this page https://gitlab.nuiton.org/nuiton/pom/tree/develop/codelutinpom) \ No newline at end of file +[![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… +![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop/build.svg) + +# Resources + +* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG… +* [Documentation](http://observe.ultreia.io) + +# Demo + +* [Demo (latest)](https://demo.ultreia.io/observe-latest) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) +* [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-1) + +# Community + +* [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) +* [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) +* [Contact](mailto:dev@tchemit.fr) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/f4a25c6af864e0c7101cddc349…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog for version 5.3.2
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 9d64efaa by Tony CHEMIT at 2017-03-08T17:54:00+01:00 update changelog for version 5.3.2 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,16 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-06 08:18. + * Last generated at 2017-03-08 17:52. ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -**Closed at *In progress*.** +**Closed at 2017-03-08.** ### Download -* [Application (observe-5.3.2.zip)](https://oss.sonatype.org/content/repositories/frirdobse…) -* [Serveur (observe-5.3.2.war)](https://oss.sonatype.org/content/repositories/frirdobse…) +* [Application (observe-5.3.2.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.2.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) ### Issues * [[Anomalie 704]](https://gitlab.com/ultreia.io/ird-observe/issues/704) **Ré ouverture de #8879** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) @@ -80,33 +80,6 @@ * [[Anomalie 700]](https://gitlab.com/ultreia.io/ird-observe/issues/700) **La suppression d'un équipement dans le référentiel ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 706]](https://gitlab.com/ultreia.io/ird-observe/issues/706) **Mode de connexion par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) -## Version [6.0-RC-3](https://gitlab.com/ultreia.io/ird-observe/milestones/80) -

*(from redmine: created on 2017-01-01)* - -**Closed at 2016-01-01.** - - -### Issues -No issue. - -## Version [6.0-RC-2](https://gitlab.com/ultreia.io/ird-observe/milestones/79) -

*(from redmine: created on 2016-12-20)* - -**Closed at 2016-12-23.** - - -### Issues -No issue. - -## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/78) -

*(from redmine: created on 2016-12-17)* - -**Closed at 2016-12-17.** - - -### Issues -No issue. - ## Version [5.1.4](https://gitlab.com/ultreia.io/ird-observe/milestones/77) 

*(from redmine: created on 2016-12-16)* View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/9d64efaa6637c975dc6ab81b71…

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-2
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-2
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag observe-6.0-RC-2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] report builds from 5.x
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 877354fc by Tony CHEMIT at 2017-03-08T17:07:55+01:00 report builds from 5.x - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,154 @@ -pages: - script: - - mkdir .public - - cp -r * .public - - mv .public public - artifacts: - paths: - - public +image: java:8u102-jdk + +variables: + DEVELOP: "develop" + MASTER: "master" + STAGE: "frirdobserve" + +stages: + - Build + - Test + - Staging + - Production + +.before_script_default: &before_script_default + tags: + - gitlab-org + - shared + before_script: + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - eval $(ssh-agent -s) + - ssh-add <(echo "$SSH_PRIVATE_KEY") + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) + - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + +.before_script_clone: &before_script_clone + tags: + - gitlab-org + - shared + before_script: + - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' + - eval $(ssh-agent -s) + - ssh-add <(echo "$SSH_PRIVATE_KEY") + - mkdir -p ~/.ssh + - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) + - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + +.env_test: &env_test + environment: + name: test + +.env_staging: &env_staging + environment: + name: staging + +.env_production: &env_production + environment: + name: production + +.deploy_site: &deploy_site + script: + - mvn install -DskipTests + - mvn site-deploy -DperformRelease + +.deploy_demo_latest: &deploy_demo_latest + stage: Test + script: + - mvn -Padd-git-commit-id-to-project-version -N + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest + +build: + stage: Build + <<: *before_script_default + script: + - mvn clean verify + only: + - develop + - feature/* + except: + - triggers + +.test_manual: &test_manual + stage: Test + <<: *before_script_default + only: + - develop + except: + - triggers + when: manual + +stage: + <<: *env_staging + <<: *test_manual + <<: *before_script_clone + script: + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - . bin/create_stage.sh + +latest-site: + <<: *env_test + <<: *test_manual + <<: *deploy_site + +latest-demo: + <<: *env_test + <<: *test_manual + <<: *deploy_demo_latest + +.nightly: &nightly + <<: *before_script_default + only: + - triggers + +nightly-build: + stage: Build + <<: *nightly + script: + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - mvn clean verify -DperformRelease + +nightly-site: + stage: Test + <<: *env_test + <<: *nightly + <<: *deploy_site + +nightly-demo: + stage: Test + <<: *env_test + <<: *nightly + <<: *deploy_demo_latest + +.staging: &staging + stage: Staging + only: + - tags + <<: *env_staging + <<: *before_script_default + +staging-demo: + <<: *staging + script: + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease + +staging-site: + <<: *staging + <<: *deploy_site + +release: + <<: *staging + when: manual + script: + - . bin/stage_release.sh + +production: + stage: Production + only: + - tags + <<: *env_production + when: manual + script: + - echo "Envoyer les notifications" View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/877354fc5e1800d04bb24a9173…

1 0

[Git][ultreia.io/ird-observe][develop] 3 commits: upgrade site
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 626cb230 by Tony CHEMIT at 2017-03-08T15:06:20+01:00 upgrade site - - - - - 896bfa5f by Tony CHEMIT at 2017-03-08T15:06:34+01:00 add gitlab issue templates - - - - - 2086d578 by Tony CHEMIT at 2017-03-08T17:06:14+01:00 Report from version 5.x (See #742) - - - - - 30 changed files: - + .gitlab/issue_templates/Bug-6.md - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Feature-6.md - + .gitlab/issue_templates/Feature-IRD.md - + .gitlab/issue_templates/Feature.md - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineDto-ui-update-warning-validation.xml - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java → application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupStorage.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/help/ShowAboutAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - + application-swing/src/main/resources/ftl/initStorage_en.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/096a5b7d1beab44ea78bd02d4…

1 0

[Git][ultreia.io/ird-observe][develop] 2 commits: add changelog
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: c35accbd by Tony CHEMIT at 2017-03-08T14:58:31+01:00 add changelog - - - - - 096a5b7d by Tony CHEMIT at 2017-03-08T14:59:57+01:00 update license header - - - - - 30 changed files: - + CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/CreationMode.java - application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/constants/DbMode.java - application-swing-configuration/src/main/resources/log4j.properties - application-swing-configuration/src/main/resources/observe-log4j.properties - application-swing-configuration/src/main/resources/validators.xml - application-swing-decoration/pom.xml - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/DataReferenceDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthLengthParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/LengthWeightParameterDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetCatchDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/NonTargetLengthDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObjectObservedSpeciesDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ObserveDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/ReferentialReferenceDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/SpeciesDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TargetCatchDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripLonglineDecorator.java - application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/decorators/TripSeineDecorator.java - application-swing-validation/pom.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-create-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineDto-ui-update-warning-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineEncounterDto-ui-update-error-validation.xml - application-swing-validation/src/main/resources/fr/ird/observe/services/dto/longline/ActivityLonglineSensorUsedDto-ui-update-error-validation.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/4a553819eb0b79f70e402af3b…

1 0

[Git][ultreia.io/ird-observe][develop] add release module
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 4a553819 by Tony CHEMIT at 2017-03-08T14:41:25+01:00 add release module - - - - - 3 changed files: - + observe/LICENSE.txt - + observe/README.md - + observe/pom.xml Changes: ===================================== observe/LICENSE.txt ===================================== --- /dev/null +++ b/observe/LICENSE.txt @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + 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/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. ===================================== observe/README.md ===================================== --- /dev/null +++ b/observe/README.md @@ -0,0 +1,4 @@ +To deploy new version of pom: mvn deploy To install localy: mvn install To run: mvn -Prun +Release + +To do a release of this project (which now uses git, refer to this page https://gitlab.nuiton.org/nuiton/pom/tree/develop/codelutinpom) \ No newline at end of file ===================================== observe/pom.xml ===================================== --- /dev/null +++ b/observe/pom.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>pom</artifactId> + <version>6.0-SNAPSHOT</version> + </parent> + + <artifactId>observe</artifactId> + + <name>ObServe :: Release</name> + <description>ObServe Release</description> + <packaging>pom</packaging> + + <properties> + +  + <maven.deploy.skip>false</maven.deploy.skip> + + </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + + <execution> + <id>get-assembly</id> + <phase>package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}</outputDirectory> + <artifactItems> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>application-swing</artifactId> + <version>${project.version}</version> + <type>zip</type> + </artifactItem> + <artifactItem> + <groupId>${project.groupId}</groupId> + <artifactId>application-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.directory}/application-swing-${project.version}.zip</file> + <type>zip</type> + </artifact> + <artifact> + <file>${project.build.directory}/application-web-${project.version}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + +</project> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4a553819eb0b79f70e402af3b4…

1 0

[Git][ultreia.io/ird-observe][develop] update project to fit to new gitlab instance
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: df615478 by Tony CHEMIT at 2017-03-08T14:38:45+01:00 update project to fit to new gitlab instance - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -34,6 +34,7 @@ observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases lo observe.config.h2.login.description=L'identifiant H2 observe.config.h2.password.description=Le mot de passe H2 observe.config.h2.serverPort.description=Port du serveur H2 +observe.config.httpTimeout.description=Maximum delay in millisecondes to http connections observe.config.importDirectory.description=Répertoire où chercher les imports observe.config.logConfigurationFile.description=Fichier de configuration des logs observe.config.map.background.description=Couleur du fond de carte @@ -61,10 +62,12 @@ observe.config.obstuna.password.description=Le mot de passe pour se connecter à observe.config.obstuna.url.description=L’URL de connexion à la base Obstuna observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) +observe.config.remoteDataSourceConfigurations.description=connexions à des sources distantes observe.config.server.dataBaseName.description=Le nom optionnel de la base cible sur le serveur observe.config.server.login.description=Identifiant de l'utilisateur observe.config.server.password.description=Le mot de passe de l'utilisateur observe.config.server.url.description=L’URL du serveur +observe.config.serverDataSourceConfigurations.description=connexions à des serveursdistantes observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -3,7 +3,7 @@ #%L ObServe :: Application Swing %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> @@ -35,6 +35,7 @@ <description>ObServe Application Swing</description> <properties> + <maven.deploy.skip>true</maven.deploy.skip>  <jaxx.validatorFactoryFQN> @@ -47,7 +48,7 @@  <maven.jar.main.class>fr.ird.observe.application.swing.RunObserve</maven.jar.main.class> - <applicationName>${projectId}</applicationName> + <applicationName>observe</applicationName> <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile> @@ -58,21 +59,262 @@ <license.bundleThirdPartyPath>META-INF/${applicationName}-THIRD-PARTY.txt</license.bundleThirdPartyPath> <license.bundleLicensePath>META-INF/${applicationName}-LICENSE.txt</license.bundleLicensePath> -  - <skipPostRelease>false</skipPostRelease> - - <redmine.releaseFiles> - ${project.build.directory}/${project.build.finalName}.zip - </redmine.releaseFiles> - -  - <devMode>true</devMode> -  <exec.mainClass>${maven.jar.main.class}</exec.mainClass> + <geoToolsVersion>16.0</geoToolsVersion> + </properties> + <repositories> + <repository> + <id>central</id> + <url>http://repo1.maven.org/maven2/</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + <repository> + <id>geotools-repository</id> + <url>http://download.osgeo.org/webdav/geotools</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> +  + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-shapefile</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-swing</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-api</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-main</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-render</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>it.geosolutions.jaiext</groupId> + <artifactId>jaiext</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandmerge</groupId> + <artifactId>jt-bandmerge</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandcombine</groupId> + <artifactId>jt-bandcombine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandselect</groupId> + <artifactId>jt-bandselect</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.imageio-ext</groupId> + <artifactId>imageio-ext-tiff</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.affine</groupId> + <artifactId>jt-affine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.crop</groupId> + <artifactId>jt-crop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorconvert</groupId> + <artifactId>jt-colorconvert</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.mosaic</groupId> + <artifactId>jt-mosaic</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.zonal</groupId> + <artifactId>jt-zonal</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.binarize</groupId> + <artifactId>jt-binarize</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.stats</groupId> + <artifactId>jt-stats</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.nullop</groupId> + <artifactId>jt-nullop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.piecewise</groupId> + <artifactId>jt-piecewise</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.classifier</groupId> + <artifactId>jt-classifier</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rlookup</groupId> + <artifactId>jt-rlookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.algebra</groupId> + <artifactId>jt-algebra</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.border</groupId> + <artifactId>jt-border</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.lookup</groupId> + <artifactId>jt-lookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.warp</groupId> + <artifactId>jt-warp</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rescale</groupId> + <artifactId>jt-rescale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.format</groupId> + <artifactId>jt-format</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.errordiffusion</groupId> + <artifactId>jt-errordiffusion</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.orderdither</groupId> + <artifactId>jt-orderdither</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorindexer</groupId> + <artifactId>jt-colorindexer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.imagefunction</groupId> + <artifactId>jt-imagefunction</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.vectorbin</groupId> + <artifactId>jt-vectorbin</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.buffer</groupId> + <artifactId>jt-buffer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.translate</groupId> + <artifactId>jt-translate</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.scale</groupId> + <artifactId>jt-scale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.iterators</groupId> + <artifactId>jt-iterators</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.utilities</groupId> + <artifactId>jt-utilities</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-zonalstats</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-utils</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_imageio</artifactId> + </exclusion> + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_core</artifactId> + </exclusion> + + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-referencing</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-opengis</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-epsg-hsql</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + </dependencies> + + </dependencyManagement> <dependencies>  @@ -219,6 +461,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency>  <dependency> @@ -334,6 +580,15 @@ <artifactId>xwork-core</artifactId> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark</artifactId> + </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + </dependency> +  <dependency> <groupId>org.slf4j</groupId> @@ -436,6 +691,7 @@ <enumerationSets> <enumerationSet> <name>label</name> +  <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> <enums> <enum>fr.ird.observe.common.constants.GearType</enum> @@ -460,6 +716,7 @@ </enumerationSet> <enumerationSet> <name>description</name> +  <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern> <enums> <enum>fr.ird.observe.application.swing.configuration.constants.CreationMode</enum> @@ -543,6 +800,7 @@ </goals> <phase>prepare-package</phase> <configuration> +  <skip>${performRelease}</skip> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -686,20 +944,22 @@ <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> + <id>Copy change log</id> + <phase>generate-resources</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + </target> + </configuration> <goals> - <goal>create</goal> + <goal>run</goal> </goals> - <phase>validate</phase> </execution> </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - </configuration> </plugin> <plugin> @@ -837,7 +1097,6 @@ <plugin> <groupId>com.akathist.maven.plugins.launch4j</groupId> <artifactId>launch4j-maven-plugin</artifactId> - <version>1.7.11</version> <executions> <execution> <id>launch4j</id> @@ -855,10 +1114,12 @@ <minVersion>1.8.0</minVersion> </jre> <versionInfo> +  <fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion> <txtFileVersion>${project.version}</txtFileVersion> <fileDescription>${project.parent.description}</fileDescription> <productName>${project.parent.name}</productName> +  <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> @@ -884,7 +1145,7 @@ <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> - <attach>false</attach> + <attach>true</attach> <finalName>${project.build.finalName}</finalName> <appendAssemblyId>false</appendAssemblyId> <outputDirectory>${project.build.directory}</outputDirectory> @@ -897,77 +1158,5 @@ </build> </profile> - <profile> - <id>changelog-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>generate-resources</defaultGoal> - - <resources> - <resource> - <directory>${project.build.directory}/generated-sources/license</directory> - <includes> - <include>*.txt</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - - <execution> - <id>get-changelog</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/changelog</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${project.parent.groupId}</groupId> - <artifactId>${project.parent.artifactId}</artifactId> - <version>${project.version}</version> - <classifier>changelog</classifier> - <type>pom</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - - </executions> - </plugin> - - <plugin> - - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>Copy changelog</id> - <phase>process-resources</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/CHANGELOG.txt" /> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -83,6 +83,9 @@ observe.action.goto.next.stage=Suivant observe.action.goto.next.stage.tip=Accéder à l'étape suivante observe.action.goto.previous.stage=Précédent observe.action.goto.previous.stage.tip=Accéder à l'étape précédente +observe.action.goto.referentiel.common.tip=Référentiel commun +observe.action.goto.referentiel.longline.tip=Référentiel palangre +observe.action.goto.referentiel.seine.tip=Référentiel senne observe.action.goto.referentiel.short=Référentiel observe.action.goto.referentiel.tip=Accéder au référentiel observe.action.info.storage=Informations sur la source de données @@ -99,8 +102,9 @@ observe.action.modify=Modifier observe.action.new.entry=Nouveau observe.action.new.entry.tip=Créer une nouvelle entrée observe.action.open.screen=Ouverture de l'écran <%1$s> -observe.action.quitHelp.tip=Quitter l'écran d'aide +observe.action.quit=Quitter observe.action.quit.tip=Quitter le gestionnaire +observe.action.quitHelp.tip=Quitter l'écran d'aide observe.action.reload.application=Redémarrer l'application observe.action.reload.storage=Recharger la source de données observe.action.reload.storage.tip=Ferme et rouvre la source de données @@ -302,6 +306,7 @@ observe.actions.validate.message.operation.needFix=Vos données ne sont valides observe.actions.validate.message.prepare.validators=Détection des validateurs observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s +observe.actions.validate.message.validate.trip=Validation de la marée « %s » observe.actions.validate.report.contextName=Contexte de validation utilisé \: %1$s observe.actions.validate.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s observe.actions.validate.report.entity=Entité %1$s '%2$s' Nombre de messages %3$s (sur %4$s scope(s)). ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L ObServe %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,19 +24,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.nuiton</groupId> - <artifactId>codelutinpom</artifactId> - <version>10.5</version> + <groupId>io.ultreia.maven</groupId> + <artifactId>pom</artifactId> + <version>2</version> </parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.codelutin.com</url> + <url>http://observe.ultreia.io</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -55,6 +55,8 @@ <id>tchemit</id> <name>Tony Chemit</name> <email>dev(a)tchemit.fr</email> + <organization>Ultreia.io</organization> + <organizationUrl>http://ultreia.io</organizationUrl> <roles> <role>lead</role> <role>developer</role> @@ -140,44 +142,50 @@ </developerConnection> </scm--> <scm> - <url>https://gitlab.nuiton.org/codelutin/observe</url> - <connection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</connection> - <developerConnection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</developerConnection> + <url>https://gitlab.com/ultreia.io/ird-observe</url> + <connection>scm:git:git@gitlab.com:ultreia.io/ird-observe.git</connection> + <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> + <distributionManagement> + <site> + <id>doc.ultreia.io</id> + </site> + </distributionManagement> + <properties> - <projectId>observe</projectId> - <ciViewId>ObServe</ciViewId> + <organizationId>ultreia.io</organizationId> + <projectId>ird-observe</projectId> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> + <gitlabPluginVersion>1.0.4</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - + <jaxxVersion>3.0-alpha-4</jaxxVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> + <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> - <jaxxVersion>3.0-alpha-3</jaxxVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> - <nuitonConfigVersion>3.1.1</nuitonConfigVersion> + <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> + <nuitonConverterVersion>1.0</nuitonConverterVersion> + <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <xworkVersion>2.3.31</xworkVersion> <hibernateVersion>5.1.3.Final</hibernateVersion> - <sl4jVersion>1.7.22</sl4jVersion> + <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <geoToolsVersion>16.1</geoToolsVersion> <webmotionVersion>2.5.1</webmotionVersion> - <httpComponentsVersion>4.5.2</httpComponentsVersion> + <httpComponentsVersion>4.5.3</httpComponentsVersion> + + <licensePluginVersion>1.9</licensePluginVersion> <mavenVersion>3.3.9</mavenVersion>  <license.licenseName>gpl_v3</license.licenseName> - <license.organizationName>IRD, Code Lutin, Tony Chemit</license.organizationName> + <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName>  <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -191,7 +199,15 @@  <locales>fr</locales> - <siteSourcesType>rst</siteSourcesType> + <generateSitemap>true</generateSitemap> + <relativizeDecorationLinks>false</relativizeDecorationLinks> + <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix> + +  + <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> + <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> + <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> + <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> @@ -202,35 +218,6 @@ </properties> - <repositories> - <repository> - <id>observe-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/observe</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>observe-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/observe</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <dependencyManagement> <dependencies> @@ -274,7 +261,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>21.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -290,7 +277,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.5</version> + <version>4.4.6</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -327,13 +314,19 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-version</artifactId> - <version>1.0-rc-2</version> + <version>${nuitonVersionVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-converter</artifactId> - <version>1.0</version> + <version>${nuitonConverterVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>3.0-rc-6</version> <scope>compile</scope> </dependency> <dependency> @@ -362,8 +355,8 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonValidatorVersion}</version> - <scope>test</scope> <classifier>tests</classifier> + <scope>test</scope> <exclusions> <exclusion> <groupId>javassist</groupId> @@ -558,7 +551,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4.1212.jre7</version> + <version>42.0.0.jre7</version> </dependency>  @@ -571,7 +564,7 @@ <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> - <version>2.5.1</version> + <version>2.6.0</version> </dependency> <dependency> @@ -586,232 +579,6 @@ </exclusions> </dependency> -  - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-shapefile</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-swing</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-api</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-main</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-render</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>it.geosolutions.jaiext</groupId> - <artifactId>jaiext</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandmerge</groupId> - <artifactId>jt-bandmerge</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandcombine</groupId> - <artifactId>jt-bandcombine</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandselect</groupId> - <artifactId>jt-bandselect</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.imageio-ext</groupId> - <artifactId>imageio-ext-tiff</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.affine</groupId> - <artifactId>jt-affine</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.crop</groupId> - <artifactId>jt-crop</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.colorconvert</groupId> - <artifactId>jt-colorconvert</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.mosaic</groupId> - <artifactId>jt-mosaic</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.zonal</groupId> - <artifactId>jt-zonal</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.binarize</groupId> - <artifactId>jt-binarize</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.stats</groupId> - <artifactId>jt-stats</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.nullop</groupId> - <artifactId>jt-nullop</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.piecewise</groupId> - <artifactId>jt-piecewise</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.classifier</groupId> - <artifactId>jt-classifier</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.rlookup</groupId> - <artifactId>jt-rlookup</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.algebra</groupId> - <artifactId>jt-algebra</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.border</groupId> - <artifactId>jt-border</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.lookup</groupId> - <artifactId>jt-lookup</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.warp</groupId> - <artifactId>jt-warp</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.rescale</groupId> - <artifactId>jt-rescale</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.format</groupId> - <artifactId>jt-format</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.errordiffusion</groupId> - <artifactId>jt-errordiffusion</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.orderdither</groupId> - <artifactId>jt-orderdither</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.colorindexer</groupId> - <artifactId>jt-colorindexer</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.imagefunction</groupId> - <artifactId>jt-imagefunction</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.vectorbin</groupId> - <artifactId>jt-vectorbin</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.buffer</groupId> - <artifactId>jt-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.translate</groupId> - <artifactId>jt-translate</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.scale</groupId> - <artifactId>jt-scale</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.iterators</groupId> - <artifactId>jt-iterators</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.utilities</groupId> - <artifactId>jt-utilities</artifactId> - </exclusion> - <exclusion> - <groupId>org.jaitools</groupId> - <artifactId>jt-zonalstats</artifactId> - </exclusion> - <exclusion> - <groupId>org.jaitools</groupId> - <artifactId>jt-utils</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.media</groupId> - <artifactId>jai_imageio</artifactId> - </exclusion> - <exclusion> - <groupId>javax.media</groupId> - <artifactId>jai_core</artifactId> - </exclusion> - - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-referencing</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-opengis</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-epsg-hsql</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - <dependency> <groupId>com.vividsolutions</groupId> <artifactId>jts</artifactId> @@ -849,7 +616,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0-b01</version> + <version>4.0.0-b02</version> <scope>provided</scope> </dependency> @@ -960,6 +727,17 @@ </dependency> <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark</artifactId> + <version>0.15.4</version> + </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + <version>0.15.4</version> + </dependency> + + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.22.0-CR1</version> @@ -972,45 +750,65 @@ <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <inherited>false</inherited> + <goals> + <goal>create</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + + </plugins> + <pluginManagement> <plugins> - +  <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <configuration> - <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> - <scmBranch>pages</scmBranch> - <content>${project.build.directory}/staging</content> - </configuration> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <version>${nuitonConverterVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>${nuitonVersionVersion}</version> + </dependency> + </dependencies> </plugin> -  <plugin> - <artifactId>maven-site-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <dependencies> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${reflectionsVersion}</version> </dependency> </dependencies> - <configuration> - <skipDeploy>true</skipDeploy> - </configuration> </plugin> +  <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -1042,22 +840,30 @@ </plugin> <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <version>1.5</version> - <dependencies> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${reflectionsVersion}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>2.4.7</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>${helperPluginVersion}</version> + </plugin> + + <plugin> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <configuration> + <releaseArtifacts> + <releaseArtifact> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <name>Application</name> + <type>zip</type> + </releaseArtifact> + <releaseArtifact> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <name>Serveur</name> + <type>war</type> + </releaseArtifact> + </releaseArtifacts> + </configuration> </plugin> </plugins> @@ -1079,20 +885,20 @@ <profiles> <profile> - <id>no-devmode</id> + <id>release-profile</id> <activation> <property> <name>performRelease</name> <value>true</value> </property> </activation> - <properties> - <devMode>false</devMode> - </properties> + <modules> + <module>observe</module> + </modules> </profile> <profile> - <id>central-safe</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> @@ -1100,118 +906,86 @@ </property> </activation> - <properties> - -  - <release.repository>${other.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> + <reporting> <plugins> + <plugin> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <runOnce>false</runOnce> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - </configuration> - </execution> - </executions> + <artifactId>nuiton-config-maven-plugin</artifactId> + <version>${nuitonConfigVersion}</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <reports> + <report>aggregate-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <i18nBundleName>observe-i18n</i18nBundleName> + </configuration> </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>changelog-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - - <redmine.xmlPath>${project.build.directory}/changes/changes.xml</redmine.xmlPath> - </properties> - <build> - <defaultGoal>process-classes</defaultGoal> - <plugins> - -  <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-changes</id> - <goals> - <goal>generate-changes</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2, update:4</actionMapping> - </configuration> - </execution> - <execution> - <id>generate-changelog</id> - <inherited>false</inherited> - <goals> - <goal>generate-changelog</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <attach>true</attach> - </configuration> - </execution> - </executions> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-info</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> </plugin> - </plugins> - </build> - </profile> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>${changesPluginVersion}</version> + <configuration> + <issueLinkTemplatePerSystem> + <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + </issueLinkTemplatePerSystem> + <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> + </configuration> + </plugin> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>${changelogPluginVersion}</version> + </plugin> - <reporting> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${licensePluginVersion}</version> + </plugin> - <plugins> -  + </plugin> </plugins> </reporting> @@ -1221,7 +995,6 @@ <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> <executions> @@ -1234,25 +1007,10 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="persistence/src/main/xmi"> + <fileset dir="entities/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> - <copy todir="${project.reporting.outputDirectory}/validation/service" failonerror="true" overwrite="true"> - <fileset dir="services-validation/src/main/resources"> - <include name="**/*-validation.xml" /> - </fileset> - </copy> - <copy todir="${project.reporting.outputDirectory}/validation/ui" failonerror="true" overwrite="true"> - <fileset dir="application-swing-validation/src/main/resources"> - <include name="**/*-validation.xml" /> - </fileset> - </copy> - <copy todir="${project.reporting.outputDirectory}/validation" failonerror="true" overwrite="true"> - <fileset dir="application-swing-configuration/src/main/resources"> - <include name="validators.xml" /> - </fileset> - </copy> </target> </configuration> <goals> @@ -1262,6 +1020,35 @@ </executions> </plugin> + <plugin> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <inherited>false</inherited> + <goals> + <goal>generate-changes</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>compute-distribution-site-url</id> + <goals> + <goal>compute-distribution-site-url</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + </plugins> </build> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/df615478b61c60cefaeccb26f1…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] update readme
by Tony CHEMIT March 8, 2017

March 8, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c3791225 by Tony CHEMIT at 2017-03-08T14:10:05+01:00 update readme - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.1) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-3) # Community View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/c3791225e9ebec0eb2587c802a…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] improve release script [skip ci]
by Tony CHEMIT March 6, 2017

March 6, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: ca18ac86 by Tony CHEMIT at 2017-03-06T09:33:57+01:00 improve release script [skip ci] - - - - - 1 changed file: - bin/stage_create.sh Changes: ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -28,6 +28,12 @@ STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +echo "Update changelog ($LOG_DIR/release-changelog.log)" +mvn -N -Pupdate-staging-changelog -Dgitlab.milestone=${VERSION} -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} --log-file ${LOG_DIR}/release-changelog.log + +git commit -m "Update changelog for version $VERSION" CHANGELOG.md + +git stash git checkout ${PROJECT}-${VERSION} echo "Generate site: ($LOG_DIR/release-site.log)" @@ -36,11 +42,5 @@ mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/releas echo "Deploy demo: ($LOG_DIR/release-demo.log)" mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log -echo "Update changelog ($LOG_DIR/release-changelog.log)" -mvn -N -Pupdate-changelog -Dgitlab.staging -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} --log-file ${LOG_DIR}/release-changelog.log - -cp CHANGELOG.md /tmp git stash -git checkout ${DEVELOP} -mv /tmp/CHANGELOG.md . -git commit -m "Update changelog for version $VERSION" CHANGELOG.md \ No newline at end of file +git checkout ${DEVELOP} \ No newline at end of file View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ca18ac8645550c75015a42244b…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] upate changelog [skip ci]
by Tony CHEMIT March 6, 2017

March 6, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 5a2ddf61 by Tony CHEMIT at 2017-03-06T08:19:42+01:00 upate changelog [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,23 +1,29 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-02-21 11:59. + * Last generated at 2017-03-06 08:18. ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) 

*(from redmine: created on 2017-02-04)* -### Download (staging) -* [Application (observe-5.3.2.zip)](https://oss.sonatype.org/content/repositories/frirdobse…) -* [Serveur (observe-5.3.2.war)](https://oss.sonatype.org/content/repositories/frirdobse…) +**Closed at *In progress*.** + +### Download +* [Application (observe-5.3.2.zip)](https://oss.sonatype.org/content/repositories/frirdobse…) +* [Serveur (observe-5.3.2.war)](https://oss.sonatype.org/content/repositories/frirdobse…) ### Issues * [[Anomalie 704]](https://gitlab.com/ultreia.io/ird-observe/issues/704) **Ré ouverture de #8879** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Anomalie 721]](https://gitlab.com/ultreia.io/ird-observe/issues/721) **Le code de vitesse du vent n'apparaît pas dans sa liste déroulante, alors qu'il est bien présent dans la base** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 724]](https://gitlab.com/ultreia.io/ird-observe/issues/724) **Pourquoi l'UI référentiel avancé ne permet pas de synchroniser central -> local ?** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Anomalie 725]](https://gitlab.com/ultreia.io/ird-observe/issues/725) **La suppression d'un type de sexe ne marche toujours pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 726]](https://gitlab.com/ultreia.io/ird-observe/issues/726) **Problème DTO sur espèce toujours présent** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 727]](https://gitlab.com/ultreia.io/ird-observe/issues/727) **La consultation des références utilisées par une espèce ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 732]](https://gitlab.com/ultreia.io/ird-observe/issues/732) **Le recalcul des données sur un nombre important de marées plante** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 734]](https://gitlab.com/ultreia.io/ird-observe/issues/734) **Formulaire balise, ergonomie graphique et barre de séparation horizontale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 736]](https://gitlab.com/ultreia.io/ird-observe/issues/736) **Petits défauts d'affichage dans l'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 735]](https://gitlab.com/ultreia.io/ird-observe/issues/735) **Corruption de base toujours d'actualité** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 737]](https://gitlab.com/ultreia.io/ird-observe/issues/737) **[LL] bug dans association capture avec section** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 740]](https://gitlab.com/ultreia.io/ird-observe/issues/740) **[LL] Dans l'écran des captures, la sélection de certaines sections ne modifie pas le formulaire** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 311]](https://gitlab.com/ultreia.io/ird-observe/issues/311) **[PS] Forcer l'utilisateur à consulter l'écran "Systèmes observés"** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Evolution 723]](https://gitlab.com/ultreia.io/ird-observe/issues/723) **Nom de l'application dans sa barre de titre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -240,7 +246,7 @@ No issue. * [[Anomalie 293]](https://gitlab.com/ultreia.io/ird-observe/issues/293) **Comportements incorrects du widget de saisie des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 343]](https://gitlab.com/ultreia.io/ird-observe/issues/343) **Comportement du widget de positions - le quandrant change tout seul lors de la saisie des coordonnées** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 344]](https://gitlab.com/ultreia.io/ird-observe/issues/344) **Le widget des positions a effacé les degrés lors de l'enregistrement** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) - * [[Anomalie 426]](https://gitlab.com/ultreia.io/ird-observe/issues/426) **[ObServeLL] l'appli de démarre plus** (Thanks to Philippe Sabarro) (Reported by Tony CHEMIT) + * [[Anomalie 426]](https://gitlab.com/ultreia.io/ird-observe/issues/426) **[ObServeLL] l'appli de démarre plus** (Thanks to Philippe Sabarros) (Reported by Tony CHEMIT) * [[Anomalie 514]](https://gitlab.com/ultreia.io/ird-observe/issues/514) **Bug d'affichage des scrolling bars dans les listes sous windows** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Anomalie 537]](https://gitlab.com/ultreia.io/ird-observe/issues/537) **[PS] format champ starttime dans observe_seine.set** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) * [[Anomalie 542]](https://gitlab.com/ultreia.io/ird-observe/issues/542) **[LL] Utilisation des calendriers de filage/virage** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/5a2ddf619cab99c880849cbf74…

1 0

[Git][ultreia.io/ird-observe][release/5.3.2] [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch release/5.3.2 at ultreia.io / ird-observe Commits: 60880d56 by Tony CHEMIT at 2017-03-03T19:56:14+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</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>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.2</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/60880d56b5a1ed3c94963590f3…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/5.3.2
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT deleted branch release/5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag ird-observe-5.3.2
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed new tag ird-observe-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master-5.x] 44 commits: [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 18749dca by root at 2017-02-21T10:30:43+00:00 [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development - - - - - 311fc09f by Tony CHEMIT at 2017-02-21T11:50:10+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - da2a4bcb by Tony CHEMIT at 2017-02-21T11:50:11+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 3cb19ebc by Tony CHEMIT at 2017-02-21T11:50:12+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9ff34303 by Tony CHEMIT at 2017-02-21T12:01:18+01:00 update changelog for staging version 5.3.2 - - - - - 04a29ba2 by Tony CHEMIT at 2017-02-24T11:08:09+01:00 Ajout chemin de backups dans la configuration (See #735) - - - - - db280d6d by Tony CHEMIT at 2017-02-24T11:08:59+01:00 Ajout du gestionnaire de sauvegardes (See #735) - - - - - 3c5c7631 by Tony CHEMIT at 2017-02-24T14:28:51+01:00 Au démarrage possibilité de charger la dernière sauvegarde automatique (See #735) - - - - - 2c9f4439 by Tony CHEMIT at 2017-02-24T18:03:37+01:00 Traduction de la nouvelle template (See #735) - - - - - d0b5631a by Tony CHEMIT at 2017-02-25T14:09:52+01:00 Amélioration de la fermeture de l'application (See #735) - - - - - 845c0fdb by Tony CHEMIT at 2017-03-01T16:01:00+01:00 On ne détruit pas la base à la fermeture - - - - - 1d162b3a by Tony CHEMIT at 2017-03-01T16:01:20+01:00 fix site url - - - - - 02a5c01c by Tony CHEMIT at 2017-03-01T16:21:59+01:00 amélioration ouverture base (See #735) - - - - - 07048a0e by Tony CHEMIT at 2017-03-01T16:24:30+01:00 review builds - - - - - 009a43b9 by Tony CHEMIT at 2017-03-01T16:24:42+01:00 Merge branch 'feature/backupStorage' into develop-5.x - - - - - a3b105b9 by Tony CHEMIT at 2017-03-01T16:38:28+01:00 downgrade version - - - - - 2d6e713d by Tony CHEMIT at 2017-03-01T17:24:52+01:00 amélioration ouverture base (See #735) - - - - - ab2efc88 by Tony CHEMIT at 2017-03-01T17:45:55+01:00 optimize dependencies - - - - - fb17d43d by Tony CHEMIT at 2017-03-01T17:46:17+01:00 add missing headers - - - - - 97eadf31 by Tony CHEMIT at 2017-03-01T17:46:46+01:00 Pouvoir modifier le référentiel d'une base locale (See #724) - - - - - 08f84088 by Tony CHEMIT at 2017-03-01T19:03:43+01:00 use maven search bagde - - - - - 126f6a37 by Tony CHEMIT at 2017-03-01T19:03:58+01:00 Improve changelog in about ui - - - - - ca3181ed by Tony CHEMIT at 2017-03-01T19:10:08+01:00 improve code - - - - - 01930f8f by Tony CHEMIT at 2017-03-02T09:45:55+01:00 improve web deploy - - - - - ef268c46 by Tony CHEMIT at 2017-03-02T09:47:45+01:00 fix build number for web application - - - - - f07d5d9a by Tony CHEMIT at 2017-03-02T10:12:22+01:00 fix build number for web application - - - - - 902c4dd4 by Tony CHEMIT at 2017-03-02T10:30:04+01:00 update demo urls - - - - - f5dc88a1 by Tony CHEMIT at 2017-03-02T10:36:40+01:00 improve demo build - - - - - f9e49b1e by Tony CHEMIT at 2017-03-02T11:04:03+01:00 improve readme [skip ci] - - - - - 82e6592a by Tony CHEMIT at 2017-03-02T11:56:37+01:00 fix release build - - - - - 65e55e77 by Tony CHEMIT at 2017-03-02T12:17:33+01:00 fix release build [skip ci] - - - - - 4c53157a by Tony CHEMIT at 2017-03-02T14:37:20+01:00 fix release build [skip ci] - - - - - 9fd7dd08 by Tony CHEMIT at 2017-03-02T15:05:22+01:00 optimize dependencies [skip ci] - - - - - 777ace02 by Tony CHEMIT at 2017-03-02T15:46:00+01:00 fix builds [skip ci] - - - - - a6591545 by Tony CHEMIT at 2017-03-02T16:02:53+01:00 fix site build [skip ci] - - - - - c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00 mettre dans le même ordre les binders et les décorateurs (See #737) - - - - - 07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00 Correction de la valeur non déclanchée lors du changement de section (See #740) - - - - - 26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00 section mal recopiée par hibernate (See #737) - - - - - ef5095cd by Tony CHEMIT at 2017-03-03T17:49:03+01:00 Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de marées à traiter (See #732) - - - - - c992525f by Tony CHEMIT at 2017-03-03T18:08:56+01:00 add nuiton before central repo - - - - - bcd48848 by Tony CHEMIT at 2017-03-03T18:12:09+01:00 add nuiton before central repo - - - - - 0f18a58d by Tony CHEMIT at 2017-03-03T19:55:50+01:00 [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions - - - - - 60880d56 by Tony CHEMIT at 2017-03-03T19:56:14+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions - - - - - b699eabf by Tony CHEMIT at 2017-03-03T20:02:10+01:00 [jgitflow-maven-plugin]merging 'release/5.3.2' into 'master-5.x' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/src/main/config/ObserveSwingApplication.ini - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/LocalDatabaseBackupTask.java → application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupStorage.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/BackupsManager.java - + application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowAboutAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java - + application-swing/src/main/resources/ftl/initStorage_en.ftl - + application-swing/src/main/resources/ftl/initStorage_es.ftl - + application-swing/src/main/resources/ftl/initStorage_fr.ftl - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/c0e9ad9b27bb4af19e7b294e3…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 6 commits: [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 0f18a58d by Tony CHEMIT at 2017-03-03T19:55:50+01:00 [jgitflow-maven-plugin]updating poms for 5.3.2 branch with snapshot versions - - - - - 60880d56 by Tony CHEMIT at 2017-03-03T19:56:14+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.2' with non-snapshot versions - - - - - b699eabf by Tony CHEMIT at 2017-03-03T20:02:10+01:00 [jgitflow-maven-plugin]merging 'release/5.3.2' into 'master-5.x' - - - - - 5b6b0c9a by Tony CHEMIT at 2017-03-03T20:02:13+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - e1486af1 by Tony CHEMIT at 2017-03-03T20:02:13+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - ee3efe8c by Tony CHEMIT at 2017-03-03T20:02:14+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/6bfea487507d0c8c69702813d…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 6bfea487 by Tony CHEMIT at 2017-03-03T19:55:52+01:00 [jgitflow-maven-plugin]updating poms for 5.3.3-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> @@ -921,8 +921,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" - tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> </target> </configuration> <goals> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-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>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.2-SNAPSHOT</version> + <version>5.3.3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/6bfea487507d0c8c69702813db…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/5.3.2
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed new branch release/5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag ird-observe-5.3.2
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT deleted tag ird-observe-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop-5.x] add nuiton before central repo
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: bcd48848 by Tony CHEMIT at 2017-03-03T18:12:09+01:00 add nuiton before central repo - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -238,6 +238,16 @@ </releases> </repository> </repositories> + <pluginRepositories> + <pluginRepository> + <id>before-central</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </pluginRepository> + </pluginRepositories> <dependencyManagement> <dependencies> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/bcd4884838f9d8f345243ea108…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] add nuiton before central repo
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c992525f by Tony CHEMIT at 2017-03-03T18:08:56+01:00 add nuiton before central repo - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -228,6 +228,16 @@ </properties> + <repositories> + <repository> + <id>before-central</id> + <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> <dependencyManagement> <dependencies> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/c992525f3c8e5aa6a372a23167…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de…
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: ef5095cd by Tony CHEMIT at 2017-03-03T17:49:03+01:00 Meilleure gestion de l'action Consolidation pour tenir quelque soit le nombre de marées à traiter (See #732) - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -22,12 +22,9 @@ package fr.ird.observe.application.swing.ui.admin.consolidate; import com.google.common.collect.ImmutableSet; +import fr.ird.observe.application.swing.ObserveRunner; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.application.swing.ui.admin.AdminStep; -import fr.ird.observe.application.swing.ui.admin.AdminTabUI; -import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; -import fr.ird.observe.application.swing.ui.admin.AdminUI; -import fr.ird.observe.application.swing.ui.admin.AdminUIModel; +import fr.ird.observe.application.swing.ui.admin.*; import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.DataSelectionTreeSelectionModel; @@ -41,7 +38,7 @@ import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.JTree; +import javax.swing.*; import java.beans.PropertyChangeListener; import java.util.Date; import java.util.Set; @@ -131,35 +128,50 @@ public class ConsolidateUIHandler extends AdminTabUIHandler { ConsolidateDataService consolidateDataService = dataSource.newConsolidateDataService(); - ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); - request.setTripSeineIds(tripIds); - request.setFailIfLenghtWeightParameterNotFound(false); + int nbResults = 0; + int index=0; + int nbTrips = tripIds.size(); - ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request); + for (String tripId : tripIds) { - if (results.isEmpty()) { + ConsolidateTripSeineDataRequest request = new ConsolidateTripSeineDataRequest(); + request.setTripSeineIds(ImmutableSet.of(tripId)); + request.setFailIfLenghtWeightParameterNotFound(false); - sendMessage(t("observe.actions.consolidate.message.noChanges")); + sendMessage(t("observe.actions.consolidate.start.trip", ++index, nbTrips, tripId)); - } else { + ImmutableSet<ConsolidateTripSeineDataResult> results = consolidateDataService.consolidateTripSeines(request); - for (ConsolidateTripSeineDataResult tripSeineDataResult : results) { + ObserveRunner.cleanMemory(); - String tripSeineLabel = tripSeineDataResult.getTripSeineLabel(); + nbResults+=results.size(); - sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + if (results.isEmpty()) { - for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) { + sendMessage(t("observe.actions.consolidate.message.noChanges")); - sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + } + else { + for (ConsolidateTripSeineDataResult tripSeineDataResult : results) { - } + String tripSeineLabel = tripSeineDataResult.getTripSeineLabel(); + + sendMessage(t("observe.actions.consolidate.message.trip", tripSeineLabel)); + + for (ConsolidateActivitySeineDataResult activitySeineDataResult : tripSeineDataResult.getConsolidateActivitySeineDataResults()) { + + sendMessage(t("observe.actions.consolidate.message.activity", activitySeineDataResult.getActivitySeineLabel())); + } + + } } - sendMessage(t("observe.actions.consolidate.message.save.changes", results.size())); } + sendMessage(t("observe.actions.consolidate.message.save.changes", nbResults)); + + sendMessage(t("observe.actions.consolidate.message.operation.done", new Date())); } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No data modified. observe.actions.consolidate.message.operation.done=Consolidate operation done in %1$s. observe.actions.consolidate.message.save.changes=Save modified %1$s trip(s). observe.actions.consolidate.message.trip=Data consolidate for trip %1$s +observe.actions.consolidate.start.trip=Start consolidate data on trip %s / %s (%s) observe.actions.consolidate.title=Consolidate data observe.actions.consolidate.title.tip=Consolidate observed data observe.actions.exportData=Export data ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=No modificación de datos. observe.actions.consolidate.message.operation.done=Operación de calculo de datos terminada en %1$s. observe.actions.consolidate.message.save.changes=Guardar las modificaciones de la(s) %1$s marea(s) modificada(s). observe.actions.consolidate.message.trip=Datos calculados para la marea %1$s +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) \#TODO observe.actions.consolidate.title=Consolidar los datos observados observe.actions.consolidate.title.tip=Consolidar los datos observados observe.actions.exportData=Exportar los datos observados ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -143,6 +143,7 @@ observe.actions.consolidate.message.noChanges=Aucune donnée modifiée. observe.actions.consolidate.message.operation.done=Opération de calcul des données terminée à %1$s. observe.actions.consolidate.message.save.changes=Sauvegarde des modifications sur la(es) %1$s marée(s) modifiée(s). observe.actions.consolidate.message.trip=Données calculées pour la marée %1$s +observe.actions.consolidate.start.trip=Démarrage de la consolidation pour la marée %s / %s (%s) observe.actions.consolidate.title=Consolider les données observateur observe.actions.consolidate.title.tip=Consolider les données observateur observe.actions.exportData=Exporter les données observateurs View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ef5095cd0319556b9ef97361b5…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 3 commits: mettre dans le même ordre les binders et les décorateurs (See #737)
by Tony CHEMIT March 3, 2017

March 3, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: c1cb277f by Tony CHEMIT at 2017-03-02T18:20:51+01:00 mettre dans le même ordre les binders et les décorateurs (See #737) - - - - - 07ea97e9 by Tony CHEMIT at 2017-03-03T14:06:47+01:00 Correction de la valeur non déclanchée lors du changement de section (See #740) - - - - - 26afb510 by Tony CHEMIT at 2017-03-03T14:07:37+01:00 section mal recopiée par hibernate (See #737) - - - - - 7 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss - pom.xml - + services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java - services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java - services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jcss @@ -73,6 +73,7 @@ #section { property:{CatchLonglineDto.PROPERTY_SECTION}; selectedItem:{tableEditBean.getSection()}; + force:true; _listNoLoad:{true}; } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -169,7 +169,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>2.40</jaxxVersion> + <jaxxVersion>2.41</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java ===================================== --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/longline/CatchLonglineDto.java @@ -0,0 +1,39 @@ +package fr.ird.observe.services.dto.longline; + +/*- + * #%L + * ObServe :: Services DTO + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * 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>. + * #L% + */ + +import fr.ird.observe.services.dto.DataReference; + +import javax.annotation.Generated; + +@Generated(value = "org.nuiton.eugene.java.BeanTransformer", date = "Wed Mar 01 18:04:05 CET 2017") +public class CatchLonglineDto extends GeneratedCatchLonglineDto { + + + public void setSection(DataReference<SectionDto> section) { + super.setSection(section); + System.out.println("WTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTTF ???? to section: "+section); + } + + private static final long serialVersionUID = 3846975004402399536L; +} //CatchLonglineDto ===================================== services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java ===================================== --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -200,25 +200,25 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, SetLonglineDto.PROPERTY_HOME_ID)), SECTION(newDefinitionBuilder(SectionDto.class) - .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, SectionDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, SectionDto.PROPERTY_HAULING_IDENTIFIER)), BASKET(newDefinitionBuilder(BasketDto.class) - .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, BasketDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BasketDto.PROPERTY_HAULING_IDENTIFIER)), BRANCHLINE(newDefinitionBuilder(BranchlineDto.class) - .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER) - .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER)), + .addProperty(Integer.class, BranchlineDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BranchlineDto.PROPERTY_HAULING_IDENTIFIER)), BASKET_WITH_SECTION(newDefinitionBuilder(BasketWithSectionIdDto.class) - .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BasketWithSectionIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(String.class, BasketWithSectionIdDto.PROPERTY_SECTION_ID)), BRANCHLINE_WITH_BASKET(newDefinitionBuilder(BranchlineWithBasketIdDto.class) - .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_SETTING_IDENTIFIER) + .addProperty(Integer.class, BranchlineWithBasketIdDto.PROPERTY_HAULING_IDENTIFIER) .addProperty(String.class, BranchlineWithBasketIdDto.PROPERTY_BASKET_ID)), FLOATLINES_COMPOSITION(newDefinitionBuilder(FloatlinesCompositionDto.class) ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BasketBinder.java @@ -69,14 +69,14 @@ public class BasketBinder extends DataBinderSupport<Basket, BasketDto> { @Override public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, Basket entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier()); } @Override public DataReference<BasketDto> toDataReference(ReferentialLocale referentialLocale, BasketDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/BranchlineBinder.java @@ -115,14 +115,14 @@ public class BranchlineBinder extends DataBinderSupport<Branchline, BranchlineDt @Override public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, Branchline entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + return toDataReference(entity, entity.getSettingIdentifier(), entity.getHaulingIdentifier()); } @Override public DataReference<BranchlineDto> toDataReference(ReferentialLocale referentialLocale, BranchlineDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/SectionBinder.java @@ -65,14 +65,18 @@ public class SectionBinder extends DataBinderSupport<Section, SectionDto> { @Override public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, Section entity) { - return toDataReference(entity, entity.getHaulingIdentifier(), entity.getSettingIdentifier()); + //FIXME-tchemit Je ne sais pas pourquoi mais si on utilise ces deux variables inline + //FIXME-tchemit alors les valeurs sont inversées!!! pb proxy hibernate + Integer settingIdentifier = entity.getSettingIdentifier(); + Integer haulingIdentifier = entity.getHaulingIdentifier(); + return toDataReference(entity, settingIdentifier, haulingIdentifier); } @Override public DataReference<SectionDto> toDataReference(ReferentialLocale referentialLocale, SectionDto dto) { - return toDataReference(dto, dto.getHaulingIdentifier(), dto.getSettingIdentifier()); + return toDataReference(dto, dto.getSettingIdentifier(), dto.getHaulingIdentifier()); } } View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/a6591545b50f649be57d9775a…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix site build [skip ci]
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: a6591545 by Tony CHEMIT at 2017-03-02T16:02:53+01:00 fix site build [skip ci] - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -921,7 +921,7 @@ </reportSet> </reportSets> <configuration> - <i18nBundleName>${projectId}-i18n</i18nBundleName> + <i18nBundleName>observe-i18n</i18nBundleName> </configuration> </plugin> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/a6591545b50f649be57d9775a4…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix builds [skip ci]
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 777ace02 by Tony CHEMIT at 2017-03-02T15:46:00+01:00 fix builds [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ stages: stage: Test script: - mvn -Padd-git-commit-id-to-project-version -N - - mvn install -am -p application-web -DskipTests -Pdeploy-demo -Dclassifier=latest + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -Dclassifier=latest build: stage: Build @@ -85,7 +85,7 @@ stage: <<: *test_manual <<: *before_script_clone script: - - apt-get install libc6:i386 libstdc++6:i386 -y + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - . ~/env/bin/stage.sh "$MASTER" "$DEVELOP" "$STAGE" latest-site: @@ -132,7 +132,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -p application-web -DskipTests -Pdeploy-demo -DperformRelease + - mvn install -am -pl application-web -DskipTests -Pdeploy-demo -DperformRelease staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/777ace02ace09c280580564396…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] optimize dependencies [skip ci]
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 9fd7dd08 by Tony CHEMIT at 2017-03-02T15:05:22+01:00 optimize dependencies [skip ci] - - - - - 2 changed files: - application-swing/pom.xml - pom.xml Changes: ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -569,6 +569,10 @@ <groupId>com.vladsch.flexmark</groupId> <artifactId>flexmark</artifactId> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + </dependency>  <dependency> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -730,6 +730,11 @@ <artifactId>flexmark</artifactId> <version>0.15.4</version> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + <version>0.15.4</version> + </dependency> <dependency> <groupId>org.javassist</groupId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/9fd7dd080c47facbc34593df39…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release build [skip ci]
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 4c53157a by Tony CHEMIT at 2017-03-02T14:37:20+01:00 fix release build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ nightly-build: stage: Build <<: *nightly script: - - apt-get update -y && apt-get install libc6:i386 libstdc++6:i386 -y + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - mvn clean verify -DperformRelease nightly-site: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4c53157a3b33a5b34ee0c813f9…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release build [skip ci]
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 65e55e77 by Tony CHEMIT at 2017-03-02T12:17:33+01:00 fix release build [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -107,7 +107,7 @@ nightly-build: stage: Build <<: *nightly script: - - apt-get install libc6:i386 libstdc++6:i386 -y + - apt-get update -y && apt-get install libc6:i386 libstdc++6:i386 -y - mvn clean verify -DperformRelease nightly-site: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/65e55e77ce04d2a27879d16e45…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] fix release build
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 82e6592a by Tony CHEMIT at 2017-03-02T11:56:37+01:00 fix release build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,7 @@ stage: <<: *test_manual <<: *before_script_clone script: + - apt-get install libc6:i386 libstdc++6:i386 -y - . ~/env/bin/stage.sh "$MASTER" "$DEVELOP" "$STAGE" latest-site: @@ -106,6 +107,7 @@ nightly-build: stage: Build <<: *nightly script: + - apt-get install libc6:i386 libstdc++6:i386 -y - mvn clean verify -DperformRelease nightly-site: @@ -130,7 +132,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -p application-web -DskipTests -Pdeploy-demo + - mvn install -am -p application-web -DskipTests -Pdeploy-demo -DperformRelease staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/82e6592aa71973dd76068311bc…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] improve readme [skip ci]
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: f9e49b1e by Tony CHEMIT at 2017-03-02T11:04:03+01:00 improve readme [skip ci] - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,16 +1,21 @@ # ObServe [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… - ![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop-5.x/build.… # Resources * [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop-5.x/CHANG… * [Documentation](http://observe.ultreia.io) -* [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) -* [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) + +# Demo + * [Demo (latest)](https://demo.ultreia.io/observe-latest) * [Demo (5.x)](https://demo.ultreia.io/observe-5.3.1) -* [Demo (6.x)](https://demo.ultreia.io/observe-5.0-RC-3) +* [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-3) + +# Community + +* [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) +* [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) * [Contact](mailto:dev@tchemit.fr) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/f9e49b1eee07cbffc5a13615ae…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] improve demo build
by Tony CHEMIT March 2, 2017

March 2, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: f5dc88a1 by Tony CHEMIT at 2017-03-02T10:36:40+01:00 improve demo build - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ stages: stage: Test script: - mvn -Padd-git-commit-id-to-project-version -N - - mvn install -DskipTests -Pdeploy-demo -Dclassifier=latest + - mvn install -am -p application-web -DskipTests -Pdeploy-demo -Dclassifier=latest build: stage: Build @@ -130,7 +130,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -DskipTests -Pdeploy-demo + - mvn install -am -p application-web -DskipTests -Pdeploy-demo staging-site: <<: *staging View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/f5dc88a19c7d01f07758f7c3b3…

1 0