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

Commits:

2 changed files:

Changes:

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2019.8.1</version>
    29 
    +    <version>2019.8.2</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -155,7 +155,11 @@
    155 155 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    156 156 
         <buildDate>${maven.build.timestamp}</buildDate>
    157 157
    158 
    -    <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion>
    158 
    +    <observeToolkitVersion>4.10</observeToolkitVersion>
    159 
    +    <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    160 
    +    <!--can't use 1.4.197 (date has changed + blob also)-->
    161 
    +    <lib.version.h2>1.4.196</lib.version.h2>
    162 
    +
    159 163 
         <!--<lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>-->
    160 164 
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    161 165 
         <!--<lib.version.java4all.jaxx>3.0-alpha-45-SNAPSHOT</lib.version.java4all.jaxx>-->
    ... ... @@ -163,11 +167,8 @@
    163 167 
         <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
    164 168 
         <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
    165 169 
         <!--<lib.version.java4all.topia>1.1.6</lib.version.java4all.topia>-->
    166 
    -    <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    167 
    -    <xworkVersion>2.3.35</xworkVersion>
    170 
    +    <!--<lib.xwork.version>2.3.35</lib.xwork.version>-->
    168 171 
         <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
    169 
    -    <!--can't use 1.4.197 (date has changed + blob also-->
    170 
    -    <lib.version.h2>1.4.196</lib.version.h2>
    171 172
    172 173 
         <!-- license header configuration -->
    173 174 
         <license.licenseName>gpl_v3</license.licenseName>
    ... ... @@ -211,7 +212,6 @@
    211 212 
             <artifactId>common-dto</artifactId>
    212 213 
             <version>${observeToolkitVersion}</version>
    213 214 
           </dependency>
    214 
    -
    215 215 
           <dependency>
    216 216 
             <groupId>fr.ird.observe.toolkit</groupId>
    217 217 
             <artifactId>common-service</artifactId>
    ... ... @@ -228,33 +228,6 @@
    228 228 
             <version>${observeToolkitVersion}</version>
    229 229 
           </dependency>
    230 230
    231 
    -      <dependency>
    232 
    -        <groupId>org.hashids</groupId>
    233 
    -        <artifactId>hashids</artifactId>
    234 
    -        <version>1.0.3</version>
    235 
    -      </dependency>
    236 
    -
    237 
    -      <dependency>
    238 
    -        <groupId>org.apache.struts.xwork</groupId>
    239 
    -        <artifactId>xwork-core</artifactId>
    240 
    -        <version>${xworkVersion}</version>
    241 
    -        <exclusions>
    242 
    -          <exclusion>
    243 
    -            <groupId>javassist</groupId>
    244 
    -            <artifactId>javassist</artifactId>
    245 
    -          </exclusion>
    246 
    -          <exclusion>
    247 
    -            <groupId>asm</groupId>
    248 
    -            <artifactId>asm-tree</artifactId>
    249 
    -          </exclusion>
    250 
    -          <exclusion>
    251 
    -            <groupId>asm</groupId>
    252 
    -            <artifactId>asm</artifactId>
    253 
    -          </exclusion>
    254 
    -
    255 
    -        </exclusions>
    256 
    -      </dependency>
    257 
    -
    258 231 
           <dependency>
    259 232 
             <groupId>com.esotericsoftware.yamlbeans</groupId>
    260 233 
             <artifactId>yamlbeans</artifactId>
    ... ... @@ -263,11 +236,10 @@
    263 236 
           </dependency>
    264 237
    265 238 
           <dependency>
    266 
    -        <groupId>commons-fileupload</groupId>
    267 
    -        <artifactId>commons-fileupload</artifactId>
    268 
    -        <version>1.4</version>
    239 
    +        <groupId>org.glassfish.jaxb</groupId>
    240 
    +        <artifactId>jaxb-runtime</artifactId>
    241 
    +        <version>2.3.1</version>
    269 242 
           </dependency>
    270 
    -
    271 243 
         </dependencies>
    272 244
    273 245 
       </dependencyManagement>

  • validation/src/main/i18n/getters/validation-messages.getter
    1 
    +observe.validation.activity.duplicated.time
    2 
    +observe.validation.activity.null.dcp
    3 
    +observe.validation.activity.required.observedSystem.for.nonTargetCatch
    4 
    +observe.validation.activityLongline.endDate.after.currentTrip.startDate
    5 
    +observe.validation.activityLongline.endDate.before.currentTrip.endDate
    6 
    +observe.validation.activityLongline.startDate.after.currentTrip.startDate
    7 
    +observe.validation.activityLongline.startDate.before.currentTrip.endDate
    8 
    +observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped
    9 
    +observe.validation.catchLongline.required.position
    10 
    +observe.validation.field.mandatory
    11 
    +observe.validation.floatingObject.invalid.parts
    12 
    +observe.validation.floatingObject.required.comment.for.balise1
    13 
    +observe.validation.floatingObject.required.comment.for.balise2
    14 
    +observe.validation.floatingObject.size.supportVesselName
    15 
    +observe.validation.landingPartLongline.bound.categoryWeight
    16 
    +observe.validation.landingPartLongline.required.weightMeasureMethod
    17 
    +observe.validation.lengthFormula.endDate.before.startDate
    18 
    +observe.validation.lengthLengthParameter.invalid.inputOutputFormula
    19 
    +observe.validation.lengthLengthParameter.invalid.outputInputFormula
    20 
    +observe.validation.lengthLengthParameter.invalid.uniqueKey
    21 
    +observe.validation.lengthWeightParameter.invalid.lengthWeightFormula
    22 
    +observe.validation.lengthWeightParameter.invalid.uniqueKey
    23 
    +observe.validation.lengthWeightParameter.invalid.weightLengthFormula
    24 
    +observe.validation.nonTargetCatch.missing.observedSystem
    25 
    +observe.validation.nonTargetCatch.required.weightOrNombreEstime
    26 
    +observe.validation.nonTargetCatch.required.weightOrTailleMoyen
    27 
    +observe.validation.nonTargetCatch.uniqueKey
    28 
    +observe.validation.nonTargetSample.required.weight.or.taille
    29 
    +observe.validation.objectMaterial.invalid.validation
    30 
    +observe.validation.objectObservedSpecies.positive.count
    31 
    +observe.validation.referential.disabled
    32 
    +observe.validation.referential.label1.untranslated
    33 
    +observe.validation.referential.label3.untranslated
    34 
    +observe.validation.referentiel.bad.parentCode
    35 
    +observe.validation.referentiel.null.uri
    36 
    +observe.validation.referentiel.status.desactivated
    37 
    +observe.validation.referentiel.untranslated.label1
    38 
    +observe.validation.referentiel.untranslated.label3
    39 
    +observe.validation.required.haulingEndLatitude
    40 
    +observe.validation.required.haulingEndLongitude
    41 
    +observe.validation.required.haulingStartLatitude
    42 
    +observe.validation.required.haulingStartLongitude
    43 
    +observe.validation.required.latitude
    44 
    +observe.validation.required.longitude
    45 
    +observe.validation.required.quadrant
    46 
    +observe.validation.required.settingEndLatitude
    47 
    +observe.validation.required.settingEndLongitude
    48 
    +observe.validation.route.activityFinDeVeille.notAvailable
    49 
    +observe.validation.route.duplicated.date
    50 
    +observe.validation.route.invalid.date
    51 
    +observe.validation.route.invalid.endLogValue.maximum
    52 
    +observe.validation.route.invalid.endLogValue.minimum
    53 
    +observe.validation.route.invalid.quadrant
    54 
    +observe.validation.route.invalid.startLogValue
    55 
    +observe.validation.route.invalid.time
    56 
    +observe.validation.route.missing.activityFinDeVeille
    57 
    +observe.validation.route.positive.startLogValue
    58 
    +observe.validation.route.unclosed.activity
    59 
    +observe.validation.samplePart.required.sizeMeasureType.for.length
    60 
    +observe.validation.samplePart.required.weightMeasureType.for.weight
    61 
    +observe.validation.schoolEstimate.species.uniqueKey
    62 
    +observe.validation.set.bound.delay
    63 
    +observe.validation.set.delay.too.long
    64 
    +observe.validation.set.endDate.after.endPursingDate
    65 
    +observe.validation.set.endPursingDate.after.date
    66 
    +observe.validation.set.endPursingTimeStamp.after.startTime
    67 
    +observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp
    68 
    +observe.validation.set.size.supportVesselName
    69 
    +observe.validation.set.startTime.after.time
    70 
    +observe.validation.setLongline.baitsComposition.uniqueKey
    71 
    +observe.validation.setLongline.branchlinesComposition.uniqueKey
    72 
    +observe.validation.setLongline.duplicated.homeId
    73 
    +observe.validation.setLongline.duplicated.number
    74 
    +observe.validation.setLongline.floatlinesComposition.uniqueKey
    75 
    +observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp
    76 
    +observe.validation.setLongline.hooksComposition.uniqueKey
    77 
    +observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp
    78 
    +observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp
    79 
    +observe.validation.species.length.bound
    80 
    +observe.validation.species.weight.bound
    81 
    +observe.validation.targetCatch.uniqueKey
    82 
    +observe.validation.targetDiscarded.uniqueKey
    83 
    +observe.validation.targetLength.bound.length
    84 
    +observe.validation.targetLength.bound.weight
    85 
    +observe.validation.targetLength.positive.length
    86 
    +observe.validation.targetLength.positive.weight
    87 
    +observe.validation.targetLength.required.taille
    88 
    +observe.validation.targetLength.required.weight.or.taille
    89 
    +observe.validation.tdr.deployementStart.before.fishingStart
    90 
    +observe.validation.tdr.fishingEnd.before.deployementEnd
    91 
    +observe.validation.tdr.fishingStart.before.fishingEnd
    92 
    +observe.validation.tdr.required.position
    93 
    +observe.validation.trip.endDate.after.now
    94 
    +observe.validation.trip.endDate.after.startDate
    95 
    +observe.validation.trip.invalid.date
    96 
    +observe.validation.trip.invalid.endDate
    97 
    +observe.validation.trip.invalid.formsUrl
    98 
    +observe.validation.trip.invalid.loch
    99 
    +observe.validation.trip.invalid.reportsUrl
    100 
    +observe.validation.trip.invalid.startDate
    101 
    +observe.validation.trip.startDate.after.now
    1 102 
     observe.validation.tripLongline.unclosed.activity
    103 
    +observe.validation.tripSeine.unclosed.route

    • —
    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.