April 2018 - T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][develop] 2 commits: Améliorer les temps de traitement du N2 (See #324)
by Tony CHEMIT 18 Apr '18

18 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 5d8cb811 by Tony CHEMIT at 2018-04-18T10:02:53Z Améliorer les temps de traitement du N2 (See #324) - - - - - f6517ee6 by Tony CHEMIT at 2018-04-18T10:04:04Z [N2] A propos des résultats d'un traitement avec catégories de poids dans la stratification (Closes #317) - - - - - 9 changed files: - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java - t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java - t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java Changes: ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java @@ -229,4 +229,15 @@ public class L2CatchStratum extends CatchStratum<Level2Configuration, Level2Acti return sampleWeightModelFroAllSpecies; } + public void resetCorrectedElementaryCatches() { + for (Activity activity : getActivities().keySet()) { + if (activity.isCorrectedElementaryCatchNotEmpty()) { + for (CorrectedElementaryCatch correctedElementaryCatch : activity.getCorrectedElementaryCatch()) { + if (correctedElementaryCatch.getCorrectedCatchWeight()==null) { + correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); + } + } + } + } + } } ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java @@ -155,8 +155,9 @@ public class Level2Action extends T3Action<Level2Configuration> { Collections.singleton(SchoolTypeTopiaDao.SCHOOL_TYPE_INDETERMINATE_ID), stratumConfiguration.getBeginDate(), stratumConfiguration.getEndDate()).keySet(); + inputContext.loadActivities(activityIds); for (String activityId : activityIds) { - for (CorrectedElementaryCatch correctedElementaryCatch : inputContext.getCorrectedElementaryCatch(activityId)) { + for (CorrectedElementaryCatch correctedElementaryCatch : inputContext.getActivityCache().forId(activityId).getCorrectedElementaryCatch()) { correctedElementaryCatch.setCorrectedCatchWeight(correctedElementaryCatch.getCatchWeight()); } } @@ -173,6 +174,9 @@ public class Level2Action extends T3Action<Level2Configuration> { result.setSubstitutionLevel(0); incrementsProgression(); } else { + catchStratum.resetCorrectedElementaryCatches(); + //flushTransaction("clean stratum " + stratumConfiguration.getStratumIndex()); + // compute sample stratum try (L2SampleStratum sampleStratum = L2SampleStratum.newSampleStratum(stratumConfiguration, catchStratum, weightCategories, species, this)) { incrementsProgression(); @@ -187,6 +191,8 @@ public class Level2Action extends T3Action<Level2Configuration> { addWarningMessage(message); // mark it as 999 level to make it appear at top of a reverse list result.setSubstitutionLevel(999); + result.addNbActivities(catchStratum.getNbActivities()); + result.addNbActivitiesWithSample(catchStratum.getNbActivitiesWithSample()); // Fill back CorrectedElementaryCatch.CatchWeight to CorrectedElementaryCatch.CorrectedCatchWeight int activityIndex = 1; int nbActivities = catchStratum.getNbActivities(); ===================================== t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java ===================================== --- a/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java +++ b/t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java @@ -196,6 +196,8 @@ public class Level3Action extends T3Action<Level3Configuration> { addWarningMessage(message); // mark it as 999 level to make it appear at top of a reverse list result.setSubstitutionLevel(999); + result.addNbActivities(catchStratum.getNbActivities()); + result.addNbActivitiesWithSample(catchStratum.getNbActivitiesWithSample()); // FIXME-269 Should we fill at least stratumLevelN3? } else { // can use this sampleStratum ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java @@ -67,6 +67,7 @@ public abstract class CatchStratumLoader<C extends LevelConfigurationWithStratum protected Map<Activity, Integer> filterActivities(S configuration, Map<String, Integer> activityIds) { Map<Activity, Integer> result = new HashMap<>(); if (activityIds != null && activityIds.size() > 0) { + configuration.loadActivities(activityIds.keySet()); Set<Vessel> possibleVessels = configuration.getPossibleCatchVessels(); WeightCategoryTreatment weightCategoryTreatment = configuration.getWeightCategoryTreatment(); for (Map.Entry<String, Integer> e : activityIds.entrySet()) { ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelInputContext.java @@ -274,4 +274,8 @@ public abstract class LevelInputContext<C extends LevelConfigurationWithStratum, public void clear() { activityCache.clear(); } + + public void loadActivities(Set<String> activityIds) { + activityCache.load(activityIds); + } } ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java @@ -163,6 +163,7 @@ public abstract class SampleStratumLoader<C extends LevelConfigurationWithStratu Set<Activity> result = new HashSet<>(); T configuration = getSampleStratum().getConfiguration(); Set<Vessel> possibleVessels = configuration.getPossibleSampleVessels(); + configuration.loadActivities(activityIds); WeightCategoryTreatment weightCategoryTreatment = configuration.getWeightCategoryTreatment(); for (String activityId : activityIds) { Activity activity = configuration.getActivity(activityId); ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/StratumConfiguration.java @@ -187,6 +187,10 @@ public class StratumConfiguration<C extends LevelConfigurationWithStratum, A ext return inputContext.getActivityCache().forId(activityId); } + public void loadActivities(Set<String> activityIds) { + inputContext.getActivityCache().load(activityIds); + } + @Override public String toString() { return String.format("%s [schoolType: %s, zone: %s, startDate:%s, endDate:%s, weightCategory: %s]", super.toString(), schoolType.getLabel1(), zone.getTopiaId(), beginDate, endDate, weightCategoryTreatment); ===================================== t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/cache/ActivityCache.java @@ -25,8 +25,11 @@ import fr.ird.t3.entities.data.ActivityTopiaDao; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.util.LinkedHashSet; import java.util.Map; +import java.util.Set; import java.util.TreeMap; +import java.util.TreeSet; /** * Created by tchemit on 23/03/2018. @@ -47,13 +50,32 @@ public class ActivityCache { public Activity forId(String activityId) { Activity result = cache.get(activityId); if (result == null) { - log.info(String.format("Cache Activity [%d] for %s", cache.size(), activityId)); + log.debug(String.format("Cache Activity [%d] for %s", cache.size(), activityId)); cache.put(activityId, result = activityDAO.forTopiaIdEquals(activityId).findUnique()); + if (cache.size() % 100 == 0) { + log.info(String.format("Cache Activity [%d]", cache.size())); + } } return result; } + public void load(Set<String> ids) { + Set<String> result = new LinkedHashSet<>(ids); + result.removeAll(cache.keySet()); + if (!result.isEmpty()) { + for (Activity activity : activityDAO.forTopiaIdIn(result).findAll()) { + String activityId = activity.getTopiaId(); + log.debug(String.format("Cache Activity [%d] for %s", cache.size(), activityId)); + cache.put(activityId, activity); + if (cache.size() % 100 == 0) { + log.info(String.format("Cache Activity [%d]", cache.size())); + } + } + } + } + public void clear() { + log.info(String.format("Clear Cache Activity [%d]", cache.size())); cache.clear(); } } ===================================== t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/models/WeightCompositionModelHelper.java @@ -190,14 +190,16 @@ public final class WeightCompositionModelHelper { inResume ); } - WeightCompositionModelHelper.decorateModel( - header, - decoratorService, - model, - subModel, - null, - inResume - ); + if (model.getWeightCategories().size() > 1) { + WeightCompositionModelHelper.decorateModel( + header, + decoratorService, + model, + subModel, + null, + inResume + ); + } return inResume.toString(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fec55645f64315b5ef79ed2a98fed58… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/fec55645f64315b5ef79ed2a98fed58… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] 4 commits: clean code
by Tony CHEMIT 16 Apr '18

16 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 0b319d95 by Tony CHEMIT at 2018-04-15T15:20:29Z clean code - - - - - 48f2b301 by Tony CHEMIT at 2018-04-16T09:24:23Z [CONNEXION] Traiter l'exception lorsque la base PG accédée n'existe pas (closes #319) - - - - - eddf203a by Tony CHEMIT at 2018-04-16T09:24:54Z update config version - - - - - fec55645 by Tony CHEMIT at 2018-04-16T09:25:16Z Add more logs files - - - - - 12 changed files: - pom.xml - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java - t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java - t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java - t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java - t3-domain/src/main/resources/t3-log4j.conf - t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java - t3-web/src/main/resources/i18n/t3-web_en_GB.properties - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties - t3-web/src/main/webapp/css/screen.css Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -102,7 +102,7 @@ <applicationName>t3</applicationName> <t3-data.version>1.9</t3-data.version> <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> - <lib.version.java4all.config>1.0.2-SNAPSHOT</lib.version.java4all.config> + <lib.version.java4all.config>1.0.2</lib.version.java4all.config> <env>dev</env> <skipITs>true</skipITs> ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java @@ -110,7 +110,7 @@ public abstract class LevelOutputContext<C extends LevelConfigurationWithStratum } List<Integer> result = new ArrayList<>(levels); Collections.reverse(result); - return result.toArray(new Integer[result.size()]); + return result.toArray(new Integer[0]); } public long getTotalCatchActivitiesWithSample() { ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java @@ -108,12 +108,12 @@ public abstract class AbstractT3InputMSAccess implements T3Input { @Override public String[] getAnalyzeErrors() { - return errors.toArray(new String[errors.size()]); + return errors.toArray(new String[0]); } @Override public String[] getAnalyzeWarnings() { - return warnings.toArray(new String[warnings.size()]); + return warnings.toArray(new String[0]); } @Override ===================================== t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java +++ b/t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessDataSource.java @@ -51,7 +51,7 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T @Override protected T3AccessEntityMeta[] newMetaArray(Collection<T3AccessEntityMeta> table) { - return table.toArray(new T3AccessEntityMeta[table.size()]); + return table.toArray(new T3AccessEntityMeta[0]); } @Override @@ -84,7 +84,7 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T Collections.addAll(buffer, meta.getErrors()); } } - return buffer.toArray(new String[buffer.size()]); + return buffer.toArray(new String[0]); } public String[] getWarnings() { @@ -94,7 +94,7 @@ public class T3AccessDataSource extends AbstractAccessDataSource<T3EntityEnum, T Collections.addAll(buffer, meta.getWarnings()); } } - return buffer.toArray(new String[buffer.size()]); + return buffer.toArray(new String[0]); } public void analyzeDb(T3AccessHitModel hits) throws Exception { ===================================== t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/models/SpeciesCountModelHelper.java @@ -115,7 +115,7 @@ public class SpeciesCountModelHelper { header.setHeader( String.format( lineFormat.toString(), - (Object[]) headerParams.toArray(new Object[headerParams.size()]))); + (Object[]) headerParams.toArray(new Object[0]))); header.setCategoryFormat("| %1$-" + (totalLength) + "s |\n"); @@ -158,7 +158,7 @@ public class SpeciesCountModelHelper { inResume.append( String.format( lineFormat.toString(), - (Object[]) params.toArray(new Object[params.size()]))); + (Object[]) params.toArray(new Object[0]))); } @@ -176,7 +176,7 @@ public class SpeciesCountModelHelper { inResume.append( String.format( lineFormat.toString(), - (Object[]) params.toArray(new Object[params.size()]))); + (Object[]) params.toArray(new Object[0]))); } @@ -192,7 +192,7 @@ public class SpeciesCountModelHelper { inResume.append( String.format( lineFormat.toString(), - (Object[]) params.toArray(new Object[params.size()]))); + (Object[]) params.toArray(new Object[0]))); inResume.append(header.getBottomSeparatorFormat()); return inResume.toString(); ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3InputService.java @@ -42,7 +42,7 @@ public class T3InputService extends T3ServiceSupport implements T3ServiceSinglet for (T3InputProvider provider : ServiceLoader.load(T3InputProvider.class)) { result.add(provider); } - providers = result.toArray(new T3InputProvider[result.size()]); + providers = result.toArray(new T3InputProvider[0]); } return providers; } ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3OutputService.java @@ -44,7 +44,7 @@ public class T3OutputService extends T3ServiceSupport implements T3ServiceSingle for (T3OutputProvider<?, ?> provider : ServiceLoader.load(T3OutputProvider.class)) { result.add(provider); } - providers = result.toArray(new T3OutputProvider[result.size()]); + providers = result.toArray(new T3OutputProvider[0]); } return providers; } ===================================== t3-domain/src/main/resources/t3-log4j.conf ===================================== --- a/t3-domain/src/main/resources/t3-log4j.conf +++ b/t3-domain/src/main/resources/t3-log4j.conf @@ -11,7 +11,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n log4j.appender.file=org.apache.log4j.RollingFileAppender log4j.appender.file.File=${user.log.directory}/t3.log log4j.appender.file.MaxFileSize=10MB -log4j.appender.file.MaxBackupIndex=4 +log4j.appender.file.MaxBackupIndex=30 log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] (%c:%L) %M - %m%n ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/SelectUserInputDatabaseAction.java @@ -21,6 +21,7 @@ package fr.ird.t3.web.actions; import com.opensymphony.xwork2.Preparable; +import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.user.JdbcConfiguration; import fr.ird.t3.entities.user.T3User; import fr.ird.t3.entities.user.UserDatabase; @@ -28,6 +29,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.sql.SQLException; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -83,6 +85,12 @@ public class SelectUserInputDatabaseAction extends T3ActionSupport implements Pr @Override public String execute() { // set the selected database in session + try { + T3EntityHelper.checkJDBCConnection(getDatabase()); + } catch (SQLException e) { + addActionError(t("t3.message.error.open.database", getDatabase().getUrl(), e.getMessage())); + return ERROR; + } getT3Session().initDatabaseConfiguration(getDatabase()); return SUCCESS; } ===================================== t3-web/src/main/resources/i18n/t3-web_en_GB.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_en_GB.properties +++ b/t3-web/src/main/resources/i18n/t3-web_en_GB.properties @@ -376,6 +376,7 @@ t3.menu.treatment.level3.launch=Start a level 3 treatment t3.message.discovered.trip.to.insert=La marée %s peut être importée dans T3 t3.message.discovered.trip.to.replace=La marée %s existe déjà dans T3 et peut être importée t3.message.discovered.unsafe.trip=La marée %s ne peut pas être importée dans T3 +t3.message.error.open.database=Could not open selected database [%s]\: %s t3.message.missingActionContext=Action could not be done (no action context found), start it from the beginning t3.message.missingLevel1Configuration=No configuration registred for level 1 treatment. t3.message.missingLevel2Configuration=No configuration registred for level 2 treatment. ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -376,6 +376,7 @@ t3.menu.treatment.level3.launch=Lancer un traitement de niveau 3 t3.message.discovered.trip.to.insert=La marée %s peut être importée dans T3 t3.message.discovered.trip.to.replace=La marée %s existe déjà dans T3 et peut être importée t3.message.discovered.unsafe.trip=La marée %s ne peut pas être importée dans T3 +t3.message.error.open.database=Impossible d'ouvrir la base sélectionnée [%s] \: %s t3.message.missingActionContext=L'action ne peut pas être réalisée, veuillez la reprendre depuis le début. t3.message.missingLevel1Configuration=Aucune configuration enregistrée pour les traitements du niveau 1. t3.message.missingLevel2Configuration=Aucune configuration enregistrée pour les traitements du niveau 2. ===================================== t3-web/src/main/webapp/css/screen.css ===================================== --- a/t3-web/src/main/webapp/css/screen.css +++ b/t3-web/src/main/webapp/css/screen.css @@ -79,7 +79,7 @@ font-size: 11px; .info_error { background: no-repeat scroll 8px 5px #FFE3E3; border: 2px solid #DD0000; - width: 800px; + /*width: 1000px;*/ margin-bottom: 5px; } .info_error ul{ View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/de2f1e0d68db496af6af2b589e9a791… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/de2f1e0d68db496af6af2b589e9a791… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [N2] Question sur le log N2 (closes #316)
by Tony CHEMIT 15 Apr '18

15 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: de2f1e0d by Tony CHEMIT at 2018-04-15T15:19:02Z [N2] Question sur le log N2 (closes #316) - - - - - 5 changed files: - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl - t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl - t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java Changes: ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action.ftl @@ -82,12 +82,13 @@ Qualité des strates échantillons : Indicateurs ----------- -- Nombre de strates : ${output.nbStratum} -- Nombre de strates corrigés : ${output.nbStrataFixed} -- Nombre d'activités traités : ${output.totalCatchActivities} -- Nombre d'activités traités (avec échantillon) : ${output.totalCatchActivitiesWithSample} -- Poids total (toute espèce confondue) : ${output.totalCatchWeight} -- Poids total (pour les espèces à corriger) : ${output.totalCatchWeightForSpeciesFoFix} +- Nombre de strates : ${output.nbStratum} +- Nombre de strates corrigés : ${output.nbStrataFixed} +- Nombre total d'activités traitées : ${output.totalCatchActivities} +- Nombre d'activités traitées (avec échantillon) : ${output.totalCatchActivitiesWithSample} +- Nombre d'activités traitées (sans échantillon) : ${output.totalCatchActivitiesWithoutSample} +- Poids total (toute espèce confondue) : ${output.totalCatchWeight} +- Poids total (pour les espèces à corriger) : ${output.totalCatchWeightForSpeciesFoFix} ${output.inputCatchStratumLog} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level2/Level2Action_en.ftl @@ -81,12 +81,13 @@ Quality of sample stratum: Indicators ---------- -- Number of stratums: ${output.nbStratum} -- Number of treated stratums: ${output.nbStrataFixed} -- Number of treated sets: ${output.totalCatchActivities} -- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} -- Total weight (for all species): ${output.totalCatchWeight} -- total weight (for species to fix): ${output.totalCatchWeightForSpeciesFoFix} +- Number of strata: ${output.nbStratum} +- Number of treated strata: ${output.nbStrataFixed} +- Total number of treated sets: ${output.totalCatchActivities} +- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} +- Number of treated sets (without samples): ${output.totalCatchActivitiesWithoutSample} +- Total weight (for all species): ${output.totalCatchWeight} +- total weight (for species to fix): ${output.totalCatchWeightForSpeciesFoFix} ${output.inputCatchStratumLog} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action.ftl @@ -86,8 +86,9 @@ Indicateurs - Nombre de strates : ${output.nbStratum} - Nombre de strates corrigés : ${output.nbStrataFixed} -- Nombre d'activités traités : ${output.totalCatchActivities} -- Nombre d'activités traités (avec échantillon) : ${output.totalCatchActivitiesWithSample} +- Nombre total d'activités traitées : ${output.totalCatchActivities} +- Nombre d'activités traitées (avec échantillon) : ${output.totalCatchActivitiesWithSample} +- Nombre d'activités traitées (sans échantillon) : ${output.totalCatchActivitiesWithoutSample} ${output.totalFishesCountResume} ===================================== t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl ===================================== --- a/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl +++ b/t3-actions/src/main/resources/ftl/fr/ird/t3/actions/data/level3/Level3Action_en.ftl @@ -84,10 +84,11 @@ Quality of sample stratum: Indicators ---------- -- Number of stratums: ${output.nbStratum} -- Number of treated stratums: ${output.nbStrataFixed} -- Number of treated sets: ${output.totalCatchActivities} -- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} +- Number of strata: ${output.nbStratum} +- Number of treated strata: ${output.nbStrataFixed} +- Total number of treated sets: ${output.totalCatchActivities} +- Number of treated sets (with samples): ${output.totalCatchActivitiesWithSample} +- Number of treated sets (without samples): ${output.totalCatchActivitiesWithoutSample} ${output.totalFishesCountResume} ===================================== t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/stratum/LevelOutputContext.java @@ -117,6 +117,10 @@ public abstract class LevelOutputContext<C extends LevelConfigurationWithStratum return totalCatchActivitiesWithSample; } + public long getTotalCatchActivitiesWithoutSample() { + return totalCatchActivities - totalCatchActivitiesWithSample; + } + public Collection<R> getStratumResult(int level) { Set<R> singleResult = new LinkedHashSet<>(); for (R stratumResult : stratumResultSet) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/de2f1e0d68db496af6af2b589e9a7917… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/de2f1e0d68db496af6af2b589e9a7917… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] [INSTALLEUR] Améliorer le lancement de l'installeur (ne plus éditer un fichier…
by Tony CHEMIT 15 Apr '18

15 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: bdbead0f by Tony CHEMIT at 2018-04-15T14:55:51Z [INSTALLEUR] Améliorer le lancement de l'installeur (ne plus éditer un fichier avant le démarrage) (Closes #315) - - - - - 10 changed files: - pom.xml - src/site/markdown/installer.md.vm - t3-installer/pom.xml - − t3-installer/src/main/assembly/dist/db.properties - + t3-installer/src/main/assembly/dist/help.bat - + t3-installer/src/main/assembly/dist/help.sh - t3-installer/src/main/config/T3Installer.ini - t3-installer/src/main/java/fr/ird/t3/console/T3Console.java - t3-domain/src/main/java/fr/ird/t3/console/T3DatabaseTool.java → t3-installer/src/main/java/fr/ird/t3/console/T3DatabaseTool.java - t3-installer/src/test/resources/log4j.properties Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,7 @@ <applicationName>t3</applicationName> <t3-data.version>1.9</t3-data.version> <lib.version.java4all.i18n>4.0-alpha-11</lib.version.java4all.i18n> + <lib.version.java4all.config>1.0.2-SNAPSHOT</lib.version.java4all.config> <env>dev</env> <skipITs>true</skipITs> ===================================== src/site/markdown/installer.md.vm ===================================== --- a/src/site/markdown/installer.md.vm +++ b/src/site/markdown/installer.md.vm @@ -27,13 +27,14 @@ Après téléchargement, on dézippe l'archive et on obtient l'arborescence suiv t3-installer-${project.version} ├── create-db.bat (1) ├── create-db.sh (1) + ├── help.bat (1) + ├── help.sh (1) ├── fill-db.bat (1) ├── fill-db.sh (1) - ├── db.properties (2) - ├── translate.sh - ├── translate.bat + ├── translate.sh (1) + ├── translate.bat (1) ├── README.md - ├── scripts (3) + ├── scripts (2) │ ├── ddl │ ├── h2 │ ├── referential @@ -41,25 +42,8 @@ Après téléchargement, on dézippe l'archive et on obtient l'arborescence suiv └── t3-installer-${project.version}.jar ``` -1. les scripts de lancements -2. le fichier où enregister la configuration de la base postgres -3. Répertoire des scripts offert par l'installeur - -### Configuration de la base à remplir - -Le fichier *db.properties* contient la configuration de connection aux bases. - -L'utilisateur doit avoir les droits de création de bases et être super-utilisateur, il sera le propriétaire de toutes les bases créées. - -Par défaut, il contient la configuration suivante: -``` -# Super user login that can create and should be also owner of all t3 databases -login=t3-admin -# Super user password that can create and should be also owner of all t3 databases -password=a -# Url pattern used to connect to any base -url=jdbc:postgresql:%s -``` +1. les scripts +2. Répertoire des scripts offert par l'installeur # Créer une nouvelle base @@ -73,6 +57,14 @@ Sous windows create-db.bat dbName ``` +Trois questions vous seront posées (login, password, url). + +Si les réponses vont conviennent, vous n'avez qu'à presser la touche **Entrée**. + +Les réponses sont sauvegardée dans un fichier nommé **t3-installer.conf** dans le répertoire où vous lancer la commande. + +Son contenu est relu à chaque nouveau lancement. + # Remplir une nouvelle base **Il faut que la base soit créée (mais sans schéma) et que l'extension postgis soit installée**. @@ -87,6 +79,8 @@ Sous windows fill-db.bat dbName ``` +Comme pour la commande Créer une nouvelle base, trois questions vous seront posées... + # Traduire l'application Sous Linux, Mac @@ -98,3 +92,15 @@ Sous windows ``` translate.bat ``` + +# Aide + +Sous Linux, Mac +``` + sh help.sh +``` + +Sous windows +``` + help.bat +``` ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -64,10 +64,29 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> + <artifactId>i18n-api</artifactId> + </dependency> + <dependency> + <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-editor</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> <scope>runtime</scope> ===================================== t3-installer/src/main/assembly/dist/db.properties deleted ===================================== --- a/t3-installer/src/main/assembly/dist/db.properties +++ /dev/null @@ -1,27 +0,0 @@ -### -# #%L -# T3 :: Installer -# %% -# Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### - -# Super user login that can create and should be also owner of all t3 databases -login=t3-admin -# Super user password that can create and should be also owner of all t3 databases -password=a -# Url pattern used to connect to any base (if you need to change it, please keep the %s, it will be replaced by db name) -url=jdbc:postgresql:%s \ No newline at end of file ===================================== t3-installer/src/main/assembly/dist/help.bat ===================================== --- /dev/null +++ b/t3-installer/src/main/assembly/dist/help.bat @@ -0,0 +1 @@ +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --help \ No newline at end of file ===================================== t3-installer/src/main/assembly/dist/help.sh ===================================== --- /dev/null +++ b/t3-installer/src/main/assembly/dist/help.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --help ===================================== t3-installer/src/main/config/T3Installer.ini ===================================== --- a/t3-installer/src/main/config/T3Installer.ini +++ b/t3-installer/src/main/config/T3Installer.ini @@ -1,11 +1,49 @@ +description = T3 Installer Config + +[option filename] +description = Config filename +key = config.file +type = string +defaultValue = t3-installer.conf + + +[option login] +description = Login +key = login +type = string + +[option password] +description = Password +key = password +type = string + +[option dbName] +description = Database's name +key = dbName +type = string + +[option url] +description = Jdbc connection url +key = url +type = string +defaultValue = jdbc:postgresql:${dbName} + [action createDb] +description = To create a new database (requires one argument: dbName) action = fr.ird.t3.console.T3DatabaseTool#create aliases = --create-db [action fillDb] +description = To fill a database (requires one argument: dbName) action = fr.ird.t3.console.T3DatabaseTool#fill aliases = --fill-db [action translate] +description = Launch T3 Translate tool action = fr.ird.t3.console.T3I18nTool#start -aliases = --translate +aliases = --translate, -t + +[action help] +description = Display help +action = fr.ird.t3.console.T3Console#help +aliases = --help, -h ===================================== t3-installer/src/main/java/fr/ird/t3/console/T3Console.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java +++ b/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java @@ -21,13 +21,15 @@ package fr.ird.t3.console; * #L% */ -import fr.ird.t3.T3Config; import fr.ird.t3.installer.T3InstallerConfig; -import io.ultreia.java4all.config.ApplicationConfig; +import io.ultreia.java4all.config.ApplicationConfigInit; +import io.ultreia.java4all.config.ApplicationConfigScope; +import io.ultreia.java4all.config.ArgumentsParserException; -import java.io.File; +import java.io.Console; import java.util.Arrays; import java.util.Date; +import java.util.Objects; /** * Created by tchemit on 13/03/2018. @@ -39,13 +41,70 @@ public class T3Console { public static void main(String... args) throws Exception { System.out.printf("Starting T3 Console with arguments: %s at %s %n", Arrays.toString(args), new Date()); - T3Config config = new T3Config(); - config.parse(); - config.setScriptsDirectory(new File("scripts")); - T3Config.set(config); + if (args.length == 0) { + throw new IllegalArgumentException("Need at least one argument. Try with --help to get details."); + } - ApplicationConfig installerConfig = new T3InstallerConfig().get(); - installerConfig.parse(args); - installerConfig.doAllAction(); + T3InstallerConfig installerConfig; + + String action = args[0]; + + if (action.contains("db")) { + + if (args.length != 2) { + throw new IllegalArgumentException(String.format("Need one arguments for command %s. Try with --help to get details.", action)); + } + + installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM).setConfigFileName(args[1])); + installerConfig.get().parse(args); + + Console console = System.console(); + + String login = readValue(console, "Login", installerConfig.getLogin()); + if (login != null) { + installerConfig.setLogin(login); + } + String password = readValue(console, "Password", installerConfig.getPassword()); + if (password != null) { + installerConfig.setPassword(password); + } + String url = readValue(console, "Url", installerConfig.getUrl()); + if (url != null) { + installerConfig.setUrl(url); + } + installerConfig.get().saveForCurrent(); + } else { + + installerConfig = new T3InstallerConfig(); + installerConfig.get().parse(args); + + } + installerConfig.get().doAllAction(); + } + + private static String readValue(Console console, String fieldName, String fieldValue) { + String result = null; + while (result == null) { + console.printf("%s [%s]: ", fieldName, fieldValue == null ? "Not defined" : fieldValue); + result = console.readLine().trim(); + if (fieldValue == null) { + if (result.isEmpty()) { + result = null; + } + } else { + if (result.isEmpty()) { + result = fieldValue; + } + } + } + + return Objects.equals(fieldValue, result) ? null : result; + } + + public void help() throws ArgumentsParserException { + T3InstallerConfig config = new T3InstallerConfig(); + + config.get().parse(); + System.out.println(config.getConfigurationDescription()); } } ===================================== t3-domain/src/main/java/fr/ird/t3/console/T3DatabaseTool.java → t3-installer/src/main/java/fr/ird/t3/console/T3DatabaseTool.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/console/T3DatabaseTool.java +++ b/t3-installer/src/main/java/fr/ird/t3/console/T3DatabaseTool.java @@ -2,7 +2,7 @@ package fr.ird.t3.console; /*- * #%L - * T3 :: Domain + * T3 :: Installer * %% * Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io * %% @@ -10,25 +10,26 @@ package fr.ird.t3.console; * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ import com.google.common.base.Preconditions; -import fr.ird.t3.T3Config; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3JdbcHelper; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaApplicationContextBuilder; import fr.ird.t3.entities.user.JdbcConfiguration; +import fr.ird.t3.installer.T3InstallerConfigOption; +import io.ultreia.java4all.config.ApplicationConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; @@ -37,7 +38,6 @@ import org.nuiton.util.FileUtil; import org.nuiton.util.ZipUtil; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.sql.Connection; import java.sql.DriverManager; @@ -47,7 +47,6 @@ import java.sql.SQLException; import java.util.List; import java.util.Locale; import java.util.Objects; -import java.util.Properties; /** * Tool around T3 database. @@ -60,25 +59,27 @@ public class T3DatabaseTool { private static final Log log = LogFactory.getLog(T3DatabaseTool.class); + private final ApplicationConfig config; + + public T3DatabaseTool(ApplicationConfig config) { + this.config = config; + } + @SuppressWarnings("unused") - public void create(File connectionFile, String databaseName) throws IOException, SQLException { - createOrFill(connectionFile, databaseName, true); + public void create(String databaseName) throws IOException, SQLException { + createOrFill(databaseName, true); } @SuppressWarnings("unused") - public void fill(File connectionFile, String databaseName) throws IOException, SQLException { - createOrFill(connectionFile, databaseName, false); + public void fill(String databaseName) throws IOException, SQLException { + createOrFill(databaseName, false); } - private void createOrFill(File connectionFile, String databaseName, boolean create) throws IOException, SQLException { + private void createOrFill(String databaseName, boolean create) throws IOException, SQLException { - Objects.requireNonNull(connectionFile); - Preconditions.checkArgument(connectionFile.exists(), String.format("%s was not found!", connectionFile)); Objects.requireNonNull(databaseName); - T3Config config = Objects.requireNonNull(T3Config.instance()); - - File scriptsDirectory = config.getScriptsDirectory(); + File scriptsDirectory = new File(new File("scripts").getAbsolutePath()); Preconditions.checkArgument(scriptsDirectory.exists(), String.format("%s was not found!", scriptsDirectory)); File ddlDirectory = new File(scriptsDirectory, "ddl"); @@ -93,7 +94,7 @@ public class T3DatabaseTool { File[] postgisDataFiles = Objects.requireNonNull(postgisDataScript.listFiles((dir, name) -> name.endsWith(".zip"))); log.info("1/5 - Setup and connect to database..."); - T3TopiaApplicationContext applicationContext = setup(connectionFile, databaseName, create); + T3TopiaApplicationContext applicationContext = setup(databaseName, create); try { log.info("2/5 - Create database schema..."); @@ -121,19 +122,14 @@ public class T3DatabaseTool { } } - private T3TopiaApplicationContext setup(File connectionFile, String databaseName, boolean create) throws IOException, SQLException { + private T3TopiaApplicationContext setup(String databaseName, boolean create) throws SQLException { DefaultI18nInitializer i18nInitializer = new DefaultI18nInitializer("t3-i18n"); i18nInitializer.setMissingKeyReturnNull(true); I18n.init(i18nInitializer, Locale.getDefault()); - Properties p = new Properties(); - try (FileInputStream inputStream = new FileInputStream(connectionFile)) { - p.load(inputStream); - } - - String login = Objects.requireNonNull(p.getProperty("login"), String.format("login property not found in file %s", connectionFile)); - String password = Objects.requireNonNull(p.getProperty("password"), String.format("password property not found in file %s", connectionFile)); - String urlPattern = Objects.requireNonNull(p.getProperty("url"), String.format("url property not found in file %s", connectionFile)); + String login = Objects.requireNonNull(config.getOption(T3InstallerConfigOption.LOGIN.getKey())); + String password = Objects.requireNonNull(config.getOption(T3InstallerConfigOption.PASSWORD.getKey())); + String urlPattern = Objects.requireNonNull(config.getOption(T3InstallerConfigOption.URL.getKey())); String adminUrl = String.format(urlPattern, "postgres"); try (Connection connection = DriverManager.getConnection(adminUrl, login, password)) { ===================================== t3-installer/src/test/resources/log4j.properties ===================================== --- a/t3-installer/src/test/resources/log4j.properties +++ b/t3-installer/src/test/resources/log4j.properties @@ -1,6 +1,6 @@ ### # #%L -# T3 :: Test +# T3 :: Installer # %% # Copyright (C) 2010 - 2018 IRD, Code Lutin, Ultreia.io # %% View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/bdbead0f7f51591c6093c6df6eb252a5… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/bdbead0f7f51591c6093c6df6eb252a5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use last pom + improve configuration
by Tony CHEMIT 15 Apr '18

15 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ab09e865 by Tony CHEMIT at 2018-04-15T12:44:23Z use last pom + improve configuration - - - - - 3 changed files: - .gitlab-ci.yml - pom.xml - t3-installer/pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat .create-docker: &create-docker environment: name: docker - image: registry.gitlab.com/ultreiaio/docker/docker:latest + image: registry.gitlab.com/ultreiaio-infra/docker/docker:latest services: - docker:dind script: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.29</version> + <version>2018.31</version> </parent> <groupId>fr.ird.t3</groupId> @@ -270,6 +270,17 @@ </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/www/t3/private</url> + <skipIfExists>true</skipIfExists> + </configuration> + </plugin> + + </plugins> </pluginManagement> <plugins> @@ -368,7 +379,7 @@ <plugin> <groupId>io.ultreia.java4all.config</groupId> <artifactId>config-maven-plugin</artifactId> - <version>${lib.version.nuiton.config}</version> + <version>${lib.version.java4all.config}</version> <inherited>false</inherited> <reportSets> <reportSet> @@ -522,18 +533,6 @@ </profile> <profile> - <id>load-test-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/test</exists> - </file> - </activation> - <properties> - <test.cache.skip>true</test.cache.skip> - </properties> - </profile> - - <profile> <id>load-test-data</id> <activation> <file> @@ -575,11 +574,8 @@ <goal>download-single</goal> </goals> <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/www/t3/private</url> <fromFile>t3-data-${t3-data.version}-h2.zip</fromFile> <toDir>${test.cache.dir}</toDir> - <skip>${test.cache.skip}</skip> </configuration> </execution> </executions> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -161,10 +161,7 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/www/t3/private</url> <toDir>${installer.cache.dir}</toDir> - <skip>${installer.cache.skip}</skip> </configuration> <executions> <execution> @@ -236,16 +233,5 @@ </build> </profile> - <profile> - <id>load-installer-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/installer</exists> - </file> - </activation> - <properties> - <installer.cache.skip>true</installer.cache.skip> - </properties> - </profile> </profiles> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ab09e8651be5ba75499ce81335e3328a… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ab09e8651be5ba75499ce81335e3328a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use new java4all config lib + last pom
by Tony CHEMIT 14 Apr '18

14 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: cad84436 by Tony CHEMIT at 2018-04-14T22:45:35Z use new java4all config lib + last pom - - - - - 6 changed files: - pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-installer/pom.xml - t3-installer/src/main/java/fr/ird/t3/console/T3Console.java - t3-web/src/license/THIRD-PARTY.properties Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.25</version> + <version>2018.29</version> </parent> <groupId>fr.ird.t3</groupId> @@ -283,13 +284,13 @@ <configuration>  <tasks> - <echo message="Copy model to site" /> + <echo message="Copy model to site"/> <copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model"> <fileset dir="${basedir}/doc/modelisation/t3"> - <include name="**/*.png" /> + <include name="**/*.png"/> </fileset> <fileset dir="${basedir}/t3-domain/src/main/xmi"> - <include name="t3-persistence.zargo" /> + <include name="t3-persistence.zargo"/> </fileset> </copy> </tasks> @@ -366,7 +367,7 @@ <plugin> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config-maven-plugin</artifactId> + <artifactId>config-maven-plugin</artifactId> <version>${lib.version.nuiton.config}</version> <inherited>false</inherited> <reportSets> @@ -476,8 +477,8 @@ <configuration>  <tasks> - <echo message="Delete test data cache at ${test.cache.dir}" /> - <delete dir="${test.cache.dir}" /> + <echo message="Delete test data cache at ${test.cache.dir}"/> + <delete dir="${test.cache.dir}"/> </tasks> </configuration> <goals> @@ -506,8 +507,8 @@ <configuration>  <tasks> - <echo message="Delete installer data cache at ${installer.cache.dir}" /> - <delete dir="${installer.cache.dir}" /> + <echo message="Delete installer data cache at ${installer.cache.dir}"/> + <delete dir="${installer.cache.dir}"/> </tasks> </configuration> <goals> @@ -521,12 +522,12 @@ </profile> <profile> - <id>load-test-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/test</exists> - </file> - </activation> + <id>load-test-data-found</id> + <activation> + <file> + <exists>../.mvn/cache/test</exists> + </file> + </activation> <properties> <test.cache.skip>true</test.cache.skip> </properties> @@ -587,5 +588,6 @@ </plugins> </build> </profile> + </profiles> </project> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -70,7 +70,7 @@ <dependency> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>config-api</artifactId> </dependency> <dependency> ===================================== t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Config.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -23,12 +23,12 @@ package fr.ird.t3; import com.google.common.base.Charsets; import com.google.common.io.CharSource; import com.google.common.io.Resources; +import io.ultreia.java4all.config.ApplicationConfig; +import io.ultreia.java4all.config.ArgumentsParserException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; -import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; import java.io.BufferedReader; ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -54,7 +54,7 @@ <dependency> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>config-api</artifactId> </dependency> <dependency> ===================================== t3-installer/src/main/java/fr/ird/t3/console/T3Console.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java +++ b/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java @@ -23,7 +23,7 @@ package fr.ird.t3.console; import fr.ird.t3.T3Config; import fr.ird.t3.installer.T3InstallerConfig; -import org.nuiton.config.ApplicationConfig; +import io.ultreia.java4all.config.ApplicationConfig; import java.io.File; import java.util.Arrays; ===================================== t3-web/src/license/THIRD-PARTY.properties ===================================== --- a/t3-web/src/license/THIRD-PARTY.properties +++ b/t3-web/src/license/THIRD-PARTY.properties @@ -31,7 +31,6 @@ # Please fill the missing licenses for dependencies : # # -#Sun Feb 18 02:37:45 CET 2018 +#Sun Apr 15 00:37:39 CEST 2018 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -oro--oro--2.0.8=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/cad84436abdd0bc1b1527cb7d06a9ec4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/cad84436abdd0bc1b1527cb7d06a9ec4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] use new java4all config lib
by Tony CHEMIT 14 Apr '18

14 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b0db79e8 by Tony CHEMIT at 2018-04-14T22:15:00Z use new java4all config lib - - - - - 4 changed files: - pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-installer/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.25</version> + <version>2018.28</version> </parent> <groupId>fr.ird.t3</groupId> @@ -95,6 +96,8 @@ <properties> + <lib.version.nuiton.config>1.0.0-SNAPSHOT</lib.version.nuiton.config> + <organizationId>ultreiaio</organizationId> <projectId>ird-t3</projectId> <stageId>frirdt3</stageId> @@ -283,13 +286,13 @@ <configuration>  <tasks> - <echo message="Copy model to site" /> + <echo message="Copy model to site"/> <copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model"> <fileset dir="${basedir}/doc/modelisation/t3"> - <include name="**/*.png" /> + <include name="**/*.png"/> </fileset> <fileset dir="${basedir}/t3-domain/src/main/xmi"> - <include name="t3-persistence.zargo" /> + <include name="t3-persistence.zargo"/> </fileset> </copy> </tasks> @@ -366,7 +369,7 @@ <plugin> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config-maven-plugin</artifactId> + <artifactId>config-maven-plugin</artifactId> <version>${lib.version.nuiton.config}</version> <inherited>false</inherited> <reportSets> @@ -476,8 +479,8 @@ <configuration>  <tasks> - <echo message="Delete test data cache at ${test.cache.dir}" /> - <delete dir="${test.cache.dir}" /> + <echo message="Delete test data cache at ${test.cache.dir}"/> + <delete dir="${test.cache.dir}"/> </tasks> </configuration> <goals> @@ -506,8 +509,8 @@ <configuration>  <tasks> - <echo message="Delete installer data cache at ${installer.cache.dir}" /> - <delete dir="${installer.cache.dir}" /> + <echo message="Delete installer data cache at ${installer.cache.dir}"/> + <delete dir="${installer.cache.dir}"/> </tasks> </configuration> <goals> @@ -521,12 +524,12 @@ </profile> <profile> - <id>load-test-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/test</exists> - </file> - </activation> + <id>load-test-data-found</id> + <activation> + <file> + <exists>../.mvn/cache/test</exists> + </file> + </activation> <properties> <test.cache.skip>true</test.cache.skip> </properties> @@ -587,5 +590,36 @@ </plugins> </build> </profile> + + +  + <profile> + <id>generate-config-profile</id> + <activation> + <file> + <exists>${basedir}/src/main/config</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>io.ultreia.java4all.config</groupId> + <artifactId>config-maven-plugin</artifactId> + <version>1.0.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <id>default-generate</id> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> </project> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -70,7 +70,8 @@ <dependency> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>config-api</artifactId> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> ===================================== t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Config.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -23,12 +23,12 @@ package fr.ird.t3; import com.google.common.base.Charsets; import com.google.common.io.CharSource; import com.google.common.io.Resources; +import io.ultreia.java4all.config.ApplicationConfig; +import io.ultreia.java4all.config.ArgumentsParserException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; -import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; import java.io.BufferedReader; ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -54,7 +54,8 @@ <dependency> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>config-api</artifactId> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b0db79e89e4cd4211ac8c96a50224a16… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b0db79e89e4cd4211ac8c96a50224a16… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3 :: Pom
by Tony CHEMIT 12 Apr '18

12 Apr '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: cf3bae91 by 166231 at 2018-04-12T08:19:47Z Site checkin for project T3 :: Pom - - - - - 29 changed files: - aggregate-third-party-report.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install.html - installer.html - integration.html - issue-tracking.html - license.html - model.html - model/t3-persistence.zargo - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - scripts-postgis.html - sitemap.html - source-repository.html - team-list.html - translate.html Changes: ===================================== aggregate-third-party-report.html ===================================== --- a/aggregate-third-party-report.html +++ b/aggregate-third-party-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Tierces parties (Mode aggrégé)</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Tierces parties (Mode aggrégé)</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -438,7 +438,7 @@ <td>The Apache Software License, Version 2.0</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-msaccess-importer:2.6">fr.ird.t3:t3-msaccess-importer:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-msaccess-importer:2.7">fr.ird.t3:t3-msaccess-importer:2.7</a></td> <td>compile</td> <td></td> <td>jar</td> @@ -606,14 +606,14 @@ <td>MIT License</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-domain:2.6">fr.ird.t3:t3-domain:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-domain:2.7">fr.ird.t3:t3-domain:2.7</a></td> <td>compile</td> <td></td> <td>jar</td> <td>Affero General Public License (AGPL)</td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-actions:2.6">fr.ird.t3:t3-actions:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-actions:2.7">fr.ird.t3:t3-actions:2.7</a></td> <td>test</td> <td></td> <td>jar</td> @@ -641,28 +641,28 @@ <td>The Apache Software License, Version 2.0</td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-input-avdthv33:2.6">fr.ird.t3:t3-input-avdthv33:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-input-avdthv33:2.7">fr.ird.t3:t3-input-avdthv33:2.7</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>Affero General Public License (AGPL)</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-input-avdthv35:2.6">fr.ird.t3:t3-input-avdthv35:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-input-avdthv35:2.7">fr.ird.t3:t3-input-avdthv35:2.7</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>Affero General Public License (AGPL)</td></tr> <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-input-avdthv36:2.6">fr.ird.t3:t3-input-avdthv36:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-input-avdthv36:2.7">fr.ird.t3:t3-input-avdthv36:2.7</a></td> <td>runtime</td> <td></td> <td>jar</td> <td>Affero General Public License (AGPL)</td></tr> <tr class="b"> <td><img src="images/icon_success_sml.gif" alt="" /> -<td><a href="./third-party-report.html#fr.ird.t3:t3-output-balbayav32:2.6">fr.ird.t3:t3-output-balbayav32:2.6</a></td> +<td><a href="./third-party-report.html#fr.ird.t3:t3-output-balbayav32:2.7">fr.ird.t3:t3-output-balbayav32:2.7</a></td> <td>runtime</td> <td></td> <td>jar</td> @@ -1832,14 +1832,14 @@ <th width="20%">License(s)</th> <td width="80%">The Apache Software License, Version 2.0</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-msaccess-importer:2.6"></a>fr.ird.t3:t3-msaccess-importer:2.6</h3> +<h3><a name="fr.ird.t3:t3-msaccess-importer:2.7"></a>fr.ird.t3:t3-msaccess-importer:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-msaccess-importer:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-msaccess-importer:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">compile</td></tr> @@ -2336,14 +2336,14 @@ <th width="20%">License(s)</th> <td width="80%">MIT License</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-domain:2.6"></a>fr.ird.t3:t3-domain:2.6</h3> +<h3><a name="fr.ird.t3:t3-domain:2.7"></a>fr.ird.t3:t3-domain:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-domain:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-domain:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">compile</td></tr> @@ -2357,14 +2357,14 @@ <th width="20%">License(s)</th> <td width="80%">Affero General Public License (AGPL)</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-actions:2.6"></a>fr.ird.t3:t3-actions:2.6</h3> +<h3><a name="fr.ird.t3:t3-actions:2.7"></a>fr.ird.t3:t3-actions:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-actions:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-actions:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">test</td></tr> @@ -2441,14 +2441,14 @@ <th width="20%">License(s)</th> <td width="80%">The Apache Software License, Version 2.0</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-input-avdthv33:2.6"></a>fr.ird.t3:t3-input-avdthv33:2.6</h3> +<h3><a name="fr.ird.t3:t3-input-avdthv33:2.7"></a>fr.ird.t3:t3-input-avdthv33:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-input-avdthv33:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-input-avdthv33:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">runtime</td></tr> @@ -2462,14 +2462,14 @@ <th width="20%">License(s)</th> <td width="80%">Affero General Public License (AGPL)</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-input-avdthv35:2.6"></a>fr.ird.t3:t3-input-avdthv35:2.6</h3> +<h3><a name="fr.ird.t3:t3-input-avdthv35:2.7"></a>fr.ird.t3:t3-input-avdthv35:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-input-avdthv35:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-input-avdthv35:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">runtime</td></tr> @@ -2483,14 +2483,14 @@ <th width="20%">License(s)</th> <td width="80%">Affero General Public License (AGPL)</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-input-avdthv36:2.6"></a>fr.ird.t3:t3-input-avdthv36:2.6</h3> +<h3><a name="fr.ird.t3:t3-input-avdthv36:2.7"></a>fr.ird.t3:t3-input-avdthv36:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-input-avdthv36:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-input-avdthv36:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">runtime</td></tr> @@ -2504,14 +2504,14 @@ <th width="20%">License(s)</th> <td width="80%">Affero General Public License (AGPL)</td></tr></table><a href="./third-party-report.html#Description">Retour en haut de la page.</a><br /></div> <div class="section"> -<h3><a name="fr.ird.t3:t3-output-balbayav32:2.6"></a>fr.ird.t3:t3-output-balbayav32:2.6</h3> +<h3><a name="fr.ird.t3:t3-output-balbayav32:2.7"></a>fr.ird.t3:t3-output-balbayav32:2.7</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="20%">Statut</th> <td width="80%"><img src="images/icon_success_sml.gif" alt="" /> License clairement définie dans le pom de cette dépendance</td></tr> <tr class="b"> <th width="20%">GroupId:ArtifactId:Version</th> -<td width="80%">fr.ird.t3:t3-output-balbayav32:2.6</td></tr> +<td width="80%">fr.ird.t3:t3-output-balbayav32:2.7</td></tr> <tr class="a"> <th width="20%">Scope</th> <td width="80%">runtime</td></tr> ===================================== changelog.html ===================================== The diff for this file was not included because it is too large. ===================================== changes-report.html ===================================== --- a/changes-report.html +++ b/changes-report.html @@ -1,6 +1,6 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> @@ -8,7 +8,7 @@ <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="author" content="Tony Chemit" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – T3 changelog</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -28,8 +28,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">T3 changelog</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -95,118 +95,169 @@ <th>Date</th> <th>Description</th></tr> <tr class="b"> +<td><a href="#a2.7">2.7</a></td> +<td>2018-04-13</td> +<td></td></tr> +<tr class="a"> <td><a href="#a2.6">2.6</a></td> <td>2018-04-05</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.5">2.5</a></td> <td>2018-03-23</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.4">2.4</a></td> <td>2018-03-19</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.3">2.3</a></td> <td>2018-03-12</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.2">2.2</a></td> <td>2018-03-02</td> <td>Replace user database by a simple **yaml** file.</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.1">2.1</a></td> <td>2018-02-25</td> <td>First part of contract 3.0</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.0.1">2.0.1</a></td> <td>2017-05-12</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.0">2.0</a></td> <td>2017-04-10</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.6.1">1.6.1</a></td> <td>2015-12-07</td> <td>*(from redmine: created on 2015-11-30)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.6">1.6</a></td> <td>2015-11-30</td> <td>*(from redmine: created on 2013-04-12)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.5.1">1.5.1</a></td> <td>2013-04-13</td> <td>*(from redmine: created on 2013-04-13)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.5">1.5</a></td> <td>2013-04-12</td> <td>Validation du niveau 2, 3 et exports des données *(from redmine: created on 2013-02-24)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.4">1.4</a></td> <td>2013-02-25</td> <td>Calcul du niveau 3 + export des données *(from redmine: created on 2012-04-26)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.3.2">1.3.2</a></td> <td>2013-01-16</td> <td>*(from redmine: created on 2013-01-16)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.3.1">1.3.1</a></td> <td>2012-06-15</td> <td>Mise au point avant le niveau 3 *(from redmine: created on 2012-04-29)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.3">1.3</a></td> <td>2012-04-28</td> <td>Calcul du niveau 2 *(from redmine: created on 2012-02-06)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.2.1">1.2.1</a></td> <td>2012-04-20</td> <td>*(from redmine: created on 2012-04-20)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.2">1.2</a></td> <td>2012-04-19</td> <td>Phase 2 - lot 2 (validation niveau 0 et 1) *(from redmine: created on 2011-09-07)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.1.2">1.1.2</a></td> <td>2012-03-02</td> <td>*(from redmine: created on 2012-02-29)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.1.1">1.1.1</a></td> <td>2012-02-21</td> <td>*(from redmine: created on 2012-02-15)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.1">1.1</a></td> <td>2012-02-08</td> <td>Correction de bugs sur la 1.0 (hors calcul) *(from redmine: created on 2012-02-06)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.0.2">1.0.2</a></td> <td>2011-11-28</td> <td>*(from redmine: created on 2011-11-28)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.0.1">1.0.1</a></td> <td>2011-10-31</td> <td>*(from redmine: created on 2011-10-26)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.0">1.0</a></td> <td>2011-10-25</td> <td>Phase 2 - lot 1 *(from redmine: created on 2011-07-07)*</td></tr></table></div> <div class="section"> +<h3 id="a2.7">Release 2.7 – 2018-04-13</h3> +<table border="0" class="table table-striped"> +<tr class="a"> +<th>Type</th> +<th>Changements</th> +<th>Par</th></tr> +<tr class="b"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>Anomalie suite au chargement d'une base dont le nom contient un lettre accentuée. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/310">310</a>. Grâce â Julien Lebranchu.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>[N0.2] Questions sur le log. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/311">311</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>[N0.2] Ne calculer le RF2 que si l'une des marées de la strate a un défaut de logbook. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/312">312</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>[N0.2] Lors du calcul du RF2, utiliser la liste rf1speciesforfleet. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/313">313</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> +<div class="section"> <h3 id="a2.6">Release 2.6 – 2018-04-05</h3> -<p>Pas de changement dans cette version</p></div> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Type</th> +<th>Changements</th> +<th>Par</th></tr> +<tr class="a"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>Mise en page de certains écrans de configuration. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/306">306</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/add.gif" alt="Add" title="Add" /></td> +<td>[N3] Option à supprimer sur le N3. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/307">307</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/update.gif" alt="Update" title="Update" /></td> +<td>Problème avec l'installeur 2.5. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/303">303</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/update.gif" alt="Update" title="Update" /></td> +<td>[IMPORT] Il manque un lien "Importer une autre marée". Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/304">304</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="a"> +<td><img src="images/update.gif" alt="Update" title="Update" /></td> +<td>Pour une base OI 2018, l'assistant import exige un code port a priori non pertinent. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-t3/issues/305">305</a>. Grâce â Pascal Cauquil.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> <div class="section"> <h3 id="a2.5">Release 2.5 – 2018-03-23</h3> <table border="0" class="table table-striped"> ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Configuration</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Configuration</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== dependency-convergence.html ===================================== --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Reactor Dependency Convergence</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Reactor Dependency Convergence</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== dependency-management.html ===================================== --- a/dependency-management.html +++ b/dependency-management.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Gestion des dépendances du project</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Gestion des dépendances du project</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== dependency-updates-report.html ===================================== --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Dependency Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Dependency Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -99,7 +99,7 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is an incremental version update</td> -<td>8</td></tr> +<td>9</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is a minor version update</td> @@ -107,7 +107,7 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is a major version update</td> -<td>7</td></tr></table> +<td>6</td></tr></table> <div class="section"> <h3><a name="Dependency_Management"></a>Dependency Management</h3> <table border="0" class="table table-striped"> @@ -300,7 +300,7 @@ <td></td> <td>jar</td> <td></td> -<td></td> +<td><b>2.7.9</b></td> <td></td> <td><b>3.0.0</b></td></tr> <tr class="b"> @@ -1829,7 +1829,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>0.32.18</b> <i>Next Incremental</i></td></tr></table></div> +<td><b>0.32.18</b> <i>Next Incremental</i><br /><b>0.32.20</b> <i>Latest Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="com.vladsch.flexmark:flexmark-util"></a>com.vladsch.flexmark:flexmark-util</h3> <table border="0" class="table table-striped"> @@ -1856,13 +1856,13 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>0.32.18</b> <i>Next Incremental</i></td></tr></table></div> +<td><b>0.32.18</b> <i>Next Incremental</i><br /><b>0.32.20</b> <i>Latest Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="com.zaxxer:HikariCP"></a>com.zaxxer:HikariCP</h3> <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer major version available. Major updates are rarely passive.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>com.zaxxer</td></tr> @@ -1883,7 +1883,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.0.0</b> <i>Next Major</i></td></tr></table></div> +<td><b>2.7.9</b> <i>Next Incremental</i><br /><b>3.0.0</b> <i>Next Major</i><br /><b>3.1.0</b> <i>Latest Major</i></td></tr></table></div> <div class="section"> <h3><a name="commons-beanutils:commons-beanutils"></a>commons-beanutils:commons-beanutils</h3> <table border="0" class="table table-striped"> @@ -3740,7 +3740,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>2.17.0</b> <i>Next Minor</i></td></tr></table></div> +<td><b>2.17.0</b> <i>Next Minor</i><br /><b>2.18.0</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.nuiton:helper-maven-plugin-api"></a>org.nuiton:helper-maven-plugin-api</h3> <table border="0" class="table table-striped"> ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Developer Activity Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Developer Activity Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -87,21 +87,17 @@ <div class="section"> <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> -<h3><a name="Changes_between_2018-03-06_and_2018-04-06"></a>Changes between 2018-03-06 and 2018-04-06</h3> -<p>Total commits: 91<br />Total number of files changed: 407</p> +<h3><a name="Changes_between_2018-03-13_and_2018-04-13"></a>Changes between 2018-03-13 and 2018-04-13</h3> +<p>Total commits: 77<br />Total number of files changed: 248</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> <th>Total commits</th> <th>Total Number of Files Changed</th></tr> <tr class="b"> -<td>166231 <dev(a)tchemit.fr></td> -<td>5</td> -<td>11</td></tr> -<tr class="a"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>86</td> -<td>407</td></tr></table></div></div> +<td>77</td> +<td>248</td></tr></table></div></div> </div> </div> </div> ===================================== file-activity.html ===================================== The diff for this file was not included because it is too large. ===================================== index.html ===================================== --- a/index.html +++ b/index.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – T3</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">T3</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== install.html ===================================== --- a/install.html +++ b/install.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Installation T3</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation T3</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== installer.html ===================================== --- a/installer.html +++ b/installer.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – T3 :: Installer</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">T3 :: Installer</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -89,7 +89,7 @@ <div> <div> -<pre class="source"> t3-installer-2.6 +<pre class="source"> t3-installer-2.7 ├── create-db.bat (1) ├── create-db.sh (1) ├── fill-db.bat (1) @@ -103,7 +103,7 @@ │   ├── h2 │   ├── referential │   └── zones - └── t3-installer-2.6.jar + └── t3-installer-2.7.jar </pre></div></div> <ol style="list-style-type: decimal"> ===================================== integration.html ===================================== --- a/integration.html +++ b/integration.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Intégration continue</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Intégration continue</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== issue-tracking.html ===================================== --- a/issue-tracking.html +++ b/issue-tracking.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Contrôle des livraisons</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Contrôle des livraisons</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== license.html ===================================== --- a/license.html +++ b/license.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Licence du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Licence du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== model.html ===================================== --- a/model.html +++ b/model.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Modélisation</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Modélisation</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== model/t3-persistence.zargo ===================================== Binary files a/model/t3-persistence.zargo and b/model/t3-persistence.zargo differ ===================================== plugin-management.html ===================================== --- a/plugin-management.html +++ b/plugin-management.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Gestion des plugins du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Gestion des plugins du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== plugin-updates-report.html ===================================== --- a/plugin-updates-report.html +++ b/plugin-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Plugin Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Plugin Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -91,7 +91,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td># of plugins using the latest version available</td> -<td>55</td></tr> +<td>52</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is smaller than an incremental version update</td> @@ -99,11 +99,11 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is an incremental version update</td> -<td>2</td></tr> +<td>3</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a minor version update</td> -<td>1</td></tr> +<td>3</td></tr> <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of plugins where the next version available is a major version update</td> @@ -256,13 +256,13 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-dependency-plugin</td> -<td><b>3.0.2</b></td> -<td></td> +<td>3.0.2</td> <td></td> <td></td> +<td><b>3.1.0</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> @@ -336,13 +336,13 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="a"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-jar-plugin</td> -<td><b>3.0.2</b></td> -<td></td> +<td>3.0.2</td> <td></td> <td></td> +<td><b>3.1.0</b></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> @@ -426,12 +426,12 @@ <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> <tr class="b"> -<td><img src="images/icon_success_sml.gif" alt="" /></td> +<td><img src="images/icon_warning_sml.gif" alt="" /></td> <td>org.apache.maven.plugins</td> <td>maven-shade-plugin</td> -<td><b>3.1.0</b></td> -<td></td> +<td>3.1.0</td> <td></td> +<td><b>3.1.1</b></td> <td></td> <td></td> <td><img src="images/icon_success_sml.gif" alt="" /></td></tr> @@ -1035,7 +1035,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1044,7 +1044,10 @@ <td>maven-dependency-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0.2</td></tr></table></div> +<td>3.0.2</td></tr> +<tr class="a"> +<th width="80%">Newer versions</th> +<td><b>3.1.0</b> <i>Next Minor</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-deploy-plugin"></a>Plugin org.apache.maven.plugins:maven-deploy-plugin</h3> <table border="0" class="table table-striped"> @@ -1155,7 +1158,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer minor version available. Minor updates are sometimes passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1164,7 +1167,10 @@ <td>maven-jar-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.0.2</td></tr></table></div> +<td>3.0.2</td></tr> +<tr class="a"> +<th width="80%">Newer versions</th> +<td><b>3.1.0</b> <i>Next Minor</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-jarsigner-plugin"></a>Plugin org.apache.maven.plugins:maven-jarsigner-plugin</h3> <table border="0" class="table table-striped"> @@ -1290,7 +1296,7 @@ <table border="0" class="table table-striped"> <tr class="a"> <th width="80%">Status</th> -<td><img src="images/icon_success_sml.gif" alt="" /> No newer versions available.</td></tr> +<td><img src="images/icon_warning_sml.gif" alt="" /> There is at least one newer incremental version available. Incremental updates are typically passive.</td></tr> <tr class="b"> <th width="80%">Group Id</th> <td>org.apache.maven.plugins</td></tr> @@ -1299,7 +1305,10 @@ <td>maven-shade-plugin</td></tr> <tr class="b"> <th width="80%">Current Version</th> -<td>3.1.0</td></tr></table></div> +<td>3.1.0</td></tr> +<tr class="a"> +<th width="80%">Newer versions</th> +<td><b>3.1.1</b> <i>Next Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.apache.maven.plugins:maven-site-plugin"></a>Plugin org.apache.maven.plugins:maven-site-plugin</h3> <table border="0" class="table table-striped"> @@ -1512,7 +1521,7 @@ <td>1.14</td></tr> <tr class="a"> <th width="80%">Newer versions</th> -<td><b>1.15</b> <i>Next Minor</i></td></tr></table></div> +<td><b>1.15</b> <i>Next Minor</i><br /><b>1.16</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="Plugin_org.codehaus.mojo:sonar-maven-plugin"></a>Plugin org.codehaus.mojo:sonar-maven-plugin</h3> <table border="0" class="table table-striped"> ===================================== plugins.html ===================================== --- a/plugins.html +++ b/plugins.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Project Plugins</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Project Plugins</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-info.html ===================================== --- a/project-info.html +++ b/project-info.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Information générale du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Information générale du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-reports.html ===================================== --- a/project-reports.html +++ b/project-reports.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Rapports générés par Maven</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Rapports générés par Maven</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== project-summary.html ===================================== --- a/project-summary.html +++ b/project-summary.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Résumé du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Résumé du projet</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> @@ -128,7 +128,7 @@ <td>ird-t3</td></tr> <tr class="b"> <td>Version</td> -<td>2.6</td></tr> +<td>2.7</td></tr> <tr class="a"> <td>Type</td> <td>pom</td></tr></table></div></div> ===================================== property-updates-report.html ===================================== --- a/property-updates-report.html +++ b/property-updates-report.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Property Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Property Updates Report</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== scripts-postgis.html ===================================== --- a/scripts-postgis.html +++ b/scripts-postgis.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Scripts postgis disponibles</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Scripts postgis disponibles</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== sitemap.html ===================================== --- a/sitemap.html +++ b/sitemap.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Sitemap</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Sitemap</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== source-repository.html ===================================== --- a/source-repository.html +++ b/source-repository.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Dépôt de sources</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Dépôt de sources</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== team-list.html ===================================== --- a/team-list.html +++ b/team-list.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Liste des membres</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Liste des membres</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> ===================================== translate.html ===================================== --- a/translate.html +++ b/translate.html @@ -1,13 +1,13 @@ <!DOCTYPE html>  <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr"> <head> <meta charset="UTF-8" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="Date-Revision-yyyymmdd" content="20180405" /> + <meta name="Date-Revision-yyyymmdd" content="20180412" /> <meta http-equiv="Content-Language" content="fr" /> <title>T3 :: Pom – Traduire T3+</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.7.min.css" /> @@ -27,8 +27,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://t3.ultreia.io/index.html" class="externalLink" title="T3 :: Pom">T3 :: Pom</a><span class="divider">»</span></li> <li class="active ">Traduire T3+</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-05</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.6</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-04-12</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 2.7</li> <li class="pull-right"><span class="divider">|</span> <a href="https://www.ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https:/gitlab.com/ultreiaio/ird-t3" class="externalLink" title="GitLab">GitLab</a></li> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/cf3bae91b7705bd1610c09364a76ef71… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/cf3bae91b7705bd1610c09364a76ef71… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3][develop] Update changelog after release 2.7 [skip ci]
by Tony CHEMIT 12 Apr '18

12 Apr '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: f08bbaee by Tony CHEMIT at 2018-04-12T08:09:44Z Update changelog after release 2.7 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,22 @@ # T3 changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2018-04-05 19:27. - + * Last generated at 2018-04-12 10:04. + +## Version [2.7](https://gitlab.com/ultreiaio/ird-t3/milestones/37) + +**Closed at 2018-04-13.** + +### Download +* [Installer (t3-2.7.zip)](https://oss.sonatype.org/content/repositories/frirdt3-1019/fr/…) +* [Application (t3-2.7.war)](https://oss.sonatype.org/content/repositories/frirdt3-1019/fr/…) + +### Issues + * [[Anomalie 310]](https://gitlab.com/ultreiaio/ird-t3/issues/310) **Anomalie suite au chargement d'une base dont le nom contient un lettre accentuée** (Thanks to Tony CHEMIT) (Reported by Julien Lebranchu) + * [[Anomalie 311]](https://gitlab.com/ultreiaio/ird-t3/issues/311) **[N0.2] Questions sur le log** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 312]](https://gitlab.com/ultreiaio/ird-t3/issues/312) **[N0.2] Ne calculer le RF2 que si l'une des marées de la strate a un défaut de logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 313]](https://gitlab.com/ultreiaio/ird-t3/issues/313) **[N0.2] Lors du calcul du RF2, utiliser la liste rf1speciesforfleet** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [2.6](https://gitlab.com/ultreiaio/ird-t3/milestones/36) **Closed at 2018-04-05.** View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f08bbaeeb1a2490e5b2c35cd4e42469e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f08bbaeeb1a2490e5b2c35cd4e42469e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-t3] Deleted branch release/2.7
by Tony CHEMIT 12 Apr '18

12 Apr '18

Tony CHEMIT deleted branch release/2.7 at ultreiaio / ird-t3 --- You're receiving this email because of your account on gitlab.com.

1 0