Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe

Commits:

30 changed files:

Changes:

  • .mvn/pom.gitflow.develop
    1 
    -develop
    \ No newline at end of file
    1 
    +develop-9.x
    \ No newline at end of file

  • .mvn/pom.gitflow.master
    1 
    -master
    \ No newline at end of file
    1 
    +master-9.x
    \ No newline at end of file

  • client-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-configuration</artifactId>

  • client-core/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-core</artifactId>

  • client-runner/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>client-runner</artifactId>

  • dto/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    30 
    +    <version>9.0.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>dto</artifactId>

  • observe-i18n/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>observe-i18n</artifactId>

  • observe/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>observe</artifactId>

  • persistence/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>persistence</artifactId>

  • persistence/src/main/models/Observe-01-referential-common.model
    ... ... @@ -186,3 +186,8 @@ referential.common.WeightMeasureType > referential.I18nReferentialEntity | entit
    186 186 
     referential.common.Wind > referential.I18nReferentialEntity | entity
    187 187 
     speedRange + {*:1} String
    188 188 
     waveHeight + {*:1} String
    189 
    +
    190 
    +referentiel.TransmittingBuoyOwnership > referentiel.I18nReferentialEntity | entity
    191 
    +
    192 
    +referentiel.SchoolType > referentiel.I18nReferentialEntity | entity
    193 
    +

  • persistence/src/main/models/Observe-04-referentiel-seine-logbook.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.logbook | dbSchema=ps_logbook
    2 
    +
    3 
    +referentiel.seine.logbook.ObjectMaterial > referentiel.I18nReferentialEntity | entity
    4 
    +legacyCode + {*:1} String | hibernateAttributeType=text
    5 
    +standardCode + {*:1} String
    6 
    +biodegradable + {*:1} Boolean
    7 
    +nonEntangling + {*:1} Boolean
    8 
    +childrenMultiSelectable + {*:1} boolean | notNull
    9 
    +childSelectionMandatory + {*:1} boolean | notNull
    10 
    +parent {*:0..1} referentiel.seine.ObjectMaterial
    11 
    +objectMaterialType {*:1} referentiel.seine.logbook.ObjectMaterialType | lazy=false
    12 
    +validation + {*:1} String
    13 
    +getSimplifiedObjectMaterial() referentiel.seine.logbook.ObjectMaterial
    14 
    +getSimplifiedParentObjectMaterial() referentiel.seine.logbook.ObjectMaterial
    15 
    +
    16 
    +referentiel.seine.logbook.ObjectMaterialType > referentiel.I18nReferentialEntity | entity
    17 
    +
    18 
    +referentiel.seine.logbook.ObjectOperation > referentiel.I18nReferentialEntity | entity
    19 
    +whenArriving + {*:1} boolean | notNull
    20 
    +whenLeaving + {*:1} boolean | notNull

  • persistence/src/main/models/Observe-05-referentiel-seine-landing.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.landing | dbSchema=ps_landing
    2 
    +
    3 
    +referentiel.seine.landing.WeightCategory > referentiel.I18nReferentialEntity | entity
    4 
    +species {*:1} referentiel.Species | lazy=false
    5 
    +
    6 
    +referentiel.seine.landing.Fate > referentiel.I18nReferentialEntity | entity

  • persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.wellplan | dbSchema=ps_wellplan
    2 
    +
    3 
    +referentiel.seine.wellplan.WeightCategory > referentiel.I18nReferentialEntity | entity
    4 
    +species {*:1} referentiel.Species | lazy=false
    \ No newline at end of file

  • persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model
    1 
    +package fr.ird.observe.entities.referentiel.seine.localmarket | dbSchema=ps_localmarket
    2 
    +
    3 
    +referentiel.seine.localmarket.PackagingType > referentiel.I18nReferentialEntity | entity
    4 
    +
    5 
    +referentiel.seine.localmarket.Packaging > referentiel.I18nReferentialEntity | entity
    \ No newline at end of file

  • persistence/src/main/models/Observe-21-data-seine-logbook.model
    1 
    +package fr.ird.observe.entities.data.seine.logbook | dbSchema=ps_logbook

  • persistence/src/main/models/Observe-22-data-seine-landing.model
    1 
    +package fr.ird.observe.entities.data.seine.landing | dbSchema=ps_landing
    \ No newline at end of file

  • persistence/src/main/models/Observe-23-data-seine-wellplan.model
    1 
    +package fr.ird.observe.entities.data.seine.wellplan | dbSchema=ps_wellplan
    \ No newline at end of file

  • persistence/src/main/models/Observe-24-data-seine-localmarket.model
    1 
    +package fr.ird.observe.entities.data.seine.localmarket | dbSchema=ps_localmarket
    \ No newline at end of file

  • persistence/src/main/models/Observe-40-data-common.model

  • pom.xml
    ... ... @@ -26,12 +26,12 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2018.8.11</version>
    29 
    +    <version>2018.8.12</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    33 33 
       <artifactId>ird-observe</artifactId>
    34 
    -  <version>8.0-alpha-5-SNAPSHOT</version>
    34 
    +  <version>9.0.0-SNAPSHOT</version>
    35 35 
       <packaging>pom</packaging>
    36 36
    37 37 
       <name>ObServe :: Pom</name>
    ... ... @@ -156,7 +156,7 @@
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 158 
         <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion>
    159 
    -    <lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>
    159 
    +    <!--<lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>-->
    160 160 
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    161 161 
         <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>-->
    162 162 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
    ... ... @@ -201,6 +201,10 @@
    201 201
    202 202 
         <license.excludes>**/templates/*.template,**/translations/*.properties,**/THIRD-PARTY.properties,**/*.sh</license.excludes>
    203 203
    204 
    +    <!--jgitflow configuration-->
    205 
    +    <jgitflow.masterBranchName>master-9.x</jgitflow.masterBranchName>
    206 
    +    <jgitflow.developBranchName>develop-9.x</jgitflow.developBranchName>
    207 
    +
    204 208 
       </properties>
    205 209
    206 210 
       <dependencyManagement>

  • server-configuration/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>server-configuration</artifactId>

  • server-core/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    30 
    +    <version>9.0.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>server-core</artifactId>

  • server-runner/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    30 
    +    <version>9.0.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>server-runner</artifactId>

  • services-client/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    30 
    +    <version>9.0.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-client</artifactId>

  • services-local/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    30 
    +    <version>9.0.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services-local</artifactId>

  • services/pom.xml
    ... ... @@ -27,7 +27,7 @@
    27 27 
       <parent>
    28 28 
         <groupId>fr.ird.observe</groupId>
    29 29 
         <artifactId>ird-observe</artifactId>
    30 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    30 
    +    <version>9.0.0-SNAPSHOT</version>
    31 31 
       </parent>
    32 32
    33 33 
       <artifactId>services</artifactId>

  • test/.mvn/pom.gitflow.develop
    1 
    -develop
    \ No newline at end of file
    1 
    +develop-9.x
    \ No newline at end of file

  • test/.mvn/pom.gitflow.master
    1 
    -master
    \ No newline at end of file
    1 
    +master-9.x
    \ No newline at end of file

  • test/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>test</artifactId>

  • validation/pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>fr.ird.observe</groupId>
    28 28 
         <artifactId>ird-observe</artifactId>
    29 
    -    <version>8.0-alpha-5-SNAPSHOT</version>
    29 
    +    <version>9.0.0-SNAPSHOT</version>
    30 30 
       </parent>
    31 31
    32 32 
       <artifactId>validation</artifactId>

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.