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

[Git][ultreiaio/ird-observe][develop] Fix migration script
by Tony CHEMIT 24 Apr '18

24 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1e0eaa67 by Tony CHEMIT at 2018-04-24T08:57:05Z Fix migration script - - - - - 2 changed files: - persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-H2.sql - persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-PG.sql Changes: ===================================== persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-H2.sql +++ b/persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-H2.sql @@ -31,7 +31,7 @@ INSERT INTO observe_seine.NonTargetCatchReleaseStatus(topiaid, topiaversion, top UPDATE observe_seine.NonTargetCatchReleaseStatus SET label3 = label2 || ' TODO'; ALTER TABLE observe_seine.NonTargetCatchRelease add column status2 VARCHAR(255); -ALTER TABLE observe_seine.NonTargetCatchRelease ADD CONSTRAINT fk_NonTargetCatchRelease_status FOREIGN KEY (status) REFERENCES observe_seine.NonTargetCatchReleaseStatus(topiaid); +ALTER TABLE observe_seine.NonTargetCatchRelease ADD CONSTRAINT fk_NonTargetCatchRelease_status FOREIGN KEY (status2) REFERENCES observe_seine.NonTargetCatchReleaseStatus(topiaid); UPDATE observe_seine.NonTargetCatchRelease SET status2 = 'fr.ird.observe.entities.referentiel.seine.NonTargetCatchReleaseStatus#0#1' WHERE status = 0; UPDATE observe_seine.NonTargetCatchRelease SET status2 = 'fr.ird.observe.entities.referentiel.seine.NonTargetCatchReleaseStatus#0#2' WHERE status = 1; UPDATE observe_seine.NonTargetCatchRelease SET status2 = 'fr.ird.observe.entities.referentiel.seine.NonTargetCatchReleaseStatus#0#3' WHERE status = 2; ===================================== persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-PG.sql +++ b/persistence/src/main/resources/db/migration/7.1/01_add_non_target_catch_release_status-PG.sql @@ -31,7 +31,7 @@ INSERT INTO observe_seine.NonTargetCatchReleaseStatus(topiaid, topiaversion, top UPDATE observe_seine.NonTargetCatchReleaseStatus SET label3 = label2 || ' TODO'; ALTER TABLE observe_seine.NonTargetCatchRelease ADD COLUMN status2 VARCHAR(255); -ALTER TABLE observe_seine.NonTargetCatchRelease ADD CONSTRAINT fk_NonTargetCatchRelease_status FOREIGN KEY (status) REFERENCES observe_seine.NonTargetCatchReleaseStatus(topiaid); +ALTER TABLE observe_seine.NonTargetCatchRelease ADD CONSTRAINT fk_NonTargetCatchRelease_status FOREIGN KEY (status2) REFERENCES observe_seine.NonTargetCatchReleaseStatus(topiaid); UPDATE observe_seine.NonTargetCatchRelease SET status2 = 'fr.ird.observe.entities.referentiel.seine.NonTargetCatchReleaseStatus#0#1' WHERE status = 0; UPDATE observe_seine.NonTargetCatchRelease SET status2 = 'fr.ird.observe.entities.referentiel.seine.NonTargetCatchReleaseStatus#0#2' WHERE status = 1; UPDATE observe_seine.NonTargetCatchRelease SET status2 = 'fr.ird.observe.entities.referentiel.seine.NonTargetCatchReleaseStatus#0#3' WHERE status = 2; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1e0eaa675fd47f351a0d0534da3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/1e0eaa675fd47f351a0d0534da3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Corriger certaines entrées de ObjectMaterial - See #928
by Tony CHEMIT 23 Apr '18

23 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 82a198c5 by Tony CHEMIT at 2018-04-23T10:07:46Z Corriger certaines entrées de ObjectMaterial - See #928 - - - - - 9 changed files: - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java - + persistence/src/main/resources/db/migration/7.2/01_update_dcp-common.sql - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java - + test/src/main/resources/db/7.2/dataForTestLongline.sql.gz - + test/src/main/resources/db/7.2/dataForTestSeine.sql.gz - + test/src/main/resources/db/7.2/empty_h2.sql.gz - + test/src/main/resources/db/7.2/empty_pg.sql.gz - + test/src/main/resources/db/7.2/referentiel.sql.gz Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java ===================================== --- /dev/null +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java @@ -0,0 +1,66 @@ +package fr.ird.observe.persistence.migration; + +/*- + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2018 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 org.nuiton.topia.persistence.support.TopiaSqlSupport; + +import java.util.List; + +/** + * Created on 27/10/16. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 6.0 + */ +@MigrationVersion(version = "7.2") +public class DataSourceMigrationForVersion_7_2 extends AbstractObserveMigrationCallBack { + + DataSourceMigrationForVersion_7_2(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(DataSourceMigrationForVersion_7_2.class, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + addScript("01", "update_dcp", queries); + + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_2 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_7_2 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + } + +} + ===================================== persistence/src/main/resources/db/migration/7.2/01_update_dcp-common.sql ===================================== --- /dev/null +++ b/persistence/src/main/resources/db/migration/7.2/01_update_dcp-common.sql @@ -0,0 +1 @@ +update observe_seine.objectmaterial set parent ='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2', topiaversion = topiaversion + 1 where topiaid='fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.4' \ No newline at end of file ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ <devMode>true</devMode>  - <observe.model.version>7.1</observe.model.version> + <observe.model.version>7.2</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/data/seine/FloatingObjectServiceLocal.java @@ -71,6 +71,7 @@ public class FloatingObjectServiceLocal extends ObserveServiceLocal implements F public List<ObjectMaterialHierarchyDto> getObjectMaterialHierarchy() { ObjectMaterialTopiaDao dao = getTopiaPersistenceContext().getObjectMaterialDao(); List<ObjectMaterial> objectMaterials = dao.findAll(); + objectMaterials.sort(Comparator.comparing(ObjectMaterial::getCode)); return getObjectMaterialHierarchyDtos(objectMaterials); } ===================================== test/src/main/resources/db/7.2/dataForTestLongline.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.2/dataForTestSeine.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_h2.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.2/empty_pg.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.2/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/7.2/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/82a198c5acaff2c1b68c321529b… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/82a198c5acaff2c1b68c321529b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog after release 7.0-RC-11 [skip ci]
by Tony CHEMIT 21 Apr '18

21 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0977abfd by Tony CHEMIT at 2018-04-21T10:52:30Z update changelog after release 7.0-RC-11 [skip ci] - - - - - 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 2018-04-09 21:13. + * Last generated at 2018-04-21 12:28. + +## Version [7.0-RC-11](https://gitlab.com/ultreiaio/ird-observe/milestones/108) + +**Closed at 2018-04-20.** + + +### Issues + * [[Evolution 926]](https://gitlab.com/ultreiaio/ird-observe/issues/926) **Améliorations sur le formulaire relâche d'espèce sensible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + + +### Download +* [Application (observe-7.0-RC-11.zip)](https://ultreia.io/release/observe-7.0-RC-11.zip) +* [Serveur (observe-7.0-RC-11.war)](https://ultreia.io/release/observe-7.0-RC-11.war) ## Version [7.0-RC-10](https://gitlab.com/ultreiaio/ird-observe/milestones/107) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0977abfd4fd7ee5633a6f8e3ca9… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0977abfd4fd7ee5633a6f8e3ca9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 20 Apr '18

20 Apr '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: f5348f34 by 166231 at 2018-04-20T19:54:08Z Site checkin for project ObServe :: Pom - - - - - 9 changed files: - administration-web.html - aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5348f34c8e19d01999893255cd… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f5348f34c8e19d01999893255cd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-11
by Tony CHEMIT 20 Apr '18

20 Apr '18

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-11
by Tony CHEMIT 20 Apr '18

20 Apr '18

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

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-11] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-11' with…
by Tony CHEMIT 20 Apr '18

20 Apr '18

Tony CHEMIT pushed to branch release/7.0-RC-11 at ultreiaio / ird-observe Commits: 6076350b by Tony CHEMIT at 2018-04-20T14:53:41Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-11' with non-snapshot versions[skip ci] - - - - - 0f99775d by Tony CHEMIT at 2018-04-20T14:57:18Z fix dependencies - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>dto</artifactId> @@ -70,6 +70,10 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> </dependency> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-11-SNAPSHOT</version> + <version>7.0-RC-11</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/225af08d784360f6fd5089dfc3… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/225af08d784360f6fd5089dfc3… You're receiving this email because of your account on gitlab.com.

1 0

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

20 Apr '18

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 1fe2aab4 by Tony CHEMIT at 2018-04-09T18:53:34Z [jgitflow-maven-plugin]updating poms for 7.0-RC-11-SNAPSHOT development[skip ci] - - - - - 1cf122b5 by Tony CHEMIT at 2018-04-09T19:03:11Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 4f921d71 by Tony CHEMIT at 2018-04-09T19:03:11Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 8412a82c by Tony CHEMIT at 2018-04-09T19:03:12Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 7888cd6b by Tony CHEMIT at 2018-04-09T19:38:07Z Update changelog after release 7.0-RC-10 [skip ci] - - - - - b4bd22ae by Tony CHEMIT at 2018-04-20T14:51:13Z Améliorations sur le formulaire relâche d'espèce sensible (closes #926) - - - - - baa329c3 by Tony CHEMIT at 2018-04-20T14:51:15Z fix docker generation - - - - - 225af08d by Tony CHEMIT at 2018-04-20T14:51:15Z update dependencies - - - - - 6076350b by Tony CHEMIT at 2018-04-20T14:53:41Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-11' with non-snapshot versions[skip ci] - - - - - 0f99775d by Tony CHEMIT at 2018-04-20T14:57:18Z fix dependencies - - - - - 1e830c34 by Tony CHEMIT at 2018-04-20T15:07:29Z [jgitflow-maven-plugin]merging 'release/7.0-RC-11' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/resources/log4j.properties - client-configuration/src/main/resources/observe-log4j.properties - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/ObserveCommon.jcss - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client/src/main/java/fr/ird/observe/client/ui/actions/main/menu/config/ShowConfigAction.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUI.jcss - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseUIModel.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseStatusUI.jaxx - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetCatchReleaseStatusesUI.java → client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseStatusUIHandler.java - + client/src/main/java/fr/ird/observe/client/ui/content/ref/seine/NonTargetCatchReleaseStatusUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - client/src/test/java/fr/ird/observe/client/ui/content/simple/longline/LonglineDetailCompositionValidatorServiceTest.java - dto/pom.xml - + dto/src/main/java/fr/ird/observe/binder/referential/seine/NonTargetCatchReleaseStatusDtoReferenceBinder.java - + dto/src/main/java/fr/ird/observe/dto/data/seine/NonTargetCatchReleaseDto.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe.model - dto/src/main/resources/i18n/dto_en_GB.properties - dto/src/main/resources/i18n/dto_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/15dea28a57b2b1d965126380fd… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/15dea28a57b2b1d965126380fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-11' with…
by Tony CHEMIT 20 Apr '18

20 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6076350b by Tony CHEMIT at 2018-04-20T14:53:41Z [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-11' with non-snapshot versions[skip ci] - - - - - 0f99775d by Tony CHEMIT at 2018-04-20T14:57:18Z fix dependencies - - - - - 1e830c34 by Tony CHEMIT at 2018-04-20T15:07:29Z [jgitflow-maven-plugin]merging 'release/7.0-RC-11' into 'master' - - - - - 6a951170 by Tony CHEMIT at 2018-04-20T15:07:35Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - de7865f6 by Tony CHEMIT at 2018-04-20T15:07:35Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1588af05 by Tony CHEMIT at 2018-04-20T15:07:36Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - dto/pom.xml Changes: ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -70,6 +70,10 @@ </dependency> <dependency> <groupId>io.ultreia.java4all.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> </dependency> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b2ff2d12e65285e81abdcdedff… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b2ff2d12e65285e81abdcdedff… You're receiving this email because of your account on gitlab.com.

1 0

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

20 Apr '18

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

1 0