branch develop updated (c179306 -> c6478a7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from c179306 [jgitflow-maven-plugin]updating poms for 5.0-SNAPSHOT development new b01c278 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds e89275d on doit deployer sur le nexus le plugin maven adds fcc1e04 Fix site generation adds d59f972 [jgitflow-maven-plugin]updating poms for 5.0-RC-2 branch with snapshot versions new 3331766 Add missing license headers new 53e4905 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-2' with non-snapshot versions new 6bb6c0b Merge branch 'release/5.0-RC-2' new e26b4e3 [jgitflow-maven-plugin]merging 'master' into 'develop' new c6478a7 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c6478a79e5e18cfadacb64eae5634c2d3cc4e6d0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:27:13 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e26b4e3ce91d585ee20fa597aa498efc5f6f40e2 Merge: b01c278 6bb6c0b Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:27:12 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b01c2783d925aa6c444c913f1e64dc99566b70c0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:27:11 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6bb6c0bbd0788431ddde3fa449d7f5bcbce28c42 Merge: fcc1e04 53e4905 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:26:34 2016 +0200 Merge branch 'release/5.0-RC-2' Conflicts: maven-plugin/pom.xml commit 53e4905f6d544868fbfeac458707599d3280e804 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:12:59 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-2' with non-snapshot versions commit 33317661724403377ba7284aa200e600ae68ca74 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:10:45 2016 +0200 Add missing license headers Summary of changes: .../decoration/ObserveI18nDecoratorHelper.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_905.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_906.java | 22 ++++++++++++++++++++++ pom.xml | 2 ++ .../dto/seine/DiscardedTargetCatchDto.java | 22 ++++++++++++++++++++++ .../dto/seine/DiscardedTargetSampleDto.java | 22 ++++++++++++++++++++++ .../services/dto/seine/KeptTargetCatchDto.java | 22 ++++++++++++++++++++++ .../services/dto/seine/KeptTargetSampleDto.java | 22 ++++++++++++++++++++++ 8 files changed, 156 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 33317661724403377ba7284aa200e600ae68ca74 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:10:45 2016 +0200 Add missing license headers --- .../decoration/ObserveI18nDecoratorHelper.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_905.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_906.java | 22 ++++++++++++++++++++++ .../dto/seine/DiscardedTargetCatchDto.java | 22 ++++++++++++++++++++++ .../dto/seine/DiscardedTargetSampleDto.java | 22 ++++++++++++++++++++++ .../services/dto/seine/KeptTargetCatchDto.java | 22 ++++++++++++++++++++++ .../services/dto/seine/KeptTargetSampleDto.java | 22 ++++++++++++++++++++++ 7 files changed, 154 insertions(+) diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java index 1059155..16e643c 100644 --- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java +++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java @@ -1,5 +1,27 @@ package fr.ird.observe.application.swing.decoration; +/*- + * #%L + * ObServe :: Application Swing Decoration + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * 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 com.google.common.cache.AbstractLoadingCache; import fr.ird.observe.services.dto.ObserveDto; import fr.ird.observe.util.ObserveUtil; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java index cb048b7..a8bf82a 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.migration.versions; +/*- + * #%L + * ObServe :: Entities Migration + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java index 007a138..4e01ab8 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.migration.versions; +/*- + * #%L + * ObServe :: Entities Migration + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java index 02541a2..d272237 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetCatchDto.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto.seine; +/*- + * #%L + * ObServe :: Services model + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + /** * Created on 04/09/16. * diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java index dbe97c0..497c52f 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/seine/DiscardedTargetSampleDto.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto.seine; +/*- + * #%L + * ObServe :: Services model + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + /** * Created on 04/09/16. * diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java index 45c6ffb..34ec904 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetCatchDto.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto.seine; +/*- + * #%L + * ObServe :: Services model + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + /** * Created on 04/09/16. * diff --git a/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java b/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java index 5749a6d..c532d6c 100644 --- a/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java +++ b/services-model/src/main/java/fr/ird/observe/services/dto/seine/KeptTargetSampleDto.java @@ -1,5 +1,27 @@ package fr.ird.observe.services.dto.seine; +/*- + * #%L + * ObServe :: Services model + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * 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% + */ + /** * Created on 04/09/16. * -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 53e4905f6d544868fbfeac458707599d3280e804 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:12:59 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/5.0-RC-2' with non-snapshot versions --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-api/pom.xml | 2 +- services-configuration-api/pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-model/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 0b34f48..350c250 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index cc41e30..ed8cbef 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index de0ef51..12b81d0 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index d738b43..e132b87 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index f7112a4..e2270a7 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 34499bd..4f4c5ba 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 64d09bb..25b94d0 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index d5fbc03..2dcc718 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index e01979e..bac0cb8 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index afea373..ec21544 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-api/pom.xml b/services-api/pom.xml index cc909a6..2c11414 100644 --- a/services-api/pom.xml +++ b/services-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-api</artifactId> diff --git a/services-configuration-api/pom.xml b/services-configuration-api/pom.xml index b6c4d63..cff77cd 100644 --- a/services-configuration-api/pom.xml +++ b/services-configuration-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-configuration-api</artifactId> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index f74d0e5..9734bc31 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 1b5cb51..f7b379c 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-model/pom.xml b/services-model/pom.xml index 921f16a..fd4eb1c 100644 --- a/services-model/pom.xml +++ b/services-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-model</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 1921cd1..5a2a3af 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 1cf76bb..42cda0a 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 7f12e55..f348473 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 765badc..4b5c0c1 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 9016540..fbc4bd5 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-topia</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 8644dcd..1145a02 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 5dbe9dc..e3f0202 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index d253c40..9222a0e 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 48a7f62..7b8d8c7 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6bb6c0bbd0788431ddde3fa449d7f5bcbce28c42 Merge: fcc1e04 53e4905 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:26:34 2016 +0200 Merge branch 'release/5.0-RC-2' Conflicts: maven-plugin/pom.xml .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 57 +- .../src/license/THIRD-PARTY.properties | 13 +- .../ObserveSwingApplicationActionDefinition.java | 139 ++++ .../ObserveSwingApplicationConfig.java | 309 +++------ .../ObserveSwingApplicationConfigOption.java | 8 +- .../ObserveSwingApplicationConfigProvider.java | 5 +- .../configuration}/constants/CreationMode.java | 73 +- .../swing/configuration/constants/DbMode.java | 34 +- .../org.nuiton.config.ApplicationConfigProvider | 0 ...pplication-swing-configuration_en_GB.properties | 84 +++ ...pplication-swing-configuration_es_ES.properties | 84 +++ ...pplication-swing-configuration_fr_FR.properties | 84 +++ .../src/main/resources/log4j.properties | 5 +- .../src/main/resources/observe-log4j.properties | 4 - .../src/main/resources/observeSwing.conf | 0 .../src/main/resources/validators.xml | 3 +- application-swing-decoration/pom.xml | 41 +- .../swing/decoration/DecoratorService.java | 436 ++++++------ .../decoration/ObserveI18nDecoratorHelper.java | 110 +++ .../application-swing-decoration_en_GB.properties | 331 ++++++--- .../application-swing-decoration_es_ES.properties | 329 ++++++--- .../application-swing-decoration_fr_FR.properties | 329 ++++++--- application-swing-validation/pom.xml | 8 +- ...ivityLonglineDto-ui-create-error-validation.xml | 10 +- ...ivityLonglineDto-ui-update-error-validation.xml | 10 +- .../SetLonglineDto-ui-create-error-validation.xml | 148 ++-- ...lineGearUseDto-ui-update-warning-validation.xml | 2 +- ...ActivitySeineDto-ui-create-error-validation.xml | 10 +- ...ActivitySeineDto-ui-update-error-validation.xml | 10 +- ...-ui-update-targetDiscarded-error-validation.xml | 9 + ...i-update-targetDiscarded-warning-validation.xml | 5 - ...eineGearUseDto-ui-update-warning-validation.xml | 2 +- .../application-swing-validation_en_GB.properties | 11 +- .../application-swing-validation_es_ES.properties | 11 +- .../application-swing-validation_fr_FR.properties | 11 +- .../src/test/resources/validators.xml | 1 + application-swing-validators/pom.xml | 2 +- .../validators/QuadrantFieldDtoValidator.java | 76 ++ application-swing/README.md | 9 +- application-swing/pom.xml | 334 ++++++++- .../src/license/THIRD-PARTY.properties | 42 +- application-swing/src/main/assembly/bin.xml | 14 - .../application/swing/ObserveActionExecutor.java | 59 +- .../observe/application/swing/ObserveCLAction.java | 123 +--- .../observe/application/swing/ObserveRunner.java | 62 +- .../swing/ObserveSwingApplicationContext.java | 305 +------- .../ObserveSwingApplicationDataSourcesManager.java | 332 ++++++++- .../swing/ObserveSwingBinderService.java | 50 -- .../{ObserveAdminCLI.java => RunObserve.java} | 11 +- .../swing/db/ObserveSwingDataSource.java | 2 +- .../swing/db/constants/ConnexionStatus.java | 33 +- .../application/swing/db/constants/DbMode.java | 70 -- .../application/swing/ui/ObserveMainUIHandler.java | 3 +- .../ird/observe/application/swing/ui/UIHelper.java | 31 +- .../swing/ui/actions/ChangeStorageAction.java | 2 +- .../ui/actions/ImportStorageFromFileAction.java | 4 +- .../swing/ui/actions/LaunchAdminAction.java | 3 +- .../swing/ui/actions/ReloadStorageAction.java | 2 +- .../shared/MoveActivityLonglinesUIAction.java | 13 +- .../actions/shared/MoveActivitySeinesUIAction.java | 13 +- .../ui/actions/shared/MoveRoutesUIAction.java | 13 +- .../application/swing/ui/admin/AdminStep.java | 47 +- .../swing/ui/admin/AdminTabUIHandler.java | 5 +- .../application/swing/ui/admin/AdminUIHandler.java | 5 +- .../swing/ui/admin/AdminUILauncher.java | 2 +- .../application/swing/ui/admin/AdminUIModel.java | 8 +- .../swing/ui/admin/config/ConfigUI.jaxx | 6 +- .../swing/ui/admin/resume/ShowResumeUIHandler.java | 5 +- .../swing/ui/admin/save/SaveLocalUIHandler.java | 18 +- .../referential/ReferentialSynchronizeMode.java | 7 - ...soleteReferentialReferenceListCellRenderer.java | 3 +- .../referential/legacy/SynchronizeUIHandler.java | 4 +- .../ng/action/RegisterTasksActionSupport.java | 9 +- .../ng/task/ReferentialSynchronizeTaskSupport.java | 4 +- .../ReferentialSynchronizeTreeCellRenderer.java | 6 +- .../swing/ui/admin/validate/ValidateConfigUI.jaxx | 1 + .../swing/ui/admin/validate/ValidateConfigUI.jcss | 4 +- .../validate/ValidateEntityListCellRenderer.java | 3 +- .../swing/ui/admin/validate/ValidateUI.jaxx | 2 +- .../swing/ui/admin/validate/ValidateUIHandler.java | 35 +- .../application/swing/ui/content/ContentUI.jaxx | 3 + .../application/swing/ui/content/ContentUI.jcss | 9 + .../swing/ui/content/ContentUIHandler.java | 181 ++++- .../swing/ui/content/ContentUIInitializer.java | 13 +- .../swing/ui/content/ContentUIManager.java | 271 ++++---- .../LonglineDetailCompositionUIHandler.java | 2 +- ...LonglineDetailCompositionValidationContext.java | 3 +- .../LonglineGlobalCompositionUIHandler.java | 2 +- .../ui/content/impl/longline/SetLonglineUI.jaxx | 4 + .../ui/content/impl/longline/SetLonglineUI.jcss | 8 + .../impl/longline/SetLonglineUIHandler.java | 2 +- .../ActivitySeineObservedSystemUIHandler.java | 20 +- ...ngObjectTransmittingBuoyOperationUIHandler.java | 14 +- .../impl/seine/FloatingObjectUIHandler.java | 6 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/list/ContentListUIHandler.java | 41 +- .../ui/content/open/ContentOpenableUIHandler.java | 42 +- .../impl/longline/ActivityLonglineUIHandler.java | 54 +- .../open/impl/longline/TripLonglineUIHandler.java | 6 +- .../open/impl/seine/ActivitySeineUIHandler.java | 16 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 105 ++- .../open/impl/seine/TripSeineUIHandler.java | 8 +- .../swing/ui/content/ref/ContentReferenceUI.jaxx | 30 +- .../swing/ui/content/ref/ContentReferenceUI.jcss | 4 - .../ui/content/ref/ContentReferenceUIHandler.java | 129 ++-- .../ui/content/ref/ContentReferenceUIModel.java | 47 +- .../swing/ui/content/ref/UniqueKeyTableModel.java | 3 +- .../swing/ui/content/ref/impl/CountryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/FpaZoneUI.jaxx | 12 +- .../content/ref/impl/GearCaracteristicTypeUI.jaxx | 10 +- .../ui/content/ref/impl/GearCaracteristicUI.jaxx | 10 +- .../swing/ui/content/ref/impl/GearUI.jaxx | 10 +- .../swing/ui/content/ref/impl/HarbourUI.jaxx | 12 +- .../content/ref/impl/LengthWeightParameterUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OceanUI.jaxx | 12 +- .../swing/ui/content/ref/impl/OrganismUI.jaxx | 12 +- .../swing/ui/content/ref/impl/PersonUI.jaxx | 12 +- .../content/ref/impl/ProgramObservationEnum.java | 23 +- .../swing/ui/content/ref/impl/ProgramUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SexUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesListUI.jaxx | 12 +- .../swing/ui/content/ref/impl/SpeciesUI.jaxx | 12 +- .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselTypeUI.jaxx | 12 +- .../swing/ui/content/ref/impl/VesselUI.jaxx | 12 +- .../ref/impl/longline/BaitHaulingStatusUI.jaxx | 12 +- .../ref/impl/longline/BaitSettingStatusUI.jaxx | 12 +- .../ui/content/ref/impl/longline/BaitTypeUI.jaxx | 12 +- .../ref/impl/longline/CatchFateLonglineUI.jaxx | 12 +- .../content/ref/impl/longline/EncounterTypeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HealthnessUI.jaxx | 12 +- .../content/ref/impl/longline/HookPositionUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HookSizeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/HookTypeUI.jaxx | 12 +- .../impl/longline/ItemHorizontalPositionUI.jaxx | 12 +- .../ref/impl/longline/ItemVerticalPositionUI.jaxx | 12 +- .../ref/impl/longline/LightsticksColorUI.jaxx | 12 +- .../ref/impl/longline/LightsticksTypeUI.jaxx | 12 +- .../ui/content/ref/impl/longline/LineTypeUI.jaxx | 12 +- .../ref/impl/longline/MaturityStatusUI.jaxx | 12 +- .../ref/impl/longline/MitigationTypeUI.jaxx | 12 +- .../content/ref/impl/longline/SensorBrandUI.jaxx | 12 +- .../ref/impl/longline/SensorDataFormatUI.jaxx | 12 +- .../ui/content/ref/impl/longline/SensorTypeUI.jaxx | 12 +- .../content/ref/impl/longline/SettingShapeUI.jaxx | 12 +- .../ref/impl/longline/SizeMeasureTypeUI.jaxx | 12 +- .../ref/impl/longline/StomacFullnessUI.jaxx | 12 +- .../ui/content/ref/impl/longline/TripTypeUI.jaxx | 12 +- .../impl/longline/VesselActivityLonglineUI.jaxx | 12 +- .../ref/impl/longline/WeightMeasureTypeUI.jaxx | 12 +- .../ui/content/ref/impl/seine/DetectionModeUI.jaxx | 12 +- .../ui/content/ref/impl/seine/ObjectFateUI.jaxx | 12 +- .../content/ref/impl/seine/ObjectOperationUI.jaxx | 12 +- .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx | 12 +- .../content/ref/impl/seine/ObservedSystemUI.jaxx | 12 +- .../content/ref/impl/seine/ReasonForDiscardUI.jaxx | 12 +- .../ref/impl/seine/ReasonForNoFishingUI.jaxx | 12 +- .../content/ref/impl/seine/ReasonForNullSetUI.jaxx | 12 +- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 12 +- .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx | 12 +- .../ref/impl/seine/SurroundingActivityUI.jaxx | 12 +- .../impl/seine/TransmittingBuoyOperationUI.jaxx | 12 +- .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx | 12 +- .../ref/impl/seine/VesselActivitySeineUI.jaxx | 12 +- .../content/ref/impl/seine/WeightCategoryUI.jaxx | 12 +- .../swing/ui/content/ref/impl/seine/WindUI.jaxx | 12 +- .../ui/content/table/ContentTableUIHandler.java | 15 +- .../ui/content/table/ContentTableUIModel.java | 8 +- .../table/impl/longline/CatchLonglineUIModel.java | 5 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 16 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 14 +- .../table/impl/seine/NonTargetSampleUIHandler.java | 2 +- .../table/impl/seine/TargetSampleUIHandler.java | 2 +- .../swing/ui/storage/ObstunaAdminAction.java | 60 +- .../swing/ui/storage/RemoteUILauncher.java | 2 +- .../swing/ui/storage/StorageBackupUILauncher.java | 98 ++- .../application/swing/ui/storage/StorageStep.java | 56 +- .../swing/ui/storage/StorageUIHandler.java | 62 +- .../swing/ui/storage/StorageUILauncher.java | 2 +- .../swing/ui/storage/StorageUIModel.java | 50 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jaxx | 5 +- .../swing/ui/storage/tabs/ChooseDbModeUI.jcss | 16 +- .../swing/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigReferentielUI.jaxx | 3 +- .../swing/ui/storage/tabs/ConfigReferentielUI.jcss | 6 +- .../swing/ui/storage/tabs/ConfigUI.jaxx | 2 +- .../swing/ui/storage/tabs/ConfigUI.jcss | 2 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 5 +- .../swing/ui/storage/tabs/StorageTabUI.jaxx | 3 +- .../swing/ui/storage/tabs/StorageTabUIHandler.java | 12 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 35 +- .../swing/ui/tree/ObserveTreeBridge.java | 2 +- .../swing/ui/tree/ObserveTreeHelper.java | 132 +--- .../actions/ChangeActivityRouteActionListener.java | 9 +- .../actions/ChangeActivityTripActionListener.java | 9 +- .../actions/ChangeRouteTripActionListener.java | 9 +- .../loadors/AbstractDataReferenceChildLoador.java | 4 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 40 ++ .../loadors/ActivityLonglineNodeChildLoador.java | 61 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 18 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 48 +- .../loadors/ActivitySeinesNodeChildLoador.java | 14 +- .../loadors/FloatingObjectNodeChildLoador.java | 38 +- .../loadors/ProgramLonglineNodeChildLoador.java | 58 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 49 +- .../loadors/ReferenceLonglineNodeChildLoador.java | 100 --- ...ldLoador.java => ReferenceNodeChildLoador.java} | 72 +- .../loadors/ReferenceSeineNodeChildLoador.java | 91 --- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 64 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 32 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 45 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 62 +- .../swing/ui/usage/UsagesUIHandler.java | 4 +- .../ObserveValidationMessageTableRenderer.java | 62 +- .../util/ObserveValidatorMessageTableRenderer.java | 48 +- .../swing/validation/ValidationModelMode.java | 35 +- application-swing/src/main/map/style.xml | 22 +- .../main/resources/ftl/connexionTestResult_en.ftl | 44 ++ ...rt_fr.ftl => dataSourceConnectionReport_en.ftl} | 116 ++-- .../ftl/dataSourceConnectionReport_es.ftl | 2 +- .../ftl/dataSourceConnectionReport_fr.ftl | 8 +- .../resources/ftl/dataSourceInformation_en.ftl | 77 +++ .../src/main/resources/ftl/dataSourcePolicy_en.ftl | 53 ++ .../ftl/dataSourceSelectModeResume_en.ftl | 61 ++ .../ftl/storageModelDataSourceConfiguration_en.ftl | 76 ++ .../i18n/application-swing_en_GB.properties | 758 +++----------------- .../i18n/application-swing_es_ES.properties | 758 +++----------------- .../i18n/application-swing_fr_FR.properties | 766 +++------------------ .../LICENSE.txt | 0 .../README.md | 0 .../pom.xml | 55 +- .../src/license/THIRD-PARTY.properties | 11 +- .../ObserveWebApplicationConfiguration.java | 12 +- ...veWebApplicationConfigurationInitException.java | 0 .../ObserveWebApplicationConfigurationOption.java | 0 ...ObserveWebApplicationConfigurationProvider.java | 0 .../db/InvalidObserveWebDatabaseException.java | 0 .../db/InvalidObserveWebDatabaseRoleException.java | 0 .../db/InvalidObserveWebDatabasesException.java | 0 .../web/configuration/db/ObserveWebDatabase.java | 0 .../configuration/db/ObserveWebDatabaseRole.java | 0 .../web/configuration/db/ObserveWebDatabases.java | 0 .../db/ObserveWebDatabasesHelper.java | 0 .../db/impl/ObserveWebDatabaseBean.java | 0 .../db/impl/ObserveWebDatabaseImmutable.java | 0 .../db/impl/ObserveWebDatabaseRoleBean.java | 0 .../db/impl/ObserveWebDatabaseRoleImmutable.java | 0 .../db/impl/ObserveWebDatabasesBean.java | 0 .../db/impl/ObserveWebDatabasesImmutable.java | 0 .../user/InvalidObserveWebUserException.java | 0 .../InvalidObserveWebUserPermissionException.java | 0 .../user/InvalidObserveWebUsersException.java | 0 .../web/configuration/user/ObserveWebUser.java | 0 .../user/ObserveWebUserPermission.java | 0 .../web/configuration/user/ObserveWebUsers.java | 0 .../configuration/user/ObserveWebUsersHelper.java | 0 .../user/impl/ObserveWebUserBean.java | 0 .../user/impl/ObserveWebUserImmutable.java | 0 .../user/impl/ObserveWebUserPermissionBean.java | 0 .../impl/ObserveWebUserPermissionImmutable.java | 0 .../user/impl/ObserveWebUsersBean.java | 0 .../user/impl/ObserveWebUsersImmutable.java | 0 .../org.nuiton.config.ApplicationConfigProvider | 0 .../application-web-configuration_en_GB.properties | 15 + .../application-web-configuration_es_ES.properties | 15 + .../application-web-configuration_fr_FR.properties | 15 + .../src/main/resources/log4j.properties | 0 .../src/main/resources/observeweb-log4j.conf | 0 .../src/main/resources/observeweb.conf | 0 .../src/main/resources/validators.xml | 14 + application-web/pom.xml | 62 +- .../application/web/ObserveWebMotionFilter.java | 2 +- .../controller/v1/DataSourceServiceController.java | 6 + .../web/request/ObserveWebRequestContext.java | 2 +- entities-migration/pom.xml | 2 +- .../ObserveMigrationConfigurationProviderImpl.java | 2 + .../DataSourceMigrationForVersion_4_905.java | 46 +- .../DataSourceMigrationForVersion_4_906.java | 81 +++ ...p_not_null_constraint_hauling_identifier-H2.sql | 8 +- ...p_not_null_constraint_hauling_identifier-PG.sql | 8 +- .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 6 +- .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 6 +- entities/pom.xml | 2 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 34 +- .../fr/ird/observe/RunScriptsTopiaSqlWork.java | 6 - .../java/fr/ird/observe/entities/Activity.java | 6 +- .../main/java/fr/ird/observe/entities/GPSAble.java | 59 -- .../java/fr/ird/observe/entities/ObserveSet.java | 2 - .../entities/longline/ActivityLonglineImpl.java | 52 +- .../observe/entities/longline/SetLonglineImpl.java | 11 - .../observe/entities/seine/ActivitySeineImpl.java | 62 +- .../ird/observe/entities/seine/SetSeineImpl.java | 4 - entities/src/main/xmi/observe-longline.properties | 5 - entities/src/main/xmi/observe-seine.zargo | Bin 84619 -> 83234 bytes .../src/test/resources/db/4.0.2/referentiel.sql.gz | Bin 138257 -> 0 bytes pom.xml | 449 ++++++------ services-api/pom.xml | 2 +- .../services/ObserveServiceInitializer.java | 1 + .../services/service/DataSourceService.java | 2 + services-configuration-api/pom.xml | 2 +- .../ObserveDataSourceConfiguration.java | 5 + services-configuration-rest/pom.xml | 2 +- .../ObserveDataSourceConfigurationRest.java | 18 +- services-configuration-topia/pom.xml | 2 +- .../ObserveDataSourceConfigurationTopiaH2.java | 25 +- .../ObserveDataSourceConfigurationTopiaPG.java | 17 +- ...ObserveDataSourceConfigurationTopiaSupport.java | 17 +- services-model/pom.xml | 6 +- .../dto/DataSourceCreateConfigurationDto.java | 10 + .../dto}/ObserveSpeciesListConfiguration.java | 2 +- .../services/dto/constants/TripMapPointType.java | 3 + .../dto/seine/DiscardedTargetCatchDto.java | 16 +- .../dto/seine/DiscardedTargetSampleDto.java | 16 +- .../services/dto/seine/KeptTargetCatchDto.java | 16 +- .../services/dto/seine/KeptTargetSampleDto.java | 16 +- .../main/java/fr/ird/observe/util/ObserveUtil.java | 98 +++ .../main/xmi/observe-services-dto-longline.zargo | Bin 67306 -> 67504 bytes services-rest/pom.xml | 2 +- .../services/rest/RestTestClassResource.java | 2 +- services-runner/pom.xml | 8 +- services-topia-validation/pom.xml | 7 +- .../ActivityLongline-service-error-validation.xml | 12 +- .../SetLongline-service-error-validation.xml | 56 +- .../ActivitySeine-service-error-validation.xml | 12 +- .../seine/Route-service-error-validation.xml | 2 +- ...ch-service-targetDiscarded-error-validation.xml | 9 + ...-service-targetDiscarded-warning-validation.xml | 5 - ...-service-gearUseFeatures-warning-validation.xml | 2 +- .../services-topia-validation_en_GB.properties | 14 +- .../services-topia-validation_es_ES.properties | 14 +- .../services-topia-validation_fr_FR.properties | 14 +- ...seFeatures-warning-validation.xml => xwork.xml} | 27 +- .../src/test/resources/validators.xml | 1 + services-topia-validators/pom.xml | 2 +- .../topia/validators/QuadrantFieldValidator.java | 75 ++ services-topia/pom.xml | 2 +- .../topia/binder/data/ActivityLonglineBinder.java | 1 - .../topia/binder/data/ActivitySeineBinder.java | 1 - .../services/topia/entity/EntitiesSetFactory.java | 2 +- .../topia/service/DataSourceServiceTopia.java | 65 +- .../consolidate/ConsolidateDataServiceTopia.java | 68 +- .../service/actions/validate/ObserveValidator.java | 166 ----- .../validate/ServiceValidationException.java | 16 +- .../actions/validate/ValidateServiceTopia.java | 130 ++-- .../actions/validate/ValidationDataContext.java | 65 +- .../validate/ValidationMessageDetector.java | 7 +- .../service/actions/validate/ValidatorsMap.java | 54 +- .../longline/ActivityLonglineServiceTopia.java | 17 +- .../service/seine/ActivitySeineServiceTopia.java | 17 +- .../services/topia/TopiaTestClassResource.java | 2 +- .../topia/service/MigrateTestsDatabases.java | 8 +- .../actions/validate/ValidateServiceTopiaTest.java | 6 +- services-topia/src/test/resources/validators.xml | 1 + src/site/rst/administration-web.rst.vm | 68 +- src/site/rst/index.rst | 1 + test/pom.xml | 2 +- .../ird/observe/test/ObserveTestConfiguration.java | 1 + .../resources/db/4.905/dataForTestLongline.sql.gz | Bin 0 -> 1622096 bytes .../resources/db/4.905/dataForTestSeine.sql.gz | Bin 0 -> 451016 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441248 bytes test/src/main/resources/db/4.905/empty_h2.sql.gz | Bin 0 -> 6006 bytes test/src/main/resources/db/4.905/empty_pg.sql.gz | Bin 0 -> 6004 bytes .../src/main/resources/db/4.905/referentiel.sql.gz | Bin 0 -> 140214 bytes .../resources/db/4.906/dataForTestLongline.sql.gz | Bin 0 -> 1622154 bytes .../resources/db/4.906/dataForTestSeine.sql.gz | Bin 0 -> 451054 bytes ...aForTestUnidirectionalReferentialSynchro.sql.gz | Bin 0 -> 441255 bytes test/src/main/resources/db/4.906/empty_h2.sql.gz | Bin 0 -> 6012 bytes test/src/main/resources/db/4.906/empty_pg.sql.gz | Bin 0 -> 6006 bytes .../src/main/resources/db/4.906/referentiel.sql.gz | Bin 0 -> 140211 bytes test/src/main/resources/observetest.properties | 1 + {maven-plugin => toolbox-maven-plugin}/LICENSE.txt | 0 {maven-plugin => toolbox-maven-plugin}/README.md | 0 {maven-plugin => toolbox-maven-plugin}/pom.xml | 21 +- .../src/license/THIRD-PARTY.properties | 0 .../maven/plugins/toolbox}/CheckApiMojo.java | 2 +- .../plugins/toolbox/GenerateI18nTypesMojo.java | 227 ++++++ .../toolbox}/GenerateI18nValidatorFieldsMojo.java | 30 +- .../toolbox}/GenerateValidatorMojoSupport.java | 45 +- .../toolbox}/GenerateValidatorsDescriptorMojo.java | 10 +- .../MismatchMethodParameterNameException.java | 2 +- .../plugins/toolbox}/MissingClassException.java | 2 +- .../plugins/toolbox}/MissingMethodException.java | 2 +- .../maven/plugins/toolbox/ToolboxMojoSupport.java | 79 +-- .../plugins/toolbox}/ValidatorCacheRequest.java | 2 +- .../maven/plugins/toolbox}/ValidatorsCache.java | 2 +- .../src/main/resources/log4j.properties | 0 topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 391 files changed, 5988 insertions(+), 7329 deletions(-) diff --cc pom.xml index 19f821b,ec21544..9816f72 --- a/pom.xml +++ b/pom.xml @@@ -196,10 -198,8 +198,10 @@@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>4.904</observe.model.version> + <observe.model.version>4.906</observe.model.version> + <jrstPluginVersion>2.1</jrstPluginVersion> + </properties> <repositories> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b01c2783d925aa6c444c913f1e64dc99566b70c0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:27:11 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-api/pom.xml | 2 +- services-configuration-api/pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-model/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index b2a1940..350c250 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index 0311684..ed8cbef 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 418327f..12b81d0 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index d46f5d8..e132b87 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index 83adead..e2270a7 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 844e9b2..4f4c5ba 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 0f3f5ff..25b94d0 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 384cd94..2dcc718 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index c8f7b3a..bac0cb8 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 8ec7351..ec21544 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-api/pom.xml b/services-api/pom.xml index 8f6b06b..2c11414 100644 --- a/services-api/pom.xml +++ b/services-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-api</artifactId> diff --git a/services-configuration-api/pom.xml b/services-configuration-api/pom.xml index ec345ca..cff77cd 100644 --- a/services-configuration-api/pom.xml +++ b/services-configuration-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-configuration-api</artifactId> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 8df8f22..9734bc31 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 5791f6d..f7b379c 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-model/pom.xml b/services-model/pom.xml index aea7f25..fd4eb1c 100644 --- a/services-model/pom.xml +++ b/services-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-model</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index da3b140..5a2a3af 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index e16543e..42cda0a 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 1432eb0..f348473 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 2360a35..4b5c0c1 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 6038e77..fbc4bd5 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>services-topia</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 079e777..1145a02 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 3b31161..e3f0202 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 7e4be18..9222a0e 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 5b26f0d..7b8d8c7 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0-RC-2</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e26b4e3ce91d585ee20fa597aa498efc5f6f40e2 Merge: b01c278 6bb6c0b Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:27:12 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../decoration/ObserveI18nDecoratorHelper.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_905.java | 22 ++++++++++++++++++++++ .../DataSourceMigrationForVersion_4_906.java | 22 ++++++++++++++++++++++ pom.xml | 2 ++ .../dto/seine/DiscardedTargetCatchDto.java | 22 ++++++++++++++++++++++ .../dto/seine/DiscardedTargetSampleDto.java | 22 ++++++++++++++++++++++ .../services/dto/seine/KeptTargetCatchDto.java | 22 ++++++++++++++++++++++ .../services/dto/seine/KeptTargetSampleDto.java | 22 ++++++++++++++++++++++ 8 files changed, 156 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit c6478a79e5e18cfadacb64eae5634c2d3cc4e6d0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Sep 5 14:27:13 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- entities/pom.xml | 2 +- pom.xml | 2 +- services-api/pom.xml | 2 +- services-configuration-api/pom.xml | 2 +- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-model/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 350c250..b2a1940 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index ed8cbef..0311684 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 12b81d0..418327f 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index e132b87..d46f5d8 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index e2270a7..83adead 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 4f4c5ba..844e9b2 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 25b94d0..0f3f5ff 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index 2dcc718..384cd94 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities/pom.xml b/entities/pom.xml index bac0cb8..c8f7b3a 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/pom.xml b/pom.xml index 9816f72..1071bc3 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> diff --git a/services-api/pom.xml b/services-api/pom.xml index 2c11414..8f6b06b 100644 --- a/services-api/pom.xml +++ b/services-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-api</artifactId> diff --git a/services-configuration-api/pom.xml b/services-configuration-api/pom.xml index cff77cd..ec345ca 100644 --- a/services-configuration-api/pom.xml +++ b/services-configuration-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-api</artifactId> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index 9734bc31..8df8f22 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index f7b379c..5791f6d 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-model/pom.xml b/services-model/pom.xml index fd4eb1c..aea7f25 100644 --- a/services-model/pom.xml +++ b/services-model/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-model</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 5a2a3af..da3b140 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 42cda0a..e16543e 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index f348473..1432eb0 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index 4b5c0c1..2360a35 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index fbc4bd5..6038e77 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/test/pom.xml b/test/pom.xml index 1145a02..079e777 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index e3f0202..3b31161 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 9222a0e..7e4be18 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index 7b8d8c7..5b26f0d 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.0-RC-2</version> + <version>5.0-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm