January 2019 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] Fix at last tests database generation + try to update a little longline test db :(
by Tony CHEMIT 04 Jan '19

04 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: f9bdec58 by tchemit at 2019-01-04T14:09:52Z Fix at last tests database generation + try to update a little longline test db :( - - - - - 7 changed files: - services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java - test/src/main/resources/db/6.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestLongline.sql.gz - test/src/main/resources/db/7.0/dataForTestSeine.sql.gz - test/src/main/resources/db/7.0/empty_h2.sql.gz - test/src/main/resources/db/7.0/empty_pg.sql.gz - test/src/main/resources/db/7.0/referentiel.sql.gz Changes: ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/sql/MigrateTestsDatabases.java ===================================== @@ -38,12 +38,15 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; +import org.nuiton.topia.persistence.script.SqlScriptReader; +import org.nuiton.topia.persistence.script.SqlScriptWriter; import org.nuiton.topia.persistence.script.TopiaSqlScript; import org.nuiton.version.Version; import java.io.File; import java.io.IOException; import java.nio.file.Files; +import java.nio.file.Path; /** * Created on 25/12/15. @@ -154,7 +157,18 @@ public class MigrateTestsDatabases extends ServiceLocalTestSupport { } Files.createDirectories(scriptFile.toPath().getParent()); - dump.copy(scriptFile.toPath()); + copy(dump, scriptFile.toPath()); + + } + + public void copy(TopiaSqlScript reader, Path target) throws IOException { + try (SqlScriptWriter scriptWriter = SqlScriptWriter.builder(target).gzip().keepCommentLine().keepEmptyLine().build()) { + try (SqlScriptReader scriptReader = reader.getLocation()) { + for (String statement : scriptReader) { + scriptWriter.writeSql(statement); + } + } + } } } ===================================== test/src/main/resources/db/6.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/7.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/7.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/7.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/7.0/empty_h2.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/empty_h2.sql.gz and b/test/src/main/resources/db/7.0/empty_h2.sql.gz differ ===================================== test/src/main/resources/db/7.0/empty_pg.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/empty_pg.sql.gz and b/test/src/main/resources/db/7.0/empty_pg.sql.gz differ ===================================== test/src/main/resources/db/7.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/7.0/referentiel.sql.gz and b/test/src/main/resources/db/7.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9bdec587a89226058dcbce7518… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f9bdec587a89226058dcbce7518… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Clean binders code
by Tony CHEMIT 04 Jan '19

04 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2f8d3c0a by tchemit at 2019-01-04T11:10:44Z Clean binders code - - - - - d86573f1 by tchemit at 2019-01-04T11:10:56Z at last clean service local code (remove any dummy log.trace + extra empty lines) - - - - - 30 changed files: - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/GearUseFeaturesLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/GearUseFeaturesMeasurementLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/TripLonglineEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/common/TripLonglineGearUseEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/ActivityLonglineLogbookStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/BaitsCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/BranchlinesCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/CatchLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/FloatlinesCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/HooksCompositionLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SampleLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookCatchEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookGlobalCompositionEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/logbook/SetLonglineLogbookStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/ActivityLonglineObsEncounterEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/ActivityLonglineObsSensorUsedEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/ActivityLonglineObsStubEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BaitsCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BasketObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BranchlineObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/BranchlinesCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/CatchLonglineObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/EncounterObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/FloatlinesCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/HooksCompositionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/SectionObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/SensorUsedObsEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/binder/data/ll/observation/SetLonglineObsCatchEntityDtoBinder.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6d4cd87bb8fe5d602d63f99021… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6d4cd87bb8fe5d602d63f99021… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Happy new year commit
by Tony CHEMIT 03 Jan '19

03 Jan '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6d4cd87b by tchemit at 2019-01-03T10:18:28Z Happy new year commit - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/filtered-resources/observe-application.properties - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6d4cd87bb8fe5d602d63f990212… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6d4cd87bb8fe5d602d63f990212… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: c1ee509d by 166231 at 2019-01-02T15:28:47Z Site checkin for project ObServe :: Pom - - - - - 6 changed files: - administration-web.html - architecture-logicielle.html - img/architecture.svg - index.html - install-serverPG.html - install.html Changes: ===================================== administration-web.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="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation de lapplication web</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://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation de lapplication web</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -101,8 +101,8 @@ <pre class="source"> /var/local/observeweb/{contextPath} |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-8.0-alpha-4.log # logs de l'application - |-- observeweb-log4j.conf # configuration des logs + | `-- observeweb-7.0.1.log # logs de l'application + |-- observeweb-log4j2.xml # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs </pre></div></div> @@ -196,14 +196,6 @@ <div> <div> <pre class="source"> http://localhost:8080/observeweb/admin/resetAuthenticationTokens?adminApiKe… (ou la clef que vous avez configuré) -</pre></div></div> - -<p>Par défaut le proxy_ajp a un timeout de 5 minutes, il faut augmenter cette valeur sinon les appels dépassant ce temps seront rejettés.</p> -<p>Dans le fichier de configuration <tt>httpd.conf</tt> ajouter la ligne : (timeout de 1200 secondes = 20 minutes)</p> - -<div> -<div> -<pre class="source">ProxyTimeout 1200 </pre></div></div> </div> </div> @@ -212,7 +204,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== architecture-logicielle.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="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Architecture logicielle dObServe</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://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Architecture logicielle dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -150,7 +150,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== img/architecture.svg ===================================== @@ -3,7 +3,7 @@ #%L ObServe :: Pom %% - Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io + Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as ===================================== 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="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – ObServe</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://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -94,7 +94,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== install-serverPG.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="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation du serveur Obstuna</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://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation du serveur Obstuna</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -336,7 +336,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> ===================================== 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="20181210" /> + <meta name="Date-Revision-yyyymmdd" content="20190102" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe :: Pom – Installation dObServe</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://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe :: Pom">ObServe :: Pom</a><span class="divider">»</span></li> <li class="active ">Installation dObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2018-12-10</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 8.0-alpha-4</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2019-01-02</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 7.0.1</li> <li class="pull-right"><span class="divider">|</span> <a href="http://ultreia.io" class="externalLink" title="Ultreia.io">Ultreia.io</a></li> <li class="pull-right"><a href="https://gitlab.com/ultreiaio/ird-observe" class="externalLink" title="GitLab">GitLab</a></li> @@ -107,7 +107,7 @@ <footer> <div class="container-fluid"> <div class="row-fluid"> - <p>Copyright ©2008–2018 + <p>Copyright ©2008–2019 <a href="http://www.ird.fr/">IRD</a>. All rights reserved.</p> </div> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c1ee509dba8a6409e653de726f8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c1ee509dba8a6409e653de726f8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0.1
by Tony CHEMIT 02 Jan '19

02 Jan '19

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

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0.1
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed new tag v7.0.1 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0.1 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0.1] 2 commits: fix deploy
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch release/7.0.1 at ultreiaio / ird-observe Commits: d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>observe</artifactId> @@ -38,7 +38,7 @@ <properties>  -  + <maven.deploy.skip>false</maven.deploy.skip> <clientFile>client-runner-${project.version}.zip</clientFile> <serverFile>server-runner-${project.version}.war</serverFile> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.1</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f321a9664ea4917af607e51ff5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f321a9664ea4917af607e51ff5… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-7.x] 13 commits: [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe Commits: 075bfed9 by tchemit at 2018-11-26T12:23:20Z [jgitflow-maven-plugin]updating poms for 7.0.1-SNAPSHOT development[skip ci] - - - - - fdd54082 by tchemit at 2018-11-26T12:39:00Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 33652305 by tchemit at 2018-11-26T12:39:01Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 285a3f13 by tchemit at 2018-11-26T12:39:02Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - f664945e by tchemit at 2018-12-21T03:25:02Z Un type d'objet flottant (28) n'est pas pris en compte par la migration - Closes #1188 - - - - - 91712433 by tchemit at 2018-12-21T04:03:32Z Conformité des topiaid de floatingobjectpart - See #1191 - - - - - 5492b59e by tchemit at 2018-12-31T20:52:40Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - defa2ca0 by tchemit at 2018-12-31T21:22:19Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 3655d085 by tchemit at 2019-01-02T14:37:30Z [PS] Marées non visibles dans l'arbre après insertion - Closes #1187 - - - - - f321a966 by tchemit at 2019-01-02T14:51:32Z Happy new year commit - - - - - d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 71c951c6 by tchemit at 2019-01-02T14:57:31Z [jgitflow-maven-plugin]merging 'release/7.0.1' into 'master-7.x' - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client-configuration/src/main/resources/log4j2.xml - client-configuration/src/main/resources/observe-log4j2.xml - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/assembly/map.xml - client-core/src/main/filtered-resources/observe-application.properties - client-core/src/main/i18n/templates/about_en_GB.ftl - client-core/src/main/i18n/templates/about_es_ES.ftl - client-core/src/main/i18n/templates/about_fr_FR.ftl - client-core/src/main/i18n/templates/connexionTestResult_en_GB.ftl - client-core/src/main/i18n/templates/connexionTestResult_es_ES.ftl - client-core/src/main/i18n/templates/connexionTestResult_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceConnectionReport_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_en_GB.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_es_ES.ftl - client-core/src/main/i18n/templates/dataSourcePolicy_fr_FR.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_en_GB.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_es_ES.ftl - client-core/src/main/i18n/templates/dataSourceSelectModeResume_fr_FR.ftl - client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6c131cfd278c1194001c25a8fb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6c131cfd278c1194001c25a8fb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 6 commits: fix deploy
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: d0851ef1 by tchemit at 2019-01-02T14:56:40Z fix deploy - - - - - ec5bb38b by tchemit at 2019-01-02T14:57:26Z [jgitflow-maven-plugin]updating poms for branch'release/7.0.1' with non-snapshot versions[skip ci] - - - - - 71c951c6 by tchemit at 2019-01-02T14:57:31Z [jgitflow-maven-plugin]merging 'release/7.0.1' into 'master-7.x' - - - - - 61227bb1 by tchemit at 2019-01-02T14:57:34Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - de2a0164 by tchemit at 2019-01-02T14:57:34Z [jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x' - - - - - 640d843d by tchemit at 2019-01-02T14:57:35Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 1 changed file: - observe/pom.xml Changes: ===================================== observe/pom.xml ===================================== @@ -38,7 +38,7 @@ <properties>  -  + <maven.deploy.skip>false</maven.deploy.skip> <clientFile>client-runner-${project.version}.zip</clientFile> <serverFile>server-runner-${project.version}.war</serverFile> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ee17bd148070a08c9aaca0d100… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ee17bd148070a08c9aaca0d100… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] [jgitflow-maven-plugin]updating poms for 7.0.2-SNAPSHOT development[skip ci]
by Tony CHEMIT 02 Jan '19

02 Jan '19

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: ee17bd14 by tchemit at 2019-01-02T14:55:55Z [jgitflow-maven-plugin]updating poms for 7.0.2-SNAPSHOT development[skip ci] - - - - - 16 changed files: - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0.1-SNAPSHOT</version> + <version>7.0.2-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ee17bd148070a08c9aaca0d1001… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ee17bd148070a08c9aaca0d1001… You're receiving this email because of your account on gitlab.com.

1 0