Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 54af2737 by tchemit at 2018-12-14T14:18:06Z update pom - - - - - dfcac004 by tchemit at 2018-12-14T14:18:43Z prepare version 9.0 branch - - - - - 8548d6c4 by tchemit at 2018-12-14T14:18:43Z stash new model - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/models/Observe-01-referential-common.model - + persistence/src/main/models/Observe-04-referentiel-seine-logbook.model - + persistence/src/main/models/Observe-05-referentiel-seine-landing.model - + persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model - + persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model - + persistence/src/main/models/Observe-21-data-seine-logbook.model - + persistence/src/main/models/Observe-22-data-seine-landing.model - + persistence/src/main/models/Observe-23-data-seine-wellplan.model - + persistence/src/main/models/Observe-24-data-seine-localmarket.model - + persistence/src/main/models/Observe-40-data-common.model - 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 - test/.mvn/pom.gitflow.develop - test/.mvn/pom.gitflow.master - test/pom.xml - validation/pom.xml Changes: ===================================== .mvn/pom.gitflow.develop ===================================== @@ -1 +1 @@ -develop \ No newline at end of file +develop-9.x \ No newline at end of file ===================================== .mvn/pom.gitflow.master ===================================== @@ -1 +1 @@ -master \ No newline at end of file +master-9.x \ No newline at end of file ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -186,3 +186,8 @@ referential.common.WeightMeasureType > referential.I18nReferentialEntity | entit referential.common.Wind > referential.I18nReferentialEntity | entity speedRange + {*:1} String waveHeight + {*:1} String + +referentiel.TransmittingBuoyOwnership > referentiel.I18nReferentialEntity | entity + +referentiel.SchoolType > referentiel.I18nReferentialEntity | entity + ===================================== persistence/src/main/models/Observe-04-referentiel-seine-logbook.model ===================================== @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.referentiel.seine.logbook | dbSchema=ps_logbook + +referentiel.seine.logbook.ObjectMaterial > referentiel.I18nReferentialEntity | entity +legacyCode + {*:1} String | hibernateAttributeType=text +standardCode + {*:1} String +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean +childrenMultiSelectable + {*:1} boolean | notNull +childSelectionMandatory + {*:1} boolean | notNull +parent {*:0..1} referentiel.seine.ObjectMaterial +objectMaterialType {*:1} referentiel.seine.logbook.ObjectMaterialType | lazy=false +validation + {*:1} String +getSimplifiedObjectMaterial() referentiel.seine.logbook.ObjectMaterial +getSimplifiedParentObjectMaterial() referentiel.seine.logbook.ObjectMaterial + +referentiel.seine.logbook.ObjectMaterialType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.logbook.ObjectOperation > referentiel.I18nReferentialEntity | entity +whenArriving + {*:1} boolean | notNull +whenLeaving + {*:1} boolean | notNull ===================================== persistence/src/main/models/Observe-05-referentiel-seine-landing.model ===================================== @@ -0,0 +1,6 @@ +package fr.ird.observe.entities.referentiel.seine.landing | dbSchema=ps_landing + +referentiel.seine.landing.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false + +referentiel.seine.landing.Fate > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model ===================================== @@ -0,0 +1,4 @@ +package fr.ird.observe.entities.referentiel.seine.wellplan | dbSchema=ps_wellplan + +referentiel.seine.wellplan.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false \ No newline at end of file ===================================== persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model ===================================== @@ -0,0 +1,5 @@ +package fr.ird.observe.entities.referentiel.seine.localmarket | dbSchema=ps_localmarket + +referentiel.seine.localmarket.PackagingType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.localmarket.Packaging > referentiel.I18nReferentialEntity | entity \ No newline at end of file ===================================== persistence/src/main/models/Observe-21-data-seine-logbook.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.logbook | dbSchema=ps_logbook ===================================== persistence/src/main/models/Observe-22-data-seine-landing.model ===================================== @@ -0,0 +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 ===================================== @@ -0,0 +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 ===================================== @@ -0,0 +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 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.11</version> + <version>2018.8.12</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> @@ -156,7 +156,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion> - <lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia> + <!--<lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>--> <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>--> @@ -201,6 +201,10 @@ <license.excludes>**/templates/*.template,**/translations/*.properties,**/THIRD-PARTY.properties,**/*.sh</license.excludes> + <!--jgitflow configuration--> + <jgitflow.masterBranchName>master-9.x</jgitflow.masterBranchName> + <jgitflow.developBranchName>develop-9.x</jgitflow.developBranchName> + </properties> <dependencyManagement> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/.mvn/pom.gitflow.develop ===================================== @@ -1 +1 @@ -develop \ No newline at end of file +develop-9.x \ No newline at end of file ===================================== test/.mvn/pom.gitflow.master ===================================== @@ -1 +1 @@ -master \ No newline at end of file +master-9.x \ No newline at end of file ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b95978bff366b9bace336bbe75... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b95978bff366b9bace336bbe75... You're receiving this email because of your account on gitlab.com.