Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 990dc64c by tchemit at 2019-01-22T09:56:10Z update pom and some libs - - - - - 2 changed files: - pom.xml - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.1</version> + <version>2019.8.2</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,7 +155,11 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.10</observeToolkitVersion> + <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> + <!--can't use 1.4.197 (date has changed + blob also)--> + <lib.version.h2>1.4.196</lib.version.h2> + <!--<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>--> @@ -163,11 +167,8 @@ <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>--> <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.topia>1.1.6</lib.version.java4all.topia>--> - <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> - <xworkVersion>2.3.35</xworkVersion> + <!--<lib.xwork.version>2.3.35</lib.xwork.version>--> <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>--> - <!--can't use 1.4.197 (date has changed + blob also--> - <lib.version.h2>1.4.196</lib.version.h2> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> @@ -211,7 +212,6 @@ <artifactId>common-dto</artifactId> <version>${observeToolkitVersion}</version> </dependency> - <dependency> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-service</artifactId> @@ -228,33 +228,6 @@ <version>${observeToolkitVersion}</version> </dependency> - <dependency> - <groupId>org.hashids</groupId> - <artifactId>hashids</artifactId> - <version>1.0.3</version> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> - <exclusions> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm-tree</artifactId> - </exclusion> - <exclusion> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - </exclusion> - - </exclusions> - </dependency> - <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> @@ -263,11 +236,10 @@ </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.4</version> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>2.3.1</version> </dependency> - </dependencies> </dependencyManagement> ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -1 +1,103 @@ +observe.validation.activity.duplicated.time +observe.validation.activity.null.dcp +observe.validation.activity.required.observedSystem.for.nonTargetCatch +observe.validation.activityLongline.endDate.after.currentTrip.startDate +observe.validation.activityLongline.endDate.before.currentTrip.endDate +observe.validation.activityLongline.startDate.after.currentTrip.startDate +observe.validation.activityLongline.startDate.before.currentTrip.endDate +observe.validation.catchLongline.required.count.when.acquisitionModeIsGrouped +observe.validation.catchLongline.required.position +observe.validation.field.mandatory +observe.validation.floatingObject.invalid.parts +observe.validation.floatingObject.required.comment.for.balise1 +observe.validation.floatingObject.required.comment.for.balise2 +observe.validation.floatingObject.size.supportVesselName +observe.validation.landingPartLongline.bound.categoryWeight +observe.validation.landingPartLongline.required.weightMeasureMethod +observe.validation.lengthFormula.endDate.before.startDate +observe.validation.lengthLengthParameter.invalid.inputOutputFormula +observe.validation.lengthLengthParameter.invalid.outputInputFormula +observe.validation.lengthLengthParameter.invalid.uniqueKey +observe.validation.lengthWeightParameter.invalid.lengthWeightFormula +observe.validation.lengthWeightParameter.invalid.uniqueKey +observe.validation.lengthWeightParameter.invalid.weightLengthFormula +observe.validation.nonTargetCatch.missing.observedSystem +observe.validation.nonTargetCatch.required.weightOrNombreEstime +observe.validation.nonTargetCatch.required.weightOrTailleMoyen +observe.validation.nonTargetCatch.uniqueKey +observe.validation.nonTargetSample.required.weight.or.taille +observe.validation.objectMaterial.invalid.validation +observe.validation.objectObservedSpecies.positive.count +observe.validation.referential.disabled +observe.validation.referential.label1.untranslated +observe.validation.referential.label3.untranslated +observe.validation.referentiel.bad.parentCode +observe.validation.referentiel.null.uri +observe.validation.referentiel.status.desactivated +observe.validation.referentiel.untranslated.label1 +observe.validation.referentiel.untranslated.label3 +observe.validation.required.haulingEndLatitude +observe.validation.required.haulingEndLongitude +observe.validation.required.haulingStartLatitude +observe.validation.required.haulingStartLongitude +observe.validation.required.latitude +observe.validation.required.longitude +observe.validation.required.quadrant +observe.validation.required.settingEndLatitude +observe.validation.required.settingEndLongitude +observe.validation.route.activityFinDeVeille.notAvailable +observe.validation.route.duplicated.date +observe.validation.route.invalid.date +observe.validation.route.invalid.endLogValue.maximum +observe.validation.route.invalid.endLogValue.minimum +observe.validation.route.invalid.quadrant +observe.validation.route.invalid.startLogValue +observe.validation.route.invalid.time +observe.validation.route.missing.activityFinDeVeille +observe.validation.route.positive.startLogValue +observe.validation.route.unclosed.activity +observe.validation.samplePart.required.sizeMeasureType.for.length +observe.validation.samplePart.required.weightMeasureType.for.weight +observe.validation.schoolEstimate.species.uniqueKey +observe.validation.set.bound.delay +observe.validation.set.delay.too.long +observe.validation.set.endDate.after.endPursingDate +observe.validation.set.endPursingDate.after.date +observe.validation.set.endPursingTimeStamp.after.startTime +observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp +observe.validation.set.size.supportVesselName +observe.validation.set.startTime.after.time +observe.validation.setLongline.baitsComposition.uniqueKey +observe.validation.setLongline.branchlinesComposition.uniqueKey +observe.validation.setLongline.duplicated.homeId +observe.validation.setLongline.duplicated.number +observe.validation.setLongline.floatlinesComposition.uniqueKey +observe.validation.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp +observe.validation.setLongline.hooksComposition.uniqueKey +observe.validation.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp +observe.validation.setLongline.settingStartTimeStamp.before.settingEndTimeStamp +observe.validation.species.length.bound +observe.validation.species.weight.bound +observe.validation.targetCatch.uniqueKey +observe.validation.targetDiscarded.uniqueKey +observe.validation.targetLength.bound.length +observe.validation.targetLength.bound.weight +observe.validation.targetLength.positive.length +observe.validation.targetLength.positive.weight +observe.validation.targetLength.required.taille +observe.validation.targetLength.required.weight.or.taille +observe.validation.tdr.deployementStart.before.fishingStart +observe.validation.tdr.fishingEnd.before.deployementEnd +observe.validation.tdr.fishingStart.before.fishingEnd +observe.validation.tdr.required.position +observe.validation.trip.endDate.after.now +observe.validation.trip.endDate.after.startDate +observe.validation.trip.invalid.date +observe.validation.trip.invalid.endDate +observe.validation.trip.invalid.formsUrl +observe.validation.trip.invalid.loch +observe.validation.trip.invalid.reportsUrl +observe.validation.trip.invalid.startDate +observe.validation.trip.startDate.after.now observe.validation.tripLongline.unclosed.activity +observe.validation.tripSeine.unclosed.route View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/990dc64cf1382586cfe6c2661a78... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/990dc64cf1382586cfe6c2661a78... You're receiving this email because of your account on gitlab.com.