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

[Git][ultreiaio/ird-observe][pages] remove stable site
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 9054da69 by Tony Chemit at 2022-05-02T01:31:31+02:00 remove stable site - - - - - 1 changed file: - − stable/CHANGELOG.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9054da6912f4134cb7a0e4357… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9054da6912f4134cb7a0e4357… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.6.13
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT deleted branch release/7.6.13 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.6.13
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

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

1 0

[Git][ultreiaio/ird-observe][release/7.6.13] 2 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch release/7.6.13 at ultreiaio / ird-observe Commits: 901e37d3 by Tony Chemit at 2022-05-02T00:56:31+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci] - - - - - 17e92d53 by Tony Chemit at 2022-05-02T01:04:41+02:00 Problème de quadrant - See #2300 - - - - - 23 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java ===================================== @@ -49,7 +49,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { throw new ValidationException("No parameter 'fieldName' filled"); } - ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object); + ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object); if (ocean == null) { throw new ValidationException("could not find ocean named: " + this.ocean); } @@ -59,13 +59,13 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); + String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); boolean valid; switch (code) { - case 1: // Atlantic + case "1": // Atlantic valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4; break; - case 2: // Indian + case "2": // Indian valid = quadrant == 1 || quadrant == 2; break; default: ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.13</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9bb92985550ca29ce924c89d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9bb92985550ca29ce924c89d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 8 commits: [jgitflow-maven-plugin]updating poms for 7.6.13-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: abebcff1 by Tony Chemit at 2022-04-30T15:08:54+02:00 [jgitflow-maven-plugin]updating poms for 7.6.13-SNAPSHOT development[skip ci] - - - - - 19d141ff by Tony Chemit at 2022-04-30T15:31:56+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 79329741 by Tony Chemit at 2022-04-30T15:31:56+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 894d5d0c by Tony Chemit at 2022-04-30T15:31:56+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 9bb92985 by Tony Chemit at 2022-05-02T00:45:01+02:00 Problème de quadrant - See #2300 - - - - - 901e37d3 by Tony Chemit at 2022-05-02T00:56:31+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci] - - - - - 17e92d53 by Tony Chemit at 2022-05-02T01:04:41+02:00 Problème de quadrant - See #2300 - - - - - 90afce3e by Tony Chemit at 2022-05-02T01:28:10+02:00 [jgitflow-maven-plugin]merging 'release/7.6.13' into 'master-7.x' - - - - - 23 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java ===================================== @@ -49,7 +49,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { throw new ValidationException("No parameter 'fieldName' filled"); } - ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object); + ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object); if (ocean == null) { throw new ValidationException("could not find ocean named: " + this.ocean); } @@ -59,11 +59,18 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - Integer code = Integer.valueOf(ocean.get(ReferentialDtoReference.PROPERTY_CODE)); - boolean valid = code == 3 - || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (code == 2 && (quadrant == 1 || quadrant == 2)); - + String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); + boolean valid; + switch (code) { + case "1": // Atlantic + valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4; + break; + case "2": // Indian + valid = quadrant == 1 || quadrant == 2; + break; + default: + valid=true; + } if (!valid) { if (getDefaultMessage().isEmpty()) { setDefaultMessage(n("observe.validation.quadrant.invalid") + "##${" + this.ocean + ".label}"); ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.12</version> + <version>7.6.13</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/63b8d828d6b7ae4b97a9ae7c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/63b8d828d6b7ae4b97a9ae7c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: [jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 901e37d3 by Tony Chemit at 2022-05-02T00:56:31+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci] - - - - - 17e92d53 by Tony Chemit at 2022-05-02T01:04:41+02:00 Problème de quadrant - See #2300 - - - - - 90afce3e by Tony Chemit at 2022-05-02T01:28:10+02:00 [jgitflow-maven-plugin]merging 'release/7.6.13' into 'master-7.x' - - - - - a586bdca by Tony Chemit at 2022-05-02T01:28:12+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - c609ca83 by Tony Chemit at 2022-05-02T01:28:13+02:00 [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 9c85af5e by Tony Chemit at 2022-05-02T01:28:13+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java Changes: ===================================== common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java ===================================== @@ -49,7 +49,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { throw new ValidationException("No parameter 'fieldName' filled"); } - ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object); + ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object); if (ocean == null) { throw new ValidationException("could not find ocean named: " + this.ocean); } @@ -59,13 +59,13 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); + String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); boolean valid; switch (code) { - case 1: // Atlantic + case "1": // Atlantic valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4; break; - case 2: // Indian + case "2": // Indian valid = quadrant == 1 || quadrant == 2; break; default: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa9f14e9dbb2c4b28df14af3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/aa9f14e9dbb2c4b28df14af3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] 2 commits: Site checkin for project ObServe (version 7.6.13)
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 78a53d7c by Tony Chemit at 2022-05-02T01:26:34+02:00 Site checkin for project ObServe (version 7.6.13) - - - - - f767f30d by Tony Chemit at 2022-05-02T01:27:40+02:00 Site checkin for project ObServe (version 7.6.13) - - - - - 7 changed files: - + 7.6.13/.gitlab-ci.yml - + 7.6.13/administration-web.html - + 7.6.13/architecture-logicielle.html - + 7.6.13/changelog.html - + 7.6.13/changes-report.html - + 7.6.13/ci-management.html - + 7.6.13/config-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/50592a12cab35a238f0c6750… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/50592a12cab35a238f0c6750… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.6.14-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: aa9f14e9 by Tony Chemit at 2022-05-02T00:56:01+02:00 [jgitflow-maven-plugin]updating poms for 7.6.14-SNAPSHOT development[skip ci] - - - - - 22 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - common-dto/pom.xml - common-persistence/pom.xml - common-service/pom.xml - common-validation/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - templates/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== common-dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-persistence/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-service/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== common-validation/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== dto/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -29,7 +29,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> @@ -118,7 +118,7 @@ <dependency> <groupId>fr.ird.observe</groupId> <artifactId>services</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> <scope>compile</scope> </dependency> ===================================== server-core/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== templates/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== test/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <groupId>fr.ird.observe.toolkit</groupId> ===================================== validation/pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.6.13-SNAPSHOT</version> + <version>7.6.14-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/aa9f14e9dbb2c4b28df14af31… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/aa9f14e9dbb2c4b28df14af31… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/7.6.13
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

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

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Problème de quadrant - See #2300
by Tony CHEMIT (＠tchemit) May 1, 2022

May 1, 2022

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9bb92985 by Tony Chemit at 2022-05-02T00:45:01+02:00 Problème de quadrant - See #2300 - - - - - 1 changed file: - common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java Changes: ===================================== common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java ===================================== @@ -59,11 +59,18 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - Integer code = Integer.valueOf(ocean.get(ReferentialDtoReference.PROPERTY_CODE)); - boolean valid = code == 3 - || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (code == 2 && (quadrant == 1 || quadrant == 2)); - + int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); + boolean valid; + switch (code) { + case 1: // Atlantic + valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4; + break; + case 2: // Indian + valid = quadrant == 1 || quadrant == 2; + break; + default: + valid=true; + } if (!valid) { if (getDefaultMessage().isEmpty()) { setDefaultMessage(n("observe.validation.quadrant.invalid") + "##${" + this.ocean + ".label}"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9bb92985550ca29ce924c89de… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9bb92985550ca29ce924c89de… You're receiving this email because of your account on gitlab.com.

1 0