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

[Git][ultreiaio/ird-observe][develop] update templates
by Tony CHEMIT 11 Apr '19

11 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 509bd6be by tchemit at 2019-04-11T11:29:23Z update templates - - - - - 3 changed files: - .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie.md - + .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution.md - − .gitlab/issue_templates/Evolution future.md Changes: ===================================== .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md → .gitlab/issue_templates/Contrat-RECOLAP-2019-Anomalie.md ===================================== @@ -9,6 +9,9 @@ ``` /label ~"Anomalie" -/label ~"Contrat Code Lutin-2016" -/milestone %"Contrat Code Lutin-2016" + +/milestone %"Contrat RECOLAPE 2019" + +/label ~"IRD-2018-02-V9" + /assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Contrat-RECOLAP-2019-Évolution.md ===================================== @@ -0,0 +1,8 @@ + +/label ~"Evolution" + +/milestone %"Contrat RECOLAPE 2019" + +/label ~"IRD-2018-02-V9" + +/assign @tchemit \ No newline at end of file ===================================== .gitlab/issue_templates/Evolution future.md deleted ===================================== @@ -1,5 +0,0 @@ - - -/label ~"Evolution" -/milestone %"Backlog" -/assign @tchemit \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/509bd6be122a1304c951ef1cdee… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/509bd6be122a1304c951ef1cdee… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT 11 Apr '19

11 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a719ce45 by tchemit at 2019-04-11T08:32:25Z update changelog - - - - - 3 changed files: - .mvn/gitlab-cache/milestones/796341-issues.json - .mvn/gitlab-cache/milestones/796341.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/796341-issues.json ===================================== @@ -1,4 +1,67 @@ [ + { + "id": 19149533, + "iid": 1244, + "projectId": 2722779, + "title": "Bug requête tableau synthèse DCP", + "description": "Il semblerait que la requête qui permet de générer le tableau de synthèse \"Utilisation des DCP\" ait un souci car elle retourne toujours **un nombre de DCP pêchés égal à 0**. Exemple en PJ.[Tableau_synthese_DCP.xlsx](/uploads/34dc4cd2db770bc354a3e01c815b4ade/Tableau_synthese_DCP.xlsx)", + "labels": [ + "Anomalie", + "Senne", + "À corriger", + "À facturer" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "description": "", + "dueDate": "Apr 11, 2019 2:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111294, + "_username": "psabarros", + "_name": "Philippe Sabarros", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" + }, + "userNotesCount": 12, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Apr 11, 2019 10:27:07 AM", + "createdAt": "Mar 15, 2019 12:13:36 PM", + "closedAt": "Apr 11, 2019 10:26:36 AM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1244" + }, { "id": 18835616, "iid": 1243, @@ -16,7 +79,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -85,7 +148,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -154,7 +217,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -222,7 +285,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -282,7 +345,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, ===================================== .mvn/gitlab-cache/milestones/796341.json ===================================== @@ -5,7 +5,7 @@ "groupId": 0, "title": "7.0.6", "description": "", - "dueDate": "Mar 10, 2019 1:00:00 AM", + "dueDate": "Apr 11, 2019 2:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-03-10 14:28. + * Last generated at 2019-04-11 10:29. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. @@ -115,7 +115,7 @@ Premier lot du contrat IRD-2018-01-V8 ## Version [7.0.6](https://gitlab.com/ultreiaio/ird-observe/milestones/137) -**Closed at 2019-03-10.** +**Closed at 2019-04-11.** ### Download * [Application (observe-7.0.6-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip) @@ -127,6 +127,7 @@ Premier lot du contrat IRD-2018-01-V8 * [[Anomalie 1241]](https://gitlab.com/ultreiaio/ird-observe/issues/1241) **Libellés manquants sur formulaire édition espèces** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) * [[Anomalie 1242]](https://gitlab.com/ultreiaio/ird-observe/issues/1242) **Incohérence "type de mensuration" dans formulaire "echantillons"** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) * [[Anomalie 1243]](https://gitlab.com/ultreiaio/ird-observe/issues/1243) **Sauvegarde hors de .observe/backup plus possible** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 1244]](https://gitlab.com/ultreiaio/ird-observe/issues/1244) **Bug requête tableau synthèse DCP** (Thanks to Pascal Cauquil) (Reported by Philippe Sabarros) ## Version [7.0.5](https://gitlab.com/ultreiaio/ird-observe/milestones/136) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a719ce4547d175417c05e9d1844… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a719ce4547d175417c05e9d1844… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT 11 Apr '19

11 Apr '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e5f32fd5 by tchemit at 2019-04-11T08:21:18Z update pom - - - - - 30426268 by tchemit at 2019-04-11T08:26:23Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - 18 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client-core/src/license/THIRD-PARTY.properties - client-runner/src/license/THIRD-PARTY.properties - dto/src/license/THIRD-PARTY.properties - + observe-i18n/src/license/THIRD-PARTY.properties - persistence/pom.xml - persistence/src/license/THIRD-PARTY.properties - pom.xml - server-configuration/src/license/THIRD-PARTY.properties - server-core/src/license/THIRD-PARTY.properties - server-runner/src/license/THIRD-PARTY.properties - services-client/src/license/THIRD-PARTY.properties - services-local/src/license/THIRD-PARTY.properties - services-validation/src/license/THIRD-PARTY.properties - services/src/license/THIRD-PARTY.properties - services/src/main/resources/observe-reports.properties - + test/src/license/THIRD-PARTY.properties - validation/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:59:54 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:37 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== client-core/src/license/THIRD-PARTY.properties ===================================== @@ -9,20 +9,18 @@ # - BSD License # - BSD License for HSQL # - CDDL 1.1 -# - CDDL+GPL License # - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - EDL 1.0 # - EPSG database distribution license -# - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Distribution License - v 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license @@ -49,6 +47,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 14:00:16 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 16:18:22 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== client-runner/src/license/THIRD-PARTY.properties ===================================== @@ -14,15 +14,13 @@ # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 # - EPSG database distribution license -# - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Distribution License - v 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license @@ -48,6 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Feb 03 20:51:50 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:45:39 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== dto/src/license/THIRD-PARTY.properties ===================================== @@ -1,12 +1,13 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,9 +16,11 @@ # - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:22:53 CEST 2015 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 16:20:09 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== observe-i18n/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 14:54:15 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== persistence/pom.xml ===================================== @@ -135,6 +135,16 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>javax.activation-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>net.bytebuddy</groupId> @@ -182,11 +192,11 @@ <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>javax.xml.bind</groupId> - <artifactId>jaxb-api</artifactId> - <scope>runtime</scope> - </dependency> + + + + + <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> ===================================== persistence/src/license/THIRD-PARTY.properties ===================================== @@ -12,12 +12,11 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - General Public License (GPL) @@ -37,5 +36,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:32 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:50:08 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.12</version> + <version>2019.8.13</version> </parent> <groupId>fr.ird.observe</groupId> @@ -163,7 +163,7 @@   - <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx> +    @@ -238,11 +238,11 @@ <version>1.08</version> </dependency> - <dependency> - <groupId>org.glassfish.jaxb</groupId> - <artifactId>jaxb-runtime</artifactId> - <version>2.3.1</version> - </dependency> + + + + + <dependency> <groupId>org.nuiton.topia</groupId> ===================================== server-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 16:06:54 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:30 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== server-core/src/license/THIRD-PARTY.properties ===================================== @@ -17,12 +17,11 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 @@ -44,6 +43,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:59:51 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:34 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== server-runner/src/license/THIRD-PARTY.properties ===================================== @@ -11,17 +11,16 @@ # - BSD licence # - Bouncy Castle Licence # - CDDL 1.1 -# - CDDL+GPL License # - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - EDL 1.0 +# - Eclipse Distribution License - v 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 @@ -43,6 +42,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 14:00:38 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 16:40:05 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:59:43 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:53:26 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-local/src/license/THIRD-PARTY.properties ===================================== @@ -12,12 +12,11 @@ # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - Dual license consisting of the CDDL v1.1 and GPL v2 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 @@ -36,5 +35,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:50 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:50:27 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-validation/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:01 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:49:43 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:01 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:49:38 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -167,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ Where \ m.id In :tripId \ and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' + and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau report.dcpUsage.request.4=3,0|row|\ ===================================== test/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 14:48:37 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== validation/src/license/THIRD-PARTY.properties ===================================== @@ -6,14 +6,18 @@ # - Apache License, version 2.0 # - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL+GPL License +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 +# - Eclipse Public License v1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Mon Feb 04 13:56:12 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 14:49:51 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2eed594b04069551eda98f00f1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2eed594b04069551eda98f00f1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Bug requête tableau synthèse DCP - Closes #1244
by Tony CHEMIT 11 Apr '19

11 Apr '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 73e6cd20 by tchemit at 2019-04-10T15:19:13Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - da17f0c0 by tchemit at 2019-04-10T15:19:48Z update pom - - - - - 16 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client-core/src/license/THIRD-PARTY.properties - client-runner/src/license/THIRD-PARTY.properties - dto/src/license/THIRD-PARTY.properties - + observe-i18n/src/license/THIRD-PARTY.properties - persistence/src/license/THIRD-PARTY.properties - pom.xml - server-configuration/src/license/THIRD-PARTY.properties - server-core/src/license/THIRD-PARTY.properties - server-runner/src/license/THIRD-PARTY.properties - services-client/src/license/THIRD-PARTY.properties - services-local/src/license/THIRD-PARTY.properties - services/src/license/THIRD-PARTY.properties - services/src/main/resources/observe-reports.properties - + test/src/license/THIRD-PARTY.properties - validation/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:55 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:56 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== client-core/src/license/THIRD-PARTY.properties ===================================== @@ -17,10 +17,8 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -48,6 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:14 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:14 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== client-runner/src/license/THIRD-PARTY.properties ===================================== @@ -16,11 +16,8 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -47,6 +44,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:42 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:43 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== dto/src/license/THIRD-PARTY.properties ===================================== @@ -1,12 +1,13 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,9 +16,11 @@ # - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:22:53 CEST 2015 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:12:33 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== observe-i18n/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 15:52:17 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== persistence/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GNU Library or Lesser General Public License # - GPL2 w/ CPE @@ -37,5 +35,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:31:54 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:35 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.12</version> + <version>2019.8.13</version> </parent> <groupId>fr.ird.observe</groupId> @@ -159,7 +159,6 @@  <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  - <xworkVersion>2.3.35</xworkVersion>  <lib.version.h2>1.4.196</lib.version.h2> @@ -235,7 +234,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> + <version>${lib.xwork.version}</version> <exclusions> <exclusion> <groupId>javassist</groupId> ===================================== server-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 16:06:54 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:51 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== server-core/src/license/THIRD-PARTY.properties ===================================== @@ -19,9 +19,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -44,6 +42,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:51 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:54 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== server-runner/src/license/THIRD-PARTY.properties ===================================== @@ -17,9 +17,7 @@ # - Eclipse Distribution License - v 1.0 # - Eclipse Distribution License v. 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -42,6 +40,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:38 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:40 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:44 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:48 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-local/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -36,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:32:12 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:47 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:32:08 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:44 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/main/resources/observe-reports.properties ===================================== @@ -167,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\ Where \ m.id In :tripId \ and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' + and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675369#0.12552908048322586') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau report.dcpUsage.request.4=3,0|row|\ ===================================== test/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 15:47:11 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== validation/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 15:55:38 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:22 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f10649bb1d1d621003c877c1cb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f10649bb1d1d621003c877c1cb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update changelog [skip ci]
by Tony CHEMIT 11 Mar '19

11 Mar '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c59f8100 by tchemit at 2019-03-10T13:28:35Z update changelog [skip ci] - - - - - 2eed594b by tchemit at 2019-03-11T10:59:18Z update pom - - - - - 4 changed files: - .mvn/gitlab-cache/milestones/796341-issues.json - .mvn/gitlab-cache/milestones/796341.json - CHANGELOG.md - pom.xml Changes: ===================================== .mvn/gitlab-cache/milestones/796341-issues.json ===================================== @@ -1,4 +1,211 @@ [ + { + "id": 18835616, + "iid": 1243, + "projectId": 2722779, + "title": "Sauvegarde hors de .observe/backup plus possible", + "description": "Je ne peux plus sauvegarder une base hors de .observe/backup, le bouton suivant est grisé.![Screenshot_from_2019-03-06_11-37-29](/uploads/66f16f83a6130a756a3dbd1da2ff33e5/Screenshot_from_2019-03-06_11-37-29.png)![Screenshot_from_2019-03-06_11-37-19](/uploads/396cad9306022966a439894793e97789/Screenshot_from_2019-03-06_11-37-19.png)", + "labels": [ + "Anomalie", + "À corriger" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "description": "", + "dueDate": "Mar 10, 2019 1:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111294, + "_username": "psabarros", + "_name": "Philippe Sabarros", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Mar 10, 2019 2:24:34 PM", + "createdAt": "Mar 6, 2019 12:12:48 PM", + "closedAt": "Mar 10, 2019 2:24:34 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1243" + }, + { + "id": 18835542, + "iid": 1242, + "projectId": 2722779, + "title": "Incohérence \"type de mensuration\" dans formulaire \"echantillons\"", + "description": "Dans le formulaire \"échantillons espèces accessoires\", le type de mesure qui a été sélectionné n\u0027est pas forcément le même que l\u0027on retrouve dans le tableau récapitulatif. Dans l\u0027exemple ci-joint, pour un BUM, c\u0027est la mesure LJFL qui a été sélectionnée mais dans le tableau on retrouve PD1.![Screenshot_from_2019-03-06_11-34-43](/uploads/52e21f2c18ab83818850a7f9de6b6333/Screenshot_from_2019-03-06_11-34-43.png)", + "labels": [ + "Anomalie", + "À corriger" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "description": "", + "dueDate": "Mar 10, 2019 1:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111294, + "_username": "psabarros", + "_name": "Philippe Sabarros", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Mar 10, 2019 2:07:21 PM", + "createdAt": "Mar 6, 2019 12:09:37 PM", + "closedAt": "Mar 10, 2019 2:07:21 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1242" + }, + { + "id": 18835427, + "iid": 1241, + "projectId": 2722779, + "title": "Libellés manquants sur formulaire édition espèces", + "description": "Sur le formulaire d\u0027édition des espèces dans la section \"référentiel commun\", on ne voit plus apparaitre les libellés English, French and Spanish name. Voir print screen.![Screenshot_from_2019-03-06_11-25-27](/uploads/97e8285e006cff55395f61becc6f6549/Screenshot_from_2019-03-06_11-25-27.png)", + "labels": [ + "Anomalie", + "À corriger" + ], + "milestone": { + "id": 796341, + "iid": 137, + "projectId": 2722779, + "groupId": 0, + "title": "7.0.6", + "description": "", + "dueDate": "Mar 10, 2019 1:00:00 AM", + "startDate": "Feb 20, 2019 1:00:00 AM", + "state": "closed" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111294, + "_username": "psabarros", + "_name": "Philippe Sabarros", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/0d688d854bbc8b3a3a7f97f6730ac563?s\u003d…" + }, + "userNotesCount": 0, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "closed", + "updatedAt": "Mar 10, 2019 2:07:39 PM", + "createdAt": "Mar 6, 2019 12:04:37 PM", + "closedAt": "Mar 10, 2019 2:07:39 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1241" + }, { "id": 18644017, "iid": 1240, @@ -14,7 +221,8 @@ "projectId": 2722779, "groupId": 0, "title": "7.0.6", - "dueDate": "Mar 3, 2019 1:00:00 AM", + "description": "", + "dueDate": "Mar 10, 2019 1:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, @@ -73,7 +281,8 @@ "projectId": 2722779, "groupId": 0, "title": "7.0.6", - "dueDate": "Mar 3, 2019 1:00:00 AM", + "description": "", + "dueDate": "Mar 10, 2019 1:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", "state": "closed" }, ===================================== .mvn/gitlab-cache/milestones/796341.json ===================================== @@ -4,7 +4,8 @@ "projectId": 2722779, "groupId": 0, "title": "7.0.6", - "dueDate": "Mar 3, 2019 1:00:00 AM", + "description": "", + "dueDate": "Mar 10, 2019 1:00:00 AM", "startDate": "Feb 20, 2019 1:00:00 AM", - "state": "open" + "state": "closed" } \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-03-03 14:01. + * Last generated at 2019-03-10 14:28. ## Version [8.0-alpha-4](https://gitlab.com/ultreiaio/ird-observe/milestones/115) Seconde partie du troisième lot du contrat IRD-2018-01-V8.
contient fonctionnalités avancées. @@ -115,7 +115,7 @@ Premier lot du contrat IRD-2018-01-V8 ## Version [7.0.6](https://gitlab.com/ultreiaio/ird-observe/milestones/137) -**Closed at 2019-03-03.** +**Closed at 2019-03-10.** ### Download * [Application (observe-7.0.6-SNAPSHOT.zip)](https://ultreia.io/release/observe-7.0.6-SNAPSHOT.zip) @@ -124,6 +124,9 @@ Premier lot du contrat IRD-2018-01-V8 ### Issues * [[Anomalie 1202]](https://gitlab.com/ultreiaio/ird-observe/issues/1202) **[UI] Listes déroulantes : ergonomie** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) * [[Anomalie 1240]](https://gitlab.com/ultreiaio/ird-observe/issues/1240) **On trip forms we should not be able to display map's tab in create mode** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Anomalie 1241]](https://gitlab.com/ultreiaio/ird-observe/issues/1241) **Libellés manquants sur formulaire édition espèces** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 1242]](https://gitlab.com/ultreiaio/ird-observe/issues/1242) **Incohérence "type de mensuration" dans formulaire "echantillons"** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) + * [[Anomalie 1243]](https://gitlab.com/ultreiaio/ird-observe/issues/1243) **Sauvegarde hors de .observe/backup plus possible** (Thanks to Tony CHEMIT) (Reported by Philippe Sabarros) ## Version [7.0.5](https://gitlab.com/ultreiaio/ird-observe/milestones/136) ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.11</version> + <version>2019.8.12</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f3469c72c50ab00fedc82fd8ca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f3469c72c50ab00fedc82fd8ca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] update pom
by Tony CHEMIT 11 Mar '19

11 Mar '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f10649bb by tchemit at 2019-03-11T10:58:56Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.11</version> + <version>2019.8.12</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f10649bb1d1d621003c877c1cba… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f10649bb1d1d621003c877c1cba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Sauvegarde hors de .observe/backup plus possible - Closes #1243
by Tony CHEMIT 10 Mar '19

10 Mar '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f3469c72 by tchemit at 2019-03-10T13:23:06Z Sauvegarde hors de .observe/backup plus possible - Closes #1243 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java ===================================== @@ -103,7 +103,7 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement } public void changeDirectory(File f) { - getUi().getStepModel().setBackupFile(new File(f, getUi().filenameText.getText())); + getUi().getStepModel().setBackupFile(new File(f, getUi().getStepModel().getBackupFileName() + StorageUIModel.SQL_GZ_EXTENSION)); } public void changeFilename(String filename) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java ===================================== @@ -88,7 +88,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeDirectory(File f) { - ui.getModel().setBackupFile(new File(f, ui.getFilenameText().getText())); + ui.getModel().setBackupFile(new File(f, ui.getModel().getBackupFileName() + StorageUIModel.SQL_GZ_EXTENSION)); } public void changeFilename(String filename) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f3469c72c50ab00fedc82fd8ca1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f3469c72c50ab00fedc82fd8ca1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: reduce jvm memory
by Tony CHEMIT 10 Mar '19

10 Mar '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f9776993 by tchemit at 2019-03-10T13:22:28Z reduce jvm memory - - - - - 2171a462 by tchemit at 2019-03-10T13:22:43Z Sauvegarde hors de .observe/backup plus possible - Closes #1243 - - - - - 3 changed files: - .mvn/jvm.config - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java Changes: ===================================== .mvn/jvm.config ===================================== @@ -1 +1 @@ --Xmx4096m \ No newline at end of file +-Xmx2096m \ No newline at end of file ===================================== client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUIHandler.java ===================================== @@ -103,7 +103,7 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement } public void changeDirectory(File f) { - getUi().getStepModel().setBackupFile(new File(f, getUi().filenameText.getText())); + getUi().getStepModel().setBackupFile(new File(f, getUi().getStepModel().getBackupFileName() + StorageUIModel.SQL_GZ_EXTENSION)); } public void changeFilename(String filename) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java ===================================== @@ -88,7 +88,7 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeDirectory(File f) { - ui.getModel().setBackupFile(new File(f, ui.getFilenameText().getText())); + ui.getModel().setBackupFile(new File(f, ui.getModel().getBackupFileName() + StorageUIModel.SQL_GZ_EXTENSION)); } public void changeFilename(String filename) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f57a30889bf7d50f014ec01566… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f57a30889bf7d50f014ec01566… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Incohérence type de mensuration dans formulaire echantillons - Closes #1242
by Tony CHEMIT 10 Mar '19

10 Mar '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b63265a7 by tchemit at 2019-03-10T13:07:14Z Incohérence type de mensuration dans formulaire echantillons - Closes #1242 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUIHandler.java ===================================== @@ -293,11 +293,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onSpeciesChanged(SpeciesReference species) { - // on utilise le code par defaut de l'espèce + Optional<SizeMeasureTypeReference> oldSizeMeasureType = Optional.ofNullable(getModel().getTableEditBean()).map(NonTargetLengthDto::getSizeMeasureType); Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); log.debug(prefix + "Default size measure " + sizeMeasureType.orElse(null)); ui.getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); resetDefaultSizeMeasureType(); + oldSizeMeasureType.ifPresent(sizeMeasureTypeReference -> getModel().getTableEditBean().setSizeMeasureType(sizeMeasureTypeReference)); } public void resetDefaultSizeMeasureType() { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b63265a740475d84c7a49d2f0e3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b63265a740475d84c7a49d2f0e3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Incohérence type de mensuration dans formulaire echantillons - Closes #1242
by Tony CHEMIT 10 Mar '19

10 Mar '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f57a3088 by tchemit at 2019-03-10T13:03:11Z Incohérence type de mensuration dans formulaire echantillons - Closes #1242 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== @@ -99,11 +99,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onSpeciesChanged(SpeciesReference species) { - // on utilise le code par defaut de l'espèce + Optional<SizeMeasureTypeReference> oldSizeMeasureType = Optional.ofNullable(getTableEditBean()).map(NonTargetLengthDto::getSizeMeasureType); Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species); log.debug("Default size measure " + sizeMeasureType.orElse(null)); getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null)); resetDefaultSizeMeasureType(); + oldSizeMeasureType.ifPresent(sizeMeasureTypeReference -> getTableEditBean().setSizeMeasureType(sizeMeasureTypeReference)); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f57a30889bf7d50f014ec01566a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f57a30889bf7d50f014ec01566a… You're receiving this email because of your account on gitlab.com.

1 0