March 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: fcc48ad7 by Tony CHEMIT at 2017-03-31T14:53:39+02:00 Site checkin for project ObServe - - - - - 28 changed files: - administration-web.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - sitemap.html - source-repository.html - team-list.html - third-party-report.html Changes: ===================================== administration-web.html ===================================== --- a/administration-web.html +++ b/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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Installation de lapplication web</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -99,7 +99,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/ |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-6.0-RC-1.log # logs de l'application + | `-- observeweb-6.0-RC-2.log # logs de l'application |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== --- a/architecture-logicielle.html +++ b/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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Architecture logicielle dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – ObServe changelog</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.min.css" /> @@ -28,8 +28,8 @@ <ul class="breadcrumb"> <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">ObServe changelog</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -97,273 +97,348 @@ <th>Date</th> <th>Description</th></tr> <tr class="b"> +<td><a href="#a6.0-RC-2">6.0-RC-2</a></td> +<td>2017-03-31</td> +<td></td></tr> +<tr class="a"> <td><a href="#a6.0-RC-1">6.0-RC-1</a></td> -<td>*In progress*</td> +<td>2017-03-30</td> +<td></td></tr> +<tr class="b"> +<td><a href="#a5.3.7">5.3.7</a></td> +<td>2017-03-29</td> <td></td></tr> <tr class="a"> +<td><a href="#a5.3.6">5.3.6</a></td> +<td>2017-03-22</td> +<td></td></tr> +<tr class="b"> <td><a href="#a5.3.5">5.3.5</a></td> <td>2017-03-19</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3.4">5.3.4</a></td> <td>2017-03-15</td> <td></td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.3.3">5.3.3</a></td> <td>2017-03-10</td> <td></td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3.2">5.3.2</a></td> <td>*In progress*</td> <td>*(from redmine: created on 2017-02-04)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.3.1">5.3.1</a></td> <td>2017-01-20</td> <td>*(from redmine: created on 2017-01-20)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.3">5.3</a></td> <td>2017-01-19</td> <td>*(from redmine: created on 2017-01-17)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.2.1">5.2.1</a></td> <td>2017-01-13</td> <td>*(from redmine: created on 2017-01-06)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.2">5.2</a></td> <td>2017-01-06</td> <td>*(from redmine: created on 2016-10-04)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.1.4">5.1.4</a></td> <td>2016-12-16</td> <td>*(from redmine: created on 2016-12-16)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.1.3">5.1.3</a></td> <td>2016-12-14</td> <td>*(from redmine: created on 2016-12-14)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.1.2">5.1.2</a></td> <td>2016-12-12</td> <td>*(from redmine: created on 2016-12-10)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.1.1">5.1.1</a></td> <td>2016-12-08</td> <td>*(from redmine: created on 2016-12-08)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.1">5.1</a></td> <td>2016-12-05</td> <td>*(from redmine: created on 2016-12-04)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.0.2">5.0.2</a></td> <td>2016-10-04</td> <td>*(from redmine: created on 2016-09-21)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a5.0.1">5.0.1</a></td> <td>2016-09-21</td> <td>*(from redmine: created on 2016-09-12)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a5.0">5.0</a></td> <td>2016-09-12</td> <td>Mise en place web services *(from redmine: created on 2014-02-05)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.6">4.0.6</a></td> <td>2016-01-13</td> <td>*(from redmine: created on 2015-11-04)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.5">4.0.5</a></td> <td>2015-11-04</td> <td>*(from redmine: created on 2015-11-03)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.4">4.0.4</a></td> <td>2015-11-03</td> <td>*(from redmine: created on 2015-08-27)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.3">4.0.3</a></td> <td>2015-08-27</td> <td>*(from redmine: created on 2015-08-27)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.2">4.0.2</a></td> <td>2015-08-27</td> <td>*(from redmine: created on 2015-08-11)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0-2">4.0-2</a></td> <td>2015-06-08</td> <td>Contrat "Armateurs" *(from redmine: created on 2014-01-30)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0.1.1">4.0.1.1</a></td> <td>2015-08-14</td> <td>*(from redmine: created on 2015-08-14)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a4.0.1">4.0.1</a></td> <td>2015-08-14</td> <td>*(from redmine: created on 2015-06-08)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a4.0">4.0</a></td> <td>2015-06-08</td> <td>ObserveLL *(from redmine: created on 2014-06-23)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.15.1">3.15.1</a></td> <td>2015-03-22</td> <td>*(from redmine: created on 2015-03-22)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.15">3.15</a></td> <td>2015-03-19</td> <td>*(from redmine: created on 2015-01-27)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.14">3.14</a></td> <td>2015-01-27</td> <td>*(from redmine: created on 2015-01-22)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.13">3.13</a></td> <td>2015-01-19</td> <td>*(from redmine: created on 2015-01-16)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.12">3.12</a></td> <td>2015-01-16</td> <td>*(from redmine: created on 2015-01-11)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.11">3.11</a></td> <td>2015-01-11</td> <td>*(from redmine: created on 2014-12-22)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.10">3.10</a></td> <td>2015-12-29</td> <td>*(from redmine: created on 2014-12-07)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.9">3.9</a></td> <td>2014-12-11</td> <td>*(from redmine: created on 2014-11-27)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.8">3.8</a></td> <td>2014-12-05</td> <td>*(from redmine: created on 2014-11-24)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.7.1">3.7.1</a></td> <td>2014-11-25</td> <td>*(from redmine: created on 2014-11-25)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.7">3.7</a></td> <td>2014-11-24</td> <td>*(from redmine: created on 2014-08-25)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.6">3.6</a></td> <td>2014-08-06</td> <td>Intégration des référentiels longline + diverses évolutions et corrections *(from redmine: created on 2014-07-24)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.5">3.5</a></td> <td>2014-07-06</td> <td>Traduction modèle + ajout modèle Longline *(from redmine: created on 2014-01-09)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.1.2">3.1.2</a></td> <td>2014-12-02</td> <td>*(from redmine: created on 2014-12-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.1.1">3.1.1</a></td> <td>2013-10-10</td> <td>*(from redmine: created on 2013-10-10)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a3.1">3.1</a></td> <td>2013-10-10</td> <td>*(from redmine: created on 2013-07-18)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a3.0">3.0</a></td> <td>2013-09-12</td> <td>*(from redmine: created on 2013-07-04)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.5">2.5</a></td> <td>2012-09-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.4">2.4</a></td> <td>2011-06-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.3">2.3</a></td> <td>2011-04-15</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.2">2.2</a></td> <td>2011-02-22</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.1">2.1</a></td> <td>2011-01-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a2.0.1">2.0.1</a></td> <td>2011-01-21</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a2.0">2.0</a></td> <td>2011-01-03</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.9.1">1.9.1</a></td> <td>2010-10-30</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.9">1.9</a></td> <td>2010-10-18</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.8">1.8</a></td> <td>2010-09-30</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.7">1.7</a></td> <td>2010-09-22</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.6.1">1.6.1</a></td> <td>2010-09-20</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.6">1.6</a></td> <td>2010-09-20</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.5">1.5</a></td> <td>2010-09-16</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.4">1.4</a></td> <td>2010-07-06</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.3.1">1.3.1</a></td> <td>2010-05-07</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.3">1.3</a></td> <td>2010-03-31</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.2">1.2</a></td> <td>2010-03-13</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.1.0">1.1.0</a></td> <td>2010-01-27</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="b"> +<tr class="a"> <td><a href="#a1.1">1.1</a></td> <td>2009-09-04</td> <td>*(from redmine: created on 2011-08-02)*</td></tr> -<tr class="a"> +<tr class="b"> <td><a href="#a1.0">1.0</a></td> <td>2009-07-08</td> <td>*(from redmine: created on 2011-08-02)*</td></tr></table></div> <div class="section"> -<h3 id="a6.0-RC-1">Release 6.0-RC-1 – *In progress*</h3> +<h3 id="a6.0-RC-2">Release 6.0-RC-2 – 2017-03-31</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>Problème de fonctionnement de la fenêtre d'erreur. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/749">749</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/fix.gif" alt="Fix" title="Fix" /></td> +<td>Problème à la première ouverture de la v6, lorsqu'une base v5 est présente dans /db. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/752">752</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/fix.gif" alt="Fix" title="Fix" /></td> +<td>Le raccourci F6 semble ne pas fonctionner. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/754">754</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/fix.gif" alt="Fix" title="Fix" /></td> +<td>Perte des messages de validations. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/759">759</a>. Grâce â Tony CHEMIT.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>Sur les doubles listes les boutons du mileu n'ont plus d'icones. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/761">761</a>. Grâce â Tony CHEMIT.</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>Possibilité d'insérer un capteur alors que son type n'a pas été renseigné. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/762">762</a>. Grâce â Tony CHEMIT.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr> +<tr class="b"> +<td><img src="images/fix.gif" alt="Fix" title="Fix" /></td> +<td>Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/763">763</a>. Grâce â Tony CHEMIT.</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>Impossible de lancer l'assistant migration. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/764">764</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>Filtres d'affichage de l'arbre. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/750">750</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>Filtrage de l'arbre. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/751">751</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>[UI] Sortie au clavier d'une zone de texte. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/755">755</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>[UI] Code couleur. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/756">756</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>Ne pas faire une sauvegarde de la base si aucune action de modification n'a été effectuée sur la base locale. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/757">757</a>. Grâce â Tony CHEMIT.</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>Suppression des autres raccourcis claiviers lorsqu'un raccourci global existe pour la même action. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/760">760</a>. Grâce â Tony CHEMIT.</td> +<td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> +<div class="section"> +<h3 id="a6.0-RC-1">Release 6.0-RC-1 – 2017-03-30</h3> <table border="0" class="table table-striped"> <tr class="b"> <th>Type</th> @@ -546,6 +621,28 @@ <td>Corriger le référentiel Espèce. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/652">652</a>. Grâce â Tony CHEMIT.</td> <td><a href="team-list.html#Tony CHEMIT">Tony CHEMIT</a></td></tr></table></div> <div class="section"> +<h3 id="a5.3.7">Release 5.3.7 – 2017-03-29</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>Echec d'échange de marées entre bases centrales en v5. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/758">758</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="a5.3.6">Release 5.3.6 – 2017-03-22</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>La migration d'une base centrale v3 ne fonctionne toujours pas. Corrige <a class="externalLink" href="https://gitlab.com/ultreiaio/ird-observe/issues/748">748</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="a5.3.5">Release 5.3.5 – 2017-03-19</h3> <table border="0" class="table table-striped"> <tr class="a"> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Configuration</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</a><span class="divider">»</span></li> <li class="active ">Configuration</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Reactor Dependency Convergence</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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,13 +101,13 @@ </caption> <tr class="b"> <th>Nombre de sous-projets :</th> -<td>25</td></tr> +<td>20</td></tr> <tr class="a"> <th>Nombre de dépendances (NOD) :</th> -<td>191</td></tr> +<td>186</td></tr> <tr class="b"> <th>Nombre d'artefacts uniques (NOA) :</th> -<td>200</td></tr> +<td>195</td></tr> <tr class="a"> <th>Number of version-conflicting artifacts (NOC):</th> <td>4</td></tr> @@ -133,12 +133,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:6.0-RC-1<br />\- fr.ird.observe:services-topia:jar:6.0-RC-1:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:application-web:war:6.0-RC-2<br />\- fr.ird.observe:services-topia:jar:6.0-RC-2:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:6.0-RC-1<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:application-web:war:6.0-RC-2<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="asm:asm-tree"></a>asm:asm-tree</h4> <table border="0" class="table table-striped"> @@ -150,12 +150,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:6.0-RC-1<br />\- fr.ird.observe:services-topia:jar:6.0-RC-1:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:application-web:war:6.0-RC-2<br />\- fr.ird.observe:services-topia:jar:6.0-RC-2:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:6.0-RC-1<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:application-web:war:6.0-RC-2<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="org.codehaus.plexus:plexus-component-annotations"></a>org.codehaus.plexus:plexus-component-annotations</h4> <table border="0" class="table table-striped"> @@ -167,12 +167,12 @@ <td width="25%">1.5.5</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-1<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.6)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-2<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.6)<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">1.6</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-1<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-2<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="org.codehaus.plexus:plexus-utils"></a>org.codehaus.plexus:plexus-utils</h4> <table border="0" class="table table-striped"> @@ -184,22 +184,22 @@ <td width="25%">1.5.5</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-1<br />\- org.apache.maven:maven-core:jar:3.3.9:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.3:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-2<br />\- org.apache.maven:maven-core:jar:3.3.9:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.3:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.0.15</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-1<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- org.apache.maven.wagon:wagon-provider-api:jar:2.10:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.15:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-2<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- org.apache.maven.wagon:wagon-provider-api:jar:2.10:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.15:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.0.17</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-1<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-2<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.0.22</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-1<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.3.9:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-compat:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-model:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-settings:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />\- org.apache.maven:maven-artifact:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:6.0-RC-2<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.3.9:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-compat:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-model:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-settings:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />\- org.apache.maven:maven-artifact:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> </div> </div> </div> ===================================== dependency-info.html ===================================== --- a/dependency-info.html +++ b/dependency-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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Informations de dépendance</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</a><span class="divider">»</span></li> <li class="active ">Informations de dépendance</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -95,31 +95,31 @@ <div class="source"><pre class="prettyprint linenums"><dependency> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2</version> <type>pom</type> </dependency></pre></div></div> <div class="section"> <h3><a name="Apache_Buildr"></a>Apache Buildr</h3><a name="Apache_Buildr"></a> -<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:pom:pom:6.0-RC-1'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:pom:pom:6.0-RC-2'</pre></div></div> <div class="section"> <h3><a name="Apache_Ivy"></a>Apache Ivy</h3><a name="Apache_Ivy"></a> -<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="pom" rev="6.0-RC-1"> +<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="pom" rev="6.0-RC-2"> <artifact name="pom" type="pom" /> </dependency></pre></div></div> <div class="section"> <h3><a name="Groovy_Grape"></a>Groovy Grape</h3><a name="Groovy_Grape"></a> <div class="source"><pre class="prettyprint linenums">@Grapes( -@Grab(group='fr.ird.observe', module='pom', version='6.0-RC-1') +@Grab(group='fr.ird.observe', module='pom', version='6.0-RC-2') )</pre></div></div> <div class="section"> <h3><a name="GradleGrails"></a>Gradle/Grails</h3><a name="GradleGrails"></a> -<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:pom:6.0-RC-1'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:pom:6.0-RC-2'</pre></div></div> <div class="section"> <h3><a name="Scala_SBT"></a>Scala SBT</h3><a name="Scala_SBT"></a> -<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "pom" % "6.0-RC-1"</pre></div></div> +<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "pom" % "6.0-RC-2"</pre></div></div> <div class="section"> <h3><a name="Leiningen"></a>Leiningen</h3><a name="Leiningen"></a> -<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/pom "6.0-RC-1"]</pre></div></div></div> +<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/pom "6.0-RC-2"]</pre></div></div></div> </div> </div> </div> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Gestion des dépendances du project</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Dependency Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -93,7 +93,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td># of dependencies using the latest version available</td> -<td>53</td></tr> +<td>51</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of dependencies where the next version available is smaller than an incremental version update</td> @@ -101,7 +101,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>10</td></tr> +<td>12</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> @@ -486,7 +486,7 @@ <td></td> <td></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.debux.webmotion</td> <td>webmotion</td> <td>2.5.1</td> @@ -494,11 +494,11 @@ <td></td> <td>jar</td> <td></td> -<td></td> +<td><b>2.5.3</b></td> <td></td> <td></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.debux.webmotion</td> <td>webmotion-unittest</td> <td>2.5.1</td> @@ -506,7 +506,7 @@ <td></td> <td>jar</td> <td></td> -<td></td> +<td><b>2.5.3</b></td> <td></td> <td></td></tr> <tr class="a"> @@ -1183,7 +1183,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>0.16.0</b> <i>Next Minor</i><br />0.16.1<br />0.17.0<br />0.17.1<br />0.17.2<br />0.17.3<br />0.17.4<br />0.18.0<br />0.18.1<br />0.18.2<br />0.18.3<br /><b>0.18.4</b> <i>Latest Minor</i></td></tr></table></div> +<td><b>0.16.0</b> <i>Next Minor</i><br />0.16.1<br />0.17.0<br />0.17.1<br />0.17.2<br />0.17.3<br />0.17.4<br />0.18.0<br />0.18.1<br />0.18.2<br />0.18.3<br />0.18.4<br /><b>0.18.5</b> <i>Latest Minor</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"> @@ -1210,7 +1210,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>0.16.0</b> <i>Next Minor</i><br />0.16.1<br />0.17.0<br />0.17.1<br />0.17.2<br />0.17.3<br />0.17.4<br />0.18.0<br />0.18.1<br />0.18.2<br />0.18.3<br /><b>0.18.4</b> <i>Latest Minor</i></td></tr></table></div> +<td><b>0.16.0</b> <i>Next Minor</i><br />0.16.1<br />0.17.0<br />0.17.1<br />0.17.2<br />0.17.3<br />0.17.4<br />0.18.0<br />0.18.1<br />0.18.2<br />0.18.3<br />0.18.4<br /><b>0.18.5</b> <i>Latest Minor</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"> @@ -1387,7 +1387,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>4.0.0-b03</b> <i>Next Version</i></td></tr></table></div> +<td><b>4.0.0-b03</b> <i>Next Version</i><br />4.0.0-b04<br />4.0.0-b05</td></tr></table></div> <div class="section"> <h3><a name="junit:junit"></a>junit:junit</h3> <table border="0" class="table table-striped"> @@ -1582,7 +1582,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr></table></div> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.apache.maven:maven-compat"></a>org.apache.maven:maven-compat</h3> <table border="0" class="table table-striped"> @@ -1609,7 +1609,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr></table></div> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.apache.maven:maven-core"></a>org.apache.maven:maven-core</h3> <table border="0" class="table table-striped"> @@ -1636,7 +1636,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr></table></div> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.apache.maven:maven-model"></a>org.apache.maven:maven-model</h3> <table border="0" class="table table-striped"> @@ -1663,7 +1663,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr></table></div> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.apache.maven:maven-plugin-api"></a>org.apache.maven:maven-plugin-api</h3> <table border="0" class="table table-striped"> @@ -1690,7 +1690,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr></table></div> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.apache.maven:maven-settings"></a>org.apache.maven:maven-settings</h3> <table border="0" class="table table-striped"> @@ -1717,7 +1717,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr></table></div> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr></table></div> <div class="section"> <h3><a name="org.apache.maven.plugin-tools:maven-plugin-annotations"></a>org.apache.maven.plugin-tools:maven-plugin-annotations</h3> <table border="0" class="table table-striped"> @@ -1798,7 +1798,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.debux.webmotion</td></tr> @@ -1816,13 +1816,16 @@ <td></td></tr> <tr class="a"> <th width="80%">Type</th> -<td>jar</td></tr></table></div> +<td>jar</td></tr> +<tr class="b"> +<th width="80%">Newer versions</th> +<td><b>2.5.3</b> <i>Next Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="org.debux.webmotion:webmotion-unittest"></a>org.debux.webmotion:webmotion-unittest</h3> <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.debux.webmotion</td></tr> @@ -1840,7 +1843,10 @@ <td></td></tr> <tr class="a"> <th width="80%">Type</th> -<td>jar</td></tr></table></div> +<td>jar</td></tr> +<tr class="b"> +<th width="80%">Newer versions</th> +<td><b>2.5.3</b> <i>Next Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="org.freemarker:freemarker"></a>org.freemarker:freemarker</h3> <table border="0" class="table table-striped"> @@ -1867,7 +1873,7 @@ <td>jar</td></tr> <tr class="b"> <th width="80%">Newer versions</th> -<td><b>2.3.24-incubating</b> <i>Next Incremental</i><br /><b>2.3.25-incubating</b> <i>Latest Incremental</i></td></tr></table></div> +<td><b>2.3.24-incubating</b> <i>Next Incremental</i><br />2.3.25-incubating<br /><b>2.3.26-incubating</b> <i>Latest Incremental</i></td></tr></table></div> <div class="section"> <h3><a name="org.hibernate:hibernate-core"></a>org.hibernate:hibernate-core</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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Developer Activity Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -89,8 +89,8 @@ <div class="section"> <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> -<h3><a name="Changes_between_2017-02-18_and_2017-03-21"></a>Changes between 2017-02-18 and 2017-03-21</h3> -<p>Total commits: 80<br />Total number of files changed: 2403</p> +<h3><a name="Changes_between_2017-03-01_and_2017-04-01"></a>Changes between 2017-03-01 and 2017-04-01</h3> +<p>Total commits: 123<br />Total number of files changed: 2572</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -98,8 +98,8 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>80</td> -<td>2403</td></tr></table></div></div> +<td>123</td> +<td>2572</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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – ObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</a><span class="divider">»</span></li> <li class="active ">ObServe</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== install-serverPG.html ===================================== --- a/install-serverPG.html +++ b/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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Installation du serveur Obstuna</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Installation dObServe</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Intégration continue</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Contrôle des livraisons</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Licence du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Gestion des plugins du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Plugin Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Project Plugins</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Information générale du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Rapports générés par Maven</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Résumé du projet</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -131,7 +131,7 @@ <td>pom</td></tr> <tr class="b"> <td>Version</td> -<td>6.0-RC-1</td></tr> +<td>6.0-RC-2</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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Property Updates Report</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> @@ -93,7 +93,7 @@ <tr class="a"> <td><img src="images/icon_success_sml.gif" alt="" /></td> <td># of properties using the latest version available</td> -<td>13</td></tr> +<td>12</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of properties where the next version available is smaller than an incremental version update</td> @@ -101,7 +101,7 @@ <tr class="a"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of properties where the next version available is an incremental version update</td> -<td>4</td></tr> +<td>5</td></tr> <tr class="b"> <td><img src="images/icon_warning_sml.gif" alt="" /></td> <td># of properties where the next version available is a minor version update</td> @@ -250,11 +250,11 @@ <td></td> <td></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>${webmotionVersion}</td> <td>2.5.1</td> <td></td> -<td></td> +<td><b>2.5.3</b></td> <td></td> <td></td></tr> <tr class="b"> @@ -457,7 +457,7 @@ <td>3.3.9</td></tr> <tr class="a"> <th width="80%">Newer versions</th> -<td><b>3.5.0-alpha-1</b> <i>Next Minor</i></td></tr> +<td><b>3.5.0-alpha-1</b> <i>Next Minor</i><br /><b>3.5.0-beta-1</b> <i>Latest Minor</i></td></tr> <tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> @@ -814,7 +814,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%">Property</th> <td>${webmotionVersion}</td></tr> @@ -825,18 +825,21 @@ <th width="80%">Current Version</th> <td>2.5.1</td></tr> <tr class="a"> +<th width="80%">Newer versions</th> +<td><b>2.5.3</b> <i>Next Incremental</i></td></tr> +<tr class="b"> <th width="80%">Allowed version range</th> <td>[,)</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Infer associations from project</th> <td>Yes</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Only use release versions</th> <td>No</td></tr> -<tr class="b"> +<tr class="a"> <th width="80%">Include projects from reactor</th> <td>Yes</td></tr> -<tr class="a"> +<tr class="b"> <th width="80%">Always use reactor projects (even if older or -SNAPSHOT)</th> <td>Yes</td></tr></table></div> <div class="section"> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Sitemap</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</a><span class="divider">»</span></li> <li class="active ">Sitemap</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Dépôt de sources</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== 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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Liste des membres</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> ===================================== third-party-report.html ===================================== --- a/third-party-report.html +++ b/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="20170320" /> + <meta name="Date-Revision-yyyymmdd" content="20170331" /> <meta http-equiv="Content-Language" content="fr" /> <title>ObServe – Tierces parties</title> <link rel="stylesheet" href="./css/apache-maven-fluido-1.6.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">ObServe</a><span class="divider">»</span></li> <li class="active ">Tierces parties</li> - <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-1</li> + <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-31</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 6.0-RC-2</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> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fcc48ad70e59d6a755ee546136e…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 53e643b3 by Tony CHEMIT at 2017-03-31T14:42:47+02:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,8 +6,8 @@ ## Version [6.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/87) ### Download -* [Application (observe-6.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 749]](https://gitlab.com/ultreiaio/ird-observe/issues/749) **Problème de fonctionnement de la fenêtre d'erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -17,6 +17,7 @@ * [[Anomalie 761]](https://gitlab.com/ultreiaio/ird-observe/issues/761) **Sur les doubles listes les boutons du mileu n'ont plus d'icones** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 762]](https://gitlab.com/ultreiaio/ird-observe/issues/762) **Possibilité d'insérer un capteur alors que son type n'a pas été renseigné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Anomalie 763]](https://gitlab.com/ultreiaio/ird-observe/issues/763) **Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 764]](https://gitlab.com/ultreiaio/ird-observe/issues/764) **Impossible de lancer l'assistant migration** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 750]](https://gitlab.com/ultreiaio/ird-observe/issues/750) **Filtres d'affichage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 751]](https://gitlab.com/ultreiaio/ird-observe/issues/751) **Filtrage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Evolution 753]](https://gitlab.com/ultreiaio/ird-observe/issues/753) **[UI] Mise en page de la fenêtre d'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/53e643b3675da5bf7c4512de2e0…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT deleted branch release/6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][release/6.0-RC-2] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch release/6.0-RC-2 at ultreiaio / ird-observe Commits: 2144b5ef by Tony CHEMIT at 2017-03-31T14:24:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2144b5ef4666b886c3fc6bebae0…

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed new tag v6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master] 11 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 219df83f by Tony CHEMIT at 2017-03-30T16:12:24+02:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development - - - - - fd2b5069 by Tony CHEMIT at 2017-03-30T16:18:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - dc848ed4 by Tony CHEMIT at 2017-03-30T16:18:23+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 991c3c98 by Tony CHEMIT at 2017-03-30T16:18:24+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - b0e8e5e8 by Tony CHEMIT at 2017-03-30T16:25:57+02:00 Update changelog after stage of milestone 6.0-RC-2 - - - - - e684cde8 by Tony CHEMIT at 2017-03-30T16:31:25+02:00 update changelog - - - - - 3f222899 by Tony CHEMIT at 2017-03-30T16:38:02+02:00 fix release build (for site generation and demo deployement) - - - - - 64bc6735 by Tony CHEMIT at 2017-03-31T14:20:48+02:00 impossible de lancer l'assistant migration (See #764) - - - - - 92a50481 by Tony CHEMIT at 2017-03-31T14:22:52+02:00 reroll 6.0-RC-2 - - - - - 2144b5ef by Tony CHEMIT at 2017-03-31T14:24:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 00c4a3a0 by Tony CHEMIT at 2017-03-31T14:30:08+02:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' - - - - - 9 changed files: - .gitlab-ci.yml - CHANGELOG.md - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ stages: .deploy_site: &deploy_site script: - - mvn clean verify site -DperformRelease scm-publish:publish-scm + - mvn clean install site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,33 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-29 18:02. + * Last generated at 2017-03-30 16:25. -## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) - -**Closed at *In progress*.** +## Version [6.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/87) ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 749]](https://gitlab.com/ultreiaio/ird-observe/issues/749) **Problème de fonctionnement de la fenêtre d'erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 752]](https://gitlab.com/ultreiaio/ird-observe/issues/752) **Problème à la première ouverture de la v6, lorsqu'une base v5 est présente dans /db** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 754]](https://gitlab.com/ultreiaio/ird-observe/issues/754) **Le raccourci F6 semble ne pas fonctionner** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 759]](https://gitlab.com/ultreiaio/ird-observe/issues/759) **Perte des messages de validations** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 761]](https://gitlab.com/ultreiaio/ird-observe/issues/761) **Sur les doubles listes les boutons du mileu n'ont plus d'icones** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 762]](https://gitlab.com/ultreiaio/ird-observe/issues/762) **Possibilité d'insérer un capteur alors que son type n'a pas été renseigné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 763]](https://gitlab.com/ultreiaio/ird-observe/issues/763) **Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 750]](https://gitlab.com/ultreiaio/ird-observe/issues/750) **Filtres d'affichage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 751]](https://gitlab.com/ultreiaio/ird-observe/issues/751) **Filtrage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 753]](https://gitlab.com/ultreiaio/ird-observe/issues/753) **[UI] Mise en page de la fenêtre d'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 755]](https://gitlab.com/ultreiaio/ird-observe/issues/755) **[UI] Sortie au clavier d'une zone de texte** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 756]](https://gitlab.com/ultreiaio/ird-observe/issues/756) **[UI] Code couleur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 757]](https://gitlab.com/ultreiaio/ird-observe/issues/757) **Ne pas faire une sauvegarde de la base si aucune action de modification n'a été effectuée sur la base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 760]](https://gitlab.com/ultreiaio/ird-observe/issues/760) **Suppression des autres raccourcis claiviers lorsqu'un raccourci global existe pour la même action** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + +## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) + +**Closed at 2017-03-30.** ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -61,6 +61,10 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -60,6 +60,10 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentServerConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseRemoteConfigurationUIAction.class.getName(); + public UseRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, null, null, "db-remote", null); + } + public UseRemoteConfigurationUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, null, "db-remote", null); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseServerConfigurationUIAction.class.getName(); + public UseServerConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, null, null, "db-server", null); + } + public UseServerConfigurationUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, null, "db-server", null); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -27,18 +27,19 @@ import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.reflections.Reflections; - +import java.awt.Component; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.Optional; +import java.util.Set; import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; -import java.util.Set; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.reflections.Reflections; /** * Created on 10/11/16. @@ -51,16 +52,22 @@ public class ObserveActionMap extends ActionMap { /** Logger */ private static final Log log = LogFactory.getLog(ObserveActionMap.class); - private final ObserveMainUI ui; + private final Component ui; private final ImmutableMap<String, Class<? extends AbstractUIAction>> mapping; private final ImmutableMap<String, ? extends AbstractGlobalUIAction> globalActions; public ObserveActionMap(ObserveMainUI ui) { + this(ui, ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(JComponent ui) { + this(ui, ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(Component ui, InputMap inputMap) { this.ui = ui; Set<Class<? extends AbstractUIAction>> actionTypes = new Reflections("fr.ird.observe.application.swing.ui.actions").getSubTypesOf(AbstractUIAction.class); - InputMap inputMap = ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - ImmutableMap.Builder<String, Class<? extends AbstractUIAction>> mappingBuilder = ImmutableMap.builder(); ImmutableMap.Builder<String, AbstractGlobalUIAction> globalActionsBuilder = ImmutableMap.builder(); for (Class<? extends AbstractUIAction> actionType : actionTypes) { @@ -79,13 +86,16 @@ public class ObserveActionMap extends ActionMap { if (AbstractGlobalUIAction.class.isAssignableFrom(actionType)) { // action globale - Class<? extends AbstractGlobalUIAction> globalActionType = (Class) actionType; + Class<AbstractGlobalUIAction> globalActionType = (Class) actionType; if (log.isInfoEnabled()) { log.info("Register global action: " + actionId + " - type: " + globalActionType.getName()); } - AbstractGlobalUIAction globalUIAction = newAction(actionId, globalActionType); - globalActionsBuilder.put(actionId, globalUIAction); - inputMap.put(globalUIAction.getAcceleratorKey(), actionId); + Optional<AbstractGlobalUIAction> globalUIAction = newAction(actionId, globalActionType); + if (globalUIAction.isPresent()) { + + globalActionsBuilder.put(actionId, globalUIAction.get()); + inputMap.put(globalUIAction.get().getAcceleratorKey(), actionId); + } } else { @@ -104,6 +114,7 @@ public class ObserveActionMap extends ActionMap { } + @Override public Action get(Object key) { @@ -118,7 +129,8 @@ public class ObserveActionMap extends ActionMap { return super.get(key); } - return newAction((String) key, actionType); + Optional<? extends AbstractUIAction> optional = newAction((String) key, actionType); + return optional.orElse(null); } @@ -126,15 +138,16 @@ public class ObserveActionMap extends ActionMap { return globalActions; } - private <A extends AbstractUIAction> A newAction(String key, Class<A> actionType) { + private <A extends AbstractUIAction> Optional<A> newAction(String key, Class<A> actionType) { try { if (log.isDebugEnabled()) { log.debug("Create action: " + key + ", type: " + actionType.getName()); } - return ConstructorUtils.invokeConstructor(actionType, ui); + return Optional.of(ConstructorUtils.invokeConstructor(actionType, ui)); } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { - throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); + return Optional.empty(); +// throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -36,22 +36,22 @@ import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JMenuItem; import java.awt.BorderLayout; import java.awt.Color; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.Objects; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JMenuItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION; import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW; @@ -70,10 +70,15 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; public static final String ACTION_DO_USE_SSL = "doUseSsl"; + private ObserveActionMap observeActionMap; @Override public void afterInit(ConfigUI ui) { + observeActionMap = ObserveSwingApplicationContext.get().getActionMap(); + if (observeActionMap ==null) { + observeActionMap = new ObserveActionMap(ui); + } PropertyChangeListener listener = evt -> { StorageUIModel model = (StorageUIModel) evt.getSource(); String propertyName = evt.getPropertyName(); @@ -119,41 +124,38 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); ObserveKeyStrokes.addKeyStroke(ui.getRemoteUseSsl(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL); - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); - init(observeActionMap, ui.getSaveRemoteConfiguration()); - init(observeActionMap, ui.getSaveServerConfiguration()); - init(observeActionMap, ui.getServerMenu()); - init(observeActionMap, ui.getRemoteMenu()); + init(ui.getSaveRemoteConfiguration()); + init(ui.getSaveServerConfiguration()); + init(ui.getServerMenu()); + init(ui.getRemoteMenu()); - for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getRemoteDataSourceConfigurations()) { + for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurations()) { addRemoteConfiguration(configuration); } - for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getServerDataSourceConfigurations()) { + for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurations()) { addServerConfiguration(configuration); } } public void addRemoteConfiguration(RemoteDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); item.putClientProperty("text", configuration.getName()); item.putClientProperty("toolTipText", configuration.getName()); item.putClientProperty(OBSERVE_ACTION, UseRemoteConfigurationUIAction.ACTION_NAME); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getRemoteMenu().add(item); } public void addServerConfiguration(ServerDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); item.putClientProperty("text", configuration.getName()); item.putClientProperty("toolTipText", configuration.getName()); item.putClientProperty(OBSERVE_ACTION, UseServerConfigurationUIAction.ACTION_NAME); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getServerMenu().add(item); } @@ -205,7 +207,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } - protected AbstractUIAction init(ActionMap actionMap, AbstractButton editor) { + protected AbstractUIAction init(AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { // le boutton n'est pas commun @@ -213,7 +215,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } // on a trouve une action commune - AbstractUIAction action = (AbstractUIAction) actionMap.get(actionId); + AbstractUIAction action = (AbstractUIAction) this.observeActionMap.get(actionId); Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); if (log.isDebugEnabled()) { ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -757,6 +757,15 @@ <build> +  + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.2</version> + </extension> + </extensions> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2d4a14277aa8fd82c9a59e7e14…

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2144b5ef by Tony CHEMIT at 2017-03-31T14:24:05+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 00c4a3a0 by Tony CHEMIT at 2017-03-31T14:30:08+02:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' - - - - - 424821f9 by Tony CHEMIT at 2017-03-31T14:30:11+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 46b120b7 by Tony CHEMIT at 2017-03-31T14:30:11+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 20316936 by Tony CHEMIT at 2017-03-31T14:30:12+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ea8a6138d2b4953bd078e9ec77…

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ea8a6138 by Tony CHEMIT at 2017-03-31T14:23:45+02:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ea8a6138d2b4953bd078e9ec774…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed new branch release/6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] reroll 6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 92a50481 by Tony CHEMIT at 2017-03-31T14:22:52+02:00 reroll 6.0-RC-2 - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-3-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/92a5048148ccf10af80f26e6b8b…

1 0

[Git][ultreiaio/ird-observe] Deleted tag v6.0-RC-2
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT deleted tag v6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] impossible de lancer l'assistant migration (See #764)
by Tony CHEMIT March 31, 2017

March 31, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 64bc6735 by Tony CHEMIT at 2017-03-31T14:20:48+02:00 impossible de lancer l'assistant migration (See #764) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -61,6 +61,10 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.remoteConfiguration.presets.save"), t("observe.storage.remoteConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -60,6 +60,10 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { super(mainUI, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); } + public SaveCurrentServerConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, t("observe.storage.serverConfiguration.presets.save"), t("observe.storage.serverConfiguration.presets.save"), "save", ObserveKeyStrokes.KEY_STROKE_SAVE); + } + @Override public void actionPerformed(ActionEvent e) { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseRemoteConfigurationUIAction.class.getName(); + public UseRemoteConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, null, null, "db-remote", null); + } + public UseRemoteConfigurationUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, null, "db-remote", null); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -48,6 +48,10 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { public static final String ACTION_NAME = UseServerConfigurationUIAction.class.getName(); + public UseServerConfigurationUIAction(ConfigUI mainUI) { + super(null, ACTION_NAME, null, null, "db-server", null); + } + public UseServerConfigurationUIAction(ObserveMainUI mainUI) { super(mainUI, ACTION_NAME, null, null, "db-server", null); } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveActionMap.java @@ -27,18 +27,19 @@ import fr.ird.observe.application.swing.ObserveSwingTechnicalException; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.actions.AbstractUIAction; import fr.ird.observe.application.swing.ui.actions.global.AbstractGlobalUIAction; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.reflections.Reflections; - +import java.awt.Component; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Modifier; +import java.util.Optional; +import java.util.Set; import javax.swing.Action; import javax.swing.ActionMap; import javax.swing.InputMap; import javax.swing.JComponent; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Modifier; -import java.util.Set; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.reflections.Reflections; /** * Created on 10/11/16. @@ -51,16 +52,22 @@ public class ObserveActionMap extends ActionMap { /** Logger */ private static final Log log = LogFactory.getLog(ObserveActionMap.class); - private final ObserveMainUI ui; + private final Component ui; private final ImmutableMap<String, Class<? extends AbstractUIAction>> mapping; private final ImmutableMap<String, ? extends AbstractGlobalUIAction> globalActions; public ObserveActionMap(ObserveMainUI ui) { + this(ui, ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(JComponent ui) { + this(ui, ui.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)); + } + + public ObserveActionMap(Component ui, InputMap inputMap) { this.ui = ui; Set<Class<? extends AbstractUIAction>> actionTypes = new Reflections("fr.ird.observe.application.swing.ui.actions").getSubTypesOf(AbstractUIAction.class); - InputMap inputMap = ui.getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW); - ImmutableMap.Builder<String, Class<? extends AbstractUIAction>> mappingBuilder = ImmutableMap.builder(); ImmutableMap.Builder<String, AbstractGlobalUIAction> globalActionsBuilder = ImmutableMap.builder(); for (Class<? extends AbstractUIAction> actionType : actionTypes) { @@ -79,13 +86,16 @@ public class ObserveActionMap extends ActionMap { if (AbstractGlobalUIAction.class.isAssignableFrom(actionType)) { // action globale - Class<? extends AbstractGlobalUIAction> globalActionType = (Class) actionType; + Class<AbstractGlobalUIAction> globalActionType = (Class) actionType; if (log.isInfoEnabled()) { log.info("Register global action: " + actionId + " - type: " + globalActionType.getName()); } - AbstractGlobalUIAction globalUIAction = newAction(actionId, globalActionType); - globalActionsBuilder.put(actionId, globalUIAction); - inputMap.put(globalUIAction.getAcceleratorKey(), actionId); + Optional<AbstractGlobalUIAction> globalUIAction = newAction(actionId, globalActionType); + if (globalUIAction.isPresent()) { + + globalActionsBuilder.put(actionId, globalUIAction.get()); + inputMap.put(globalUIAction.get().getAcceleratorKey(), actionId); + } } else { @@ -104,6 +114,7 @@ public class ObserveActionMap extends ActionMap { } + @Override public Action get(Object key) { @@ -118,7 +129,8 @@ public class ObserveActionMap extends ActionMap { return super.get(key); } - return newAction((String) key, actionType); + Optional<? extends AbstractUIAction> optional = newAction((String) key, actionType); + return optional.orElse(null); } @@ -126,15 +138,16 @@ public class ObserveActionMap extends ActionMap { return globalActions; } - private <A extends AbstractUIAction> A newAction(String key, Class<A> actionType) { + private <A extends AbstractUIAction> Optional<A> newAction(String key, Class<A> actionType) { try { if (log.isDebugEnabled()) { log.debug("Create action: " + key + ", type: " + actionType.getName()); } - return ConstructorUtils.invokeConstructor(actionType, ui); + return Optional.of(ConstructorUtils.invokeConstructor(actionType, ui)); } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) { - throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); + return Optional.empty(); +// throw new ObserveSwingTechnicalException("Hum, can't creation action for type: " + actionType.getName(), e); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -36,22 +36,22 @@ import fr.ird.observe.application.swing.ui.storage.StorageStep; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration; import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration; -import org.nuiton.jaxx.runtime.spi.UIHandler; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import javax.swing.AbstractAction; -import javax.swing.AbstractButton; -import javax.swing.ActionMap; -import javax.swing.Icon; -import javax.swing.JComponent; -import javax.swing.JMenuItem; import java.awt.BorderLayout; import java.awt.Color; import java.awt.event.ActionEvent; import java.beans.PropertyChangeListener; import java.io.File; import java.util.Objects; +import javax.swing.AbstractAction; +import javax.swing.AbstractButton; +import javax.swing.ActionMap; +import javax.swing.Icon; +import javax.swing.JComponent; +import javax.swing.JMenuItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.jaxx.runtime.spi.UIHandler; + import static fr.ird.observe.application.swing.ui.content.ContentUIInitializer.OBSERVE_ACTION; import static javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW; @@ -70,10 +70,15 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; public static final String ACTION_DO_USE_SSL = "doUseSsl"; + private ObserveActionMap observeActionMap; @Override public void afterInit(ConfigUI ui) { + observeActionMap = ObserveSwingApplicationContext.get().getActionMap(); + if (observeActionMap ==null) { + observeActionMap = new ObserveActionMap(ui); + } PropertyChangeListener listener = evt -> { StorageUIModel model = (StorageUIModel) evt.getSource(); String propertyName = evt.getPropertyName(); @@ -119,41 +124,38 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); ObserveKeyStrokes.addKeyStroke(ui.getRemoteUseSsl(), ObserveKeyStrokes.KEY_STROKE_STORAGE_DO_USE_SSL); - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); - init(observeActionMap, ui.getSaveRemoteConfiguration()); - init(observeActionMap, ui.getSaveServerConfiguration()); - init(observeActionMap, ui.getServerMenu()); - init(observeActionMap, ui.getRemoteMenu()); + init(ui.getSaveRemoteConfiguration()); + init(ui.getSaveServerConfiguration()); + init(ui.getServerMenu()); + init(ui.getRemoteMenu()); - for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getRemoteDataSourceConfigurations()) { + for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurations()) { addRemoteConfiguration(configuration); } - for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getMainUI().getConfig().getServerDataSourceConfigurations()) { + for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurations()) { addServerConfiguration(configuration); } } public void addRemoteConfiguration(RemoteDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); item.putClientProperty("text", configuration.getName()); item.putClientProperty("toolTipText", configuration.getName()); item.putClientProperty(OBSERVE_ACTION, UseRemoteConfigurationUIAction.ACTION_NAME); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getRemoteMenu().add(item); } public void addServerConfiguration(ServerDataSourceConfiguration configuration) { - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); item.putClientProperty("text", configuration.getName()); item.putClientProperty("toolTipText", configuration.getName()); item.putClientProperty(OBSERVE_ACTION, UseServerConfigurationUIAction.ACTION_NAME); - AbstractUIAction action = init(observeActionMap, item); + AbstractUIAction action = init(item); action.updateAction(ui, item); ui.getServerMenu().add(item); } @@ -205,7 +207,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } - protected AbstractUIAction init(ActionMap actionMap, AbstractButton editor) { + protected AbstractUIAction init(AbstractButton editor) { String actionId = (String) editor.getClientProperty(OBSERVE_ACTION); if (actionId == null) { // le boutton n'est pas commun @@ -213,7 +215,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI } // on a trouve une action commune - AbstractUIAction action = (AbstractUIAction) actionMap.get(actionId); + AbstractUIAction action = (AbstractUIAction) this.observeActionMap.get(actionId); Objects.requireNonNull(action, "action [" + actionId + "] not found for ui " + ui.getClass().getName()); if (log.isDebugEnabled()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/64bc673581da96f1a4029e85055…

1 0

[Git][ultreiaio/ird-observe][develop] fix release build (for site generation and demo deployement)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3f222899 by Tony CHEMIT at 2017-03-30T16:38:02+02:00 fix release build (for site generation and demo deployement) - - - - - 2 changed files: - .gitlab-ci.yml - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ stages: .deploy_site: &deploy_site script: - - mvn clean verify site -DperformRelease scm-publish:publish-scm + - mvn clean install site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -757,6 +757,15 @@ <build> +  + <extensions> + <extension> + <groupId>org.apache.maven.wagon</groupId> + <artifactId>wagon-ssh-external</artifactId> + <version>2.2</version> + </extension> + </extensions> + <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3f22289994a00454eb32d52df4b…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e684cde8 by Tony CHEMIT at 2017-03-30T16:31:25+02:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,9 @@ ## Version [6.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/87) -**Closed at *In progress*.** - +### Download +* [Application (observe-6.0-RC-2.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-2.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 749]](https://gitlab.com/ultreiaio/ird-observe/issues/749) **Problème de fonctionnement de la fenêtre d'erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) @@ -26,8 +27,7 @@ ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) -**Closed at *In progress*.** - +**Closed at 2017-03-30.** ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e684cde819af7a14392120047ca…

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 6.0-RC-2
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b0e8e5e8 by Tony CHEMIT at 2017-03-30T16:25:57+02:00 Update changelog after stage of milestone 6.0-RC-2 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,33 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-29 18:02. + * Last generated at 2017-03-30 16:25. + +## Version [6.0-RC-2](https://gitlab.com/ultreiaio/ird-observe/milestones/87) + +**Closed at *In progress*.** + + +### Issues + * [[Anomalie 749]](https://gitlab.com/ultreiaio/ird-observe/issues/749) **Problème de fonctionnement de la fenêtre d'erreur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 752]](https://gitlab.com/ultreiaio/ird-observe/issues/752) **Problème à la première ouverture de la v6, lorsqu'une base v5 est présente dans /db** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 754]](https://gitlab.com/ultreiaio/ird-observe/issues/754) **Le raccourci F6 semble ne pas fonctionner** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 759]](https://gitlab.com/ultreiaio/ird-observe/issues/759) **Perte des messages de validations** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 761]](https://gitlab.com/ultreiaio/ird-observe/issues/761) **Sur les doubles listes les boutons du mileu n'ont plus d'icones** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 762]](https://gitlab.com/ultreiaio/ird-observe/issues/762) **Possibilité d'insérer un capteur alors que son type n'a pas été renseigné** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 763]](https://gitlab.com/ultreiaio/ird-observe/issues/763) **Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 750]](https://gitlab.com/ultreiaio/ird-observe/issues/750) **Filtres d'affichage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 751]](https://gitlab.com/ultreiaio/ird-observe/issues/751) **Filtrage de l'arbre** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 753]](https://gitlab.com/ultreiaio/ird-observe/issues/753) **[UI] Mise en page de la fenêtre d'application** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 755]](https://gitlab.com/ultreiaio/ird-observe/issues/755) **[UI] Sortie au clavier d'une zone de texte** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 756]](https://gitlab.com/ultreiaio/ird-observe/issues/756) **[UI] Code couleur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 757]](https://gitlab.com/ultreiaio/ird-observe/issues/757) **Ne pas faire une sauvegarde de la base si aucune action de modification n'a été effectuée sur la base locale** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 760]](https://gitlab.com/ultreiaio/ird-observe/issues/760) **Suppression des autres raccourcis claiviers lorsqu'un raccourci global existe pour la même action** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) **Closed at *In progress*.** -### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b0e8e5e8e5520210f89aa3a8ee6…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/6.0-RC-2
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT deleted branch release/6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][release/6.0-RC-2] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch release/6.0-RC-2 at ultreiaio / ird-observe Commits: 647123a8 by Tony CHEMIT at 2017-03-30T16:12:42+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-2</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/647123a80b0bf2e53b1a9ce4ef7…

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v6.0-RC-2
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed new tag v6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master] 36 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 81cd6cdc by Tony CHEMIT at 2017-03-20T11:40:54+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 9056f57e by Tony CHEMIT at 2017-03-20T11:47:19+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 7d28b347 by Tony CHEMIT at 2017-03-20T11:47:20+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 46e3806f by Tony CHEMIT at 2017-03-20T11:47:21+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - bd0dd9a2 by Tony CHEMIT at 2017-03-20T11:57:30+01:00 update changelog [skip ci] - - - - - 18065729 by Tony CHEMIT at 2017-03-20T14:52:25+01:00 add build for site - - - - - ece95278 by Tony CHEMIT at 2017-03-22T07:58:15+01:00 [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - e2c767e4 by Tony CHEMIT at 2017-03-22T07:00:58+00:00 Update README.md [skip ci] - - - - - 6d2da517 by Tony CHEMIT at 2017-03-22T08:31:52+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 79be8ad6 by Tony CHEMIT at 2017-03-22T08:32:40+01:00 update changelog with staging [skip ci] - - - - - 6d2cf6e4 by Tony CHEMIT at 2017-03-22T13:23:39+01:00 fix builds - - - - - 2b989765 by Tony CHEMIT at 2017-03-29T09:17:39+02:00 Filtres d'affichage de l'arbre (See #750) /label ~Résolu /milestone %6.0-RC-2 - - - - - 8189b93a by Tony CHEMIT at 2017-03-29T09:49:40+02:00 Mettre une largeur minimum sur l'arbre de navigation (See #751) - - - - - 217017d7 by Tony CHEMIT at 2017-03-29T13:00:22+02:00 Amélioration du header de l'arbre de navigation (See #751) - - - - - 83996403 by Tony CHEMIT at 2017-03-29T13:02:10+02:00 Code couleurs (see #756) - - - - - cd4789de by Tony CHEMIT at 2017-03-29T16:08:46+02:00 Correction de la migration de base (See #752) - - - - - 0e3e8694 by Tony CHEMIT at 2017-03-29T17:09:26+02:00 [Report 5.x] Correction de la génération des script d'import entre deux bases distantes (see #758) - - - - - b1185270 by Tony CHEMIT at 2017-03-29T18:03:33+02:00 update changelog after release 5.3.7 [skip ci] - - - - - e70a4e9e by Tony CHEMIT at 2017-03-29T18:43:32+02:00 Squash validators and validation modules - - - - - b2e2c85e by Tony CHEMIT at 2017-03-29T18:46:22+02:00 remove obsolete files - - - - - 8d2b41f5 by Tony CHEMIT at 2017-03-29T19:32:27+02:00 Ne pas faire de sauvegarde lorsqu'aucune modification n'a été effectuée sur la base (see #757) - - - - - 9d260751 by Tony CHEMIT at 2017-03-29T23:33:28+02:00 Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bien désormais (See #754) - - - - - 4d8a433a by Tony CHEMIT at 2017-03-30T08:57:21+02:00 Ajout message d'info sur les commentaires (pour le focus) (See #755) - - - - - fa4fdc2d by Tony CHEMIT at 2017-03-30T09:16:27+02:00 Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759) - - - - - fbe132a3 by Tony CHEMIT at 2017-03-30T09:20:15+02:00 Ne pas modifier le formulaire si on resélectionne dans l'abre le nœud courant (See #759) - - - - - 8237b901 by Tony CHEMIT at 2017-03-30T09:21:22+02:00 try to make builds work again - - - - - fdd698f7 by Tony CHEMIT at 2017-03-30T10:55:51+02:00 Squash validators and validation modules - - - - - f0d6ecb3 by Tony CHEMIT at 2017-03-30T11:14:28+02:00 Squash services-configuration modules - - - - - 91d9cc3b by Tony CHEMIT at 2017-03-30T11:15:46+02:00 update license headers - - - - - d85bab86 by Tony CHEMIT at 2017-03-30T13:13:51+02:00 Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec les globaux) (See #760) - - - - - fa0332bd by Tony CHEMIT at 2017-03-30T13:34:06+02:00 Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761) - - - - - 4371d8ee by Tony CHEMIT at 2017-03-30T13:58:51+02:00 Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce) - - - - - a9837e41 by Tony CHEMIT at 2017-03-30T14:10:59+02:00 Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet (See #763) - - - - - 3166590c by Tony CHEMIT at 2017-03-30T14:28:22+02:00 Possibilité d'insérer un capteur alors que son type n'a pas été renseigné (See #762) - - - - - 647123a8 by Tony CHEMIT at 2017-03-30T16:12:42+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 2d4a1427 by Tony CHEMIT at 2017-03-30T16:18:19+02:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/log4j.properties - − application-swing-decoration/changelog.txt - application-swing-decoration/pom.xml - − application-swing-validation/changelog.txt - application-swing-validation/pom.xml - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java → application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java → application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java → application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java → application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLatitudeDtoFieldValidator.java → application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLongitudeDtoFieldValidator.java → application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java → application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java → application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java → application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java → application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java → application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java → application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - − application-swing-validators/LICENSE.txt - − application-swing-validators/README.md - − application-swing-validators/pom.xml - − application-swing-validators/src/license/THIRD-PARTY.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8d2b2cee04f05a24a2f3663ef1…

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 647123a8 by Tony CHEMIT at 2017-03-30T16:12:42+02:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-2' with non-snapshot versions - - - - - 2d4a1427 by Tony CHEMIT at 2017-03-30T16:18:19+02:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-2' into 'master' - - - - - fd2b5069 by Tony CHEMIT at 2017-03-30T16:18:23+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - dc848ed4 by Tony CHEMIT at 2017-03-30T16:18:23+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 991c3c98 by Tony CHEMIT at 2017-03-30T16:18:24+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/219df83f00259469fa2f1ed4f6…

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 219df83f by Tony CHEMIT at 2017-03-30T16:12:24+02:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/219df83f00259469fa2f1ed4f69…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/6.0-RC-2
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed new branch release/6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] Possibilité d'insérer un capteur alors que son type n'a pas été renseigné (See #762)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3166590c by Tony CHEMIT at 2017-03-30T14:28:22+02:00 Possibilité d'insérer un capteur alors que son type n'a pas été renseigné (See #762) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java @@ -44,6 +44,9 @@ public class NewTableEntryUIAction extends AbstractContentUIAction { @Override protected void actionPerformed(ContentUI<?, ?> ui) { ContentTableUI<?, ?, ?> contentUI = (ContentTableUI<?, ?, ?>) ui; + // pour forcer le rechargement du binding + contentUI.getModel().setCanSaveRow(true); + contentUI.getModel().setCanSaveRow(false); contentUI.getTableModel().addNewEntry(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3166590c7521d8c49350f67c4ff…

1 0

[Git][ultreiaio/ird-observe][develop] Dans certaisn référentiels, les doubles listes ne prennent pas toute la place di…
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a9837e41 by Tony CHEMIT at 2017-03-30T14:10:59+02:00 Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet (See #763) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx @@ -49,7 +49,7 @@ <Table id="editView" insets="0" fill="both"> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> @@ -173,11 +173,6 @@ </JTabbedPane> </cell> </row> - <row> - <cell columns="2" weighty="1"> - <JLabel/> - </cell> - </row> </Table> </fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx @@ -56,7 +56,7 @@ <Table id="editView" insets="0" fill="both"> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> @@ -167,7 +167,7 @@ <Table fill="both" weightx="1">  <row> - <cell weightx="1" weighty="1"> + <cell weighty="1"> <JScrollPane id='speciesPane' layout='{new GridLayout(1,1)}'> <FilterableDoubleList id='species' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class'/> @@ -179,11 +179,6 @@ </JTabbedPane> </cell> </row> - <row> - <cell columns="2" weighty="1"> - <JLabel/> - </cell> - </row> </Table> </fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI> ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1375,16 +1375,16 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.descri observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bi directionnal observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=From left to right observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=From right to left -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=observed -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=non observed -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value3=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value4=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value5=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value6=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value7=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value8=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value9=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value0=observed +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value1=non observed +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value2=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value3=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value4=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value5=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value6=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value7=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value8=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value9=value not defined observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.GROUPED=Batch observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.INDIVIDUAL=Individual observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum.ld1=LD1 ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1377,16 +1377,16 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.descri observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bidireccional observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De izquierda a derecha observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De derecha a izquierda -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=no observado -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=observado -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=valor 2 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value3=valor 3 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value4=valor 4 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value5=valor 5 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value6=valor 6 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value7=valor 7 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value8=valor 8 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value9=valor 9 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value0=no observado +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value1=observado +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value2=valor 2 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value3=valor 3 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value4=valor 4 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value5=valor 5 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value6=valor 6 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value7=valor 7 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value8=valor 8 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value9=valor 9 no definido observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.GROUPED=Agroupado observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.INDIVIDUAL=Por individuo observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum.ld1=LD1 ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1382,16 +1382,16 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.descri observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bidirectionnel observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De la gauche vers la droite observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De la droite vers la gauche -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=non observé -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=observé -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=valeur 2 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value3=valeur 3 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value4=valeur 4 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value5=valeur 5 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value6=valeur 6 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value7=valeur 7 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value8=valeur 8 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value9=valeur 9 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value0=non observé +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value1=observé +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value2=valeur 2 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value3=valeur 3 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value4=valeur 4 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value5=valeur 5 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value6=valeur 6 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value7=valeur 7 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value8=valeur 8 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value9=valeur 9 non définie observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.GROUPED=Groupé observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.INDIVIDUAL=Par individu observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum.ld1=LD1 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a9837e417c64c57041a37e0150b…

1 0

[Git][ultreiaio/ird-observe][develop] Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4371d8ee by Tony CHEMIT at 2017-03-30T13:58:51+02:00 Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthWeightParameterUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthWeightParameterUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4371d8ee46b240e3a270c65ba91…

1 0

[Git][ultreiaio/ird-observe][develop] Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa0332bd by Tony CHEMIT at 2017-03-30T13:34:06+02:00 Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761) - - - - - 1 changed file: - application-swing/src/main/resources/observe-ui.properties Changes: ===================================== application-swing/src/main/resources/observe-ui.properties ===================================== --- a/application-swing/src/main/resources/observe-ui.properties +++ b/application-swing/src/main/resources/observe-ui.properties @@ -81,6 +81,13 @@ icon.action.add=action-add.png icon.action.bean-sort=action-bean-sort.png icon.action.bean-sort-up=action-bean-sort-up.png icon.action.bean-sort-down=action-bean-sort-down.png +icon.action.doublelist-sort=action-doublelist-sort.png +icon.action.doublelist-up=action-doublelist-up.png +icon.action.doublelist-down=action-doublelist-down.png +icon.action.doublelist-sort-up=action-doublelist-sort-up.png +icon.action.doublelist-sort-down=action-doublelist-sort-down.png +icon.action.doublelist-unselect=action-doublelist-unselect.png +icon.action.doublelist-select=action-doublelist-select.png icon.action.config-quit=action-config-quit.png icon.action.config-save=action-config-save.png icon.action.config-reset=action-config-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa0332bd156979a9f15ffa5be7c…

1 0

[Git][ultreiaio/ird-observe][develop] Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec…
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d85bab86 by Tony CHEMIT at 2017-03-30T13:13:51+02:00 Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec les globaux) (See #760) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTabUIActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d85bab860de249cc68cd02dc942…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Squash services-configuration modules
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f0d6ecb3 by Tony CHEMIT at 2017-03-30T11:14:28+02:00 Squash services-configuration modules - - - - - 91d9cc3b by Tony CHEMIT at 2017-03-30T11:15:46+02:00 update license headers - - - - - 30 changed files: - application-swing-configuration/src/main/resources/log4j.properties - application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java - application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java - application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java - application-swing/pom.xml - application-swing/src/main/resources/ftl/initStorage_en.ftl - application-swing/src/main/resources/ftl/initStorage_es.ftl - application-swing/src/main/resources/ftl/initStorage_fr.ftl - application-web/pom.xml - pom.xml - services-binder/src/test/resources/log4j.properties - − services-configuration-rest/LICENSE.txt - − services-configuration-rest/README.md - − services-configuration-rest/pom.xml - − services-configuration-topia/LICENSE.txt - − services-configuration-topia/README.md - − services-configuration-topia/pom.xml - − services-configuration/LICENSE.txt - − services-configuration/README.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fdd698f79b9a0108c59f2c2fd1…

1 0

[Git][ultreiaio/ird-observe][develop] Squash validators and validation modules
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fdd698f7 by Tony CHEMIT at 2017-03-30T10:55:51+02:00 Squash validators and validation modules - - - - - 8 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-web-configuration/pom.xml - services-runner/pom.xml - services-validation/pom.xml - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -48,13 +48,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> + <artifactId>services-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -126,6 +126,24 @@ <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile-generated-sources</id> + <goals> + <goal>compile</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <includes> + <include>**/I18nValidatorHelper.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>${project.groupId}</groupId> <artifactId>toolbox-maven-plugin</artifactId> <version>${project.version}</version> @@ -144,7 +162,6 @@ </execution> <execution> <id>generate-validators-descriptor</id> - <phase>generate-sources</phase> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -156,11 +173,6 @@ <artifactId>services</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </plugin> @@ -173,6 +185,7 @@ <goals> <goal>parserJava</goal> </goals> + <phase>process-classes</phase> <configuration> <entries> <entry> @@ -187,6 +200,7 @@ <goals> <goal>parserValidation</goal> </goals> + <phase>process-classes</phase> <configuration> <entries> <entry> @@ -203,6 +217,7 @@ <goals> <goal>gen</goal> </goals> + <phase>process-classes</phase> </execution> </executions> </plugin> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -44,13 +44,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> + <artifactId>services-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -78,22 +78,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency>  ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -132,7 +132,6 @@ <executions> <execution> <id>generate-i18n-validator-fields</id> - <phase>generate-sources</phase> <goals> <goal>generate-i18n-validator-fields</goal> </goals> @@ -142,7 +141,6 @@ </execution> <execution> <id>generate-validators-descriptor</id> - <phase>generate-sources</phase> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -154,20 +152,33 @@ <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </plugin> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile-generated-sources</id> + <goals> + <goal>compile</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <includes> + <include>**/I18nValidatorHelper.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>parse-java</id> + <phase>process-classes</phase> <goals> <goal>parserJava</goal> </goals> @@ -182,6 +193,7 @@ </execution> <execution> <id>parse-validation</id> + <phase>process-classes</phase> <goals> <goal>parserValidation</goal> </goals> @@ -198,6 +210,7 @@ </execution> <execution> <id>gen</id> + <phase>process-classes</phase> <goals> <goal>gen</goal> </goals> ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java @@ -44,7 +44,7 @@ import java.util.TreeSet; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE) class GenerateI18nValidatorFieldsMojo extends GenerateValidatorMojoSupport { /** ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java @@ -84,7 +84,7 @@ public abstract class GenerateValidatorMojoSupport extends ToolboxMojoSupport im @Override public URLClassLoader getUrlClassLoader() throws MalformedURLException { - return initClassLoader(getProject(), validatorsFile.getParentFile(), true, false, true, true, false); + return initClassLoader(getProject(), validatorsFile.getParentFile(), false, true, true, true, true); } } ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java @@ -48,7 +48,7 @@ import java.util.TreeSet; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE) class GenerateValidatorsDescriptorMojo extends GenerateValidatorMojoSupport { /** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fdd698f79b9a0108c59f2c2fd1f…

1 0

[Git][ultreiaio/ird-observe][develop] try to make builds work again
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8237b901 by Tony CHEMIT at 2017-03-30T09:21:22+02:00 try to make builds work again - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ stages: - Production .before_script_default: &before_script_default - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) @@ -27,9 +24,6 @@ stages: - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8237b9019df07af5d9901034371…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa4fdc2d by Tony CHEMIT at 2017-03-30T09:16:27+02:00 Remettre en place la validation sur le formulaire suite à l'abandon d'une suppression (See #759) - - - - - fbe132a3 by Tony CHEMIT at 2017-03-30T09:20:15+02:00 Ne pas modifier le formulaire si on resélectionne dans l'abre le nœud courant (See #759) - - - - - 2 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -547,7 +547,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U try { ok = doDelete(getBean()); - + if (!ok) { + ui.restartEdit(); + } } catch (Exception e) { UIHelper.handlingError(e); } finally { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTree.java @@ -91,7 +91,7 @@ public class NavigationTree extends JXTree { setSelectionModel(new DefaultTreeSelectionModel() { @Override public void setSelectionPath(TreePath path) { - boolean canChange = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); + boolean canChange = !Objects.equals(path, getSelectionPath()) && ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); if (!canChange) { // cancel the change of node return; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4d8a433a254e20d1a290d1fd8c…

1 0

[Git][ultreiaio/ird-observe][develop] Ajout message d'info sur les commentaires (pour le focus) (See #755)
by Tony CHEMIT March 30, 2017

March 30, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d8a433a by Tony CHEMIT at 2017-03-30T08:57:21+02:00 Ajout message d'info sur les commentaires (pour le focus) (See #755) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jaxx @@ -34,7 +34,10 @@ <JTextArea id='comment2' onKeyReleased='if (!comment2.getText().isEmpty() || model.getComment() != null) { model.setComment(comment2.getText().isEmpty() ? null : comment2.getText()); }'/> <JPanel id="columnHeader" layout="{new BorderLayout()}"> - <JLabel constraints='BorderLayout.WEST' text="{getTitle()}"/> + <JPanel layout="{new BorderLayout(3, 3)}" constraints='BorderLayout.WEST'> + <JLabel id='titleLabel' constraints='BorderLayout.WEST'/> + <JLabel id='infoLabel' constraints='BorderLayout.CENTER'/> + </JPanel> <JToolBar constraints='BorderLayout.EAST'> <JButton id="resetComment" styleClass='resetButton' onActionPerformed="model.setComment(null)"/> </JToolBar> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/JComment.jcss @@ -12,3 +12,13 @@ #resetComment { toolTipText:"observe.action.resetComment.tip"; } + + +#titleLabel { + text: {getTitle()}; +} + +#infoLabel { + actionIcon:information; + toolTipText:"observe.action.comment.tip"; +} \ No newline at end of file ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -44,6 +44,7 @@ observe.action.close.route.tip=Close road observe.action.close.storage=Close storage observe.action.close.storage.tip=Close current storage observe.action.close.synchro.tip=close window +observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator <b>Ctrl + Tab</b></li><li>To focus on previous widget, use accelerator <b>Ctrl + Shift + Tab</b></body></html> observe.action.config.export.required.read.referentiel=Read permission is required on referential for this operation observe.action.config.export.required.write.data=Write permission is required on data for this operation observe.action.configuration=Preferences ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -44,6 +44,7 @@ observe.action.close.route.tip=Cierre de la ruta abierta observe.action.close.storage=Cerrar la fuente de datos observe.action.close.storage.tip=Cerrar la fuente de datos usado actualmente observe.action.close.synchro.tip=Cerrar la ventana +observe.action.comment.tip=<html><body><ul><li>To focus on next widget, use accelerator <b>Ctrl + Tab</b></li><li>To focus on previous widget, use accelerator <b>Ctrl + Shift + Tab</b></body></html> \#TODO observe.action.config.export.required.read.referentiel=Debe tener derechos de lectura sobre el referencial de datos para esta operación observe.action.config.export.required.write.data=Debe tener derechos de escritura sobre los datos para esta operación observe.action.configuration=Configuración ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -45,6 +45,7 @@ observe.action.close.route.tip=Clôturer la route ouverte observe.action.close.storage=Fermer la source de données observe.action.close.storage.tip=Fermer la source de données actuellement utilisée observe.action.close.synchro.tip=Fermer la fenêtre +observe.action.comment.tip=<html><body><ul><li>Pour accéder au composant suivant, utilisez les raccourci clavier <b>Ctrl + Tab</b></li><li>Pour accéder au composant précédent, utilisez les raccourci clavier <b>Ctrl + Shift + Tab</b></body></html> observe.action.config.export.required.read.referentiel=Lecture sur le référentiel requis pour cette opération observe.action.config.export.required.write.data=Écriture sur les données requis pour cette opération observe.action.configuration=Configuration View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4d8a433a254e20d1a290d1fd8ca…

1 0

[Git][ultreiaio/ird-observe][develop] Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bie…
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9d260751 by Tony CHEMIT at 2017-03-29T23:33:28+02:00 Faire fonctionner le raccourci F6 + revue aussi du F2 et F3 qui fonctionnent bien désormais (See #754) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/ChangeFocusGlobalUIAction.java - + application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/CloseDataGlobalUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/global/DeleteDataGlobalUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/9d260751885549e2f9b8e229660…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: remove obsolete files
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b2e2c85e by Tony CHEMIT at 2017-03-29T18:46:22+02:00 remove obsolete files - - - - - 8d2b41f5 by Tony CHEMIT at 2017-03-29T19:32:27+02:00 Ne pas faire de sauvegarde lorsqu'aucune modification n'a été effectuée sur la base (see #757) - - - - - 30 changed files: - − application-swing-decoration/changelog.txt - − application-swing-validation/changelog.txt - − application-swing/changelog.txt - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AutomaticLocalDatabaseBackupTask.java - application-swing/src/main/java/fr/ird/observe/application/swing/backup/LocalDatabaseBackupTaskSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/db/ObserveSwingDataSource.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SelectOpenNodeUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/e70a4e9e59cd0e19f335813b61…

1 0

[Git][ultreiaio/ird-observe][develop] Squash validators and validation modules
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e70a4e9e by Tony CHEMIT at 2017-03-29T18:43:32+02:00 Squash validators and validation modules - - - - - 30 changed files: - application-swing-validation/pom.xml - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/AbstractSpeciesFieldDtoValidator.java → application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivityFinDeVeilleExistsDtoValidator.java → application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java → application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java → application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLatitudeDtoFieldValidator.java → application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/CoordinateLongitudeDtoFieldValidator.java → application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ObserveCollectionUniqueKeyDtoValidator.java → application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/OpenableDtoFieldValidator.java → application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/QuadrantFieldDtoValidator.java → application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueHomeIdDtoValidator.java → application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SetLonglineUniqueNumberDtoValidator.java → application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesLengthFieldDtoValidator.java → application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/SpeciesWeightFieldDtoValidator.java → application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java - application-swing-validation/src/main/resources/i18n/application-swing-validation_en_GB.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_es_ES.properties - application-swing-validation/src/main/resources/i18n/application-swing-validation_fr_FR.properties - − application-swing-validators/LICENSE.txt - − application-swing-validators/README.md - − application-swing-validators/pom.xml - − application-swing-validators/src/license/THIRD-PARTY.properties - − application-swing-validators/src/main/resources/i18n/application-swing-validators_en_GB.properties - − application-swing-validators/src/main/resources/i18n/application-swing-validators_es_ES.properties - − application-swing-validators/src/main/resources/i18n/application-swing-validators_fr_FR.properties - pom.xml - + services-binder/src/test/resources/log4j.properties - services-validation/pom.xml - services-validators/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java → services-validation/src/main/java/fr/ird/observe/services/validators/AbstractSpeciesFieldValidator.java - services-validators/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java → services-validation/src/main/java/fr/ird/observe/services/validators/ActivityFinDeVeilleExistsValidator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e70a4e9e59cd0e19f335813b616…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog after release 5.3.7 [skip ci]
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b1185270 by Tony CHEMIT at 2017-03-29T18:03:33+02:00 update changelog after release 5.3.7 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-22 08:31. + * Last generated at 2017-03-29 18:02. ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) @@ -57,6 +57,17 @@ * [[Evolution 742]](https://gitlab.com/ultreiaio/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 652]](https://gitlab.com/ultreiaio/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [5.3.7](https://gitlab.com/ultreiaio/ird-observe/milestones/91) + +**Closed at 2017-03-29.** + +### Download +* [Application (observe-5.3.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.7.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 758]](https://gitlab.com/ultreiaio/ird-observe/issues/758) **Echec d'échange de marées entre bases centrales en v5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [5.3.6](https://gitlab.com/ultreiaio/ird-observe/milestones/90) **Closed at 2017-03-22.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b11852701e62ef50b9e7cc5a539…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog after release 5.3.7 [skip ci]
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b1185270 by Tony CHEMIT at 2017-03-29T18:03:33+02:00 update changelog after release 5.3.7 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-22 08:31. + * Last generated at 2017-03-29 18:02. ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) @@ -57,6 +57,17 @@ * [[Evolution 742]](https://gitlab.com/ultreiaio/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 652]](https://gitlab.com/ultreiaio/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [5.3.7](https://gitlab.com/ultreiaio/ird-observe/milestones/91) + +**Closed at 2017-03-29.** + +### Download +* [Application (observe-5.3.7.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.7.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 758]](https://gitlab.com/ultreiaio/ird-observe/issues/758) **Echec d'échange de marées entre bases centrales en v5** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [5.3.6](https://gitlab.com/ultreiaio/ird-observe/milestones/90) **Closed at 2017-03-22.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b11852701e62ef50b9e7cc5a539…

1 0

[Git][ultreiaio/ird-observe][develop] [Report 5.x] Correction de la génération des script d'import entre deux bases distantes (see #758)
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0e3e8694 by Tony CHEMIT at 2017-03-29T17:09:26+02:00 [Report 5.x] Correction de la génération des script d'import entre deux bases distantes (see #758) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -251,10 +251,8 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple private WizardState doExecuteAction0() { ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); - boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; ObserveSwingDataSource rightSource = getStepModel().getRightSource(); - boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); @@ -324,7 +322,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -349,7 +347,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/0e3e869453de7ece8cc830a0203…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/5.3.7
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT deleted branch release/5.3.7 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v5.3.7
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed new tag v5.3.7 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master-5.x] 7 commits: [jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch master-5.x at ultreiaio / ird-observe Commits: 373c9219 by Tony CHEMIT at 2017-03-22T08:02:38+01:00 [jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development - - - - - fb98ce76 by Tony CHEMIT at 2017-03-22T08:09:13+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - efe6ea8e by Tony CHEMIT at 2017-03-22T08:09:14+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - cb3e4bbe by Tony CHEMIT at 2017-03-22T08:09:15+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - a628cf8b by Tony CHEMIT at 2017-03-29T16:38:17+02:00 Correction de la génération des script d'import entre deux bases distantes (see #758) - - - - - ff09e3b4 by Tony CHEMIT at 2017-03-29T16:40:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions - - - - - 88829e6a by Tony CHEMIT at 2017-03-29T16:50:13+02:00 [jgitflow-maven-plugin]merging 'release/5.3.7' into 'master-5.x' - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -31,31 +31,20 @@ import fr.ird.observe.application.swing.ui.admin.AdminTabUI; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToLeftDataSynchronizeTask; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToRightDataSynchronizeTask; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromLeftDataSynchronizeTask; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask; +import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.*; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.trip.DeleteTripRequest; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.ImportTripResult; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.trip.*; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.DefaultListModel; +import javax.swing.*; import javax.swing.border.TitledBorder; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.Map; @@ -268,10 +257,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { private WizardState doExecuteAction0() { ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); - boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; - ObserveSwingDataSource rightSource = getStepModel().getRightSource(); - boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); @@ -328,7 +314,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -352,7 +338,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6</version> + <version>5.3.7</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bca9fe1a059295ca184f10d632…

1 0

[Git][ultreiaio/ird-observe][release/5.3.7] [jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch release/5.3.7 at ultreiaio / ird-observe Commits: ff09e3b4 by Tony CHEMIT at 2017-03-29T16:40:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.7</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ff09e3b474594580f325f7ca756…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: ff09e3b4 by Tony CHEMIT at 2017-03-29T16:40:29+02:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.7' with non-snapshot versions - - - - - 88829e6a by Tony CHEMIT at 2017-03-29T16:50:13+02:00 [jgitflow-maven-plugin]merging 'release/5.3.7' into 'master-5.x' - - - - - 21da2be8 by Tony CHEMIT at 2017-03-29T16:50:19+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 5fe91e2c by Tony CHEMIT at 2017-03-29T16:50:20+02:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - a5f7d0b5 by Tony CHEMIT at 2017-03-29T16:50:21+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c07b8063cb429712b6fda06431…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.8-SNAPSHOT development
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: c07b8063 by Tony CHEMIT at 2017-03-29T16:40:07+02:00 [jgitflow-maven-plugin]updating poms for 5.3.8-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.7-SNAPSHOT</version> + <version>5.3.8-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c07b8063cb429712b6fda064311…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/5.3.7
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed new branch release/5.3.7 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Correction de la génération des script d'import entre deux bases distantes (see #758)
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: a628cf8b by Tony CHEMIT at 2017-03-29T16:38:17+02:00 Correction de la génération des script d'import entre deux bases distantes (see #758) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -31,31 +31,20 @@ import fr.ird.observe.application.swing.ui.admin.AdminTabUI; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.application.swing.ui.admin.AdminUI; import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToLeftDataSynchronizeTask; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.CopyToRightDataSynchronizeTask; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DataSynchronizeTaskSupport; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromLeftDataSynchronizeTask; -import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.DeleteFromRightDataSynchronizeTask; +import fr.ird.observe.application.swing.ui.admin.synchronize.data.task.*; import fr.ird.observe.application.swing.ui.storage.tabs.DataSelectionModel; import fr.ird.observe.application.swing.ui.tree.ObserveTreeHelper; -import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialReference; -import fr.ird.observe.services.service.trip.DeleteTripRequest; -import fr.ird.observe.services.service.trip.DeleteTripResult; -import fr.ird.observe.services.service.trip.ExportTripRequest; -import fr.ird.observe.services.service.trip.ExportTripResult; -import fr.ird.observe.services.service.trip.ImportTripRequest; -import fr.ird.observe.services.service.trip.ImportTripResult; -import fr.ird.observe.services.service.trip.TripManagementService; +import fr.ird.observe.services.service.trip.*; import jaxx.runtime.swing.wizard.ext.WizardState; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import javax.swing.DefaultListModel; +import javax.swing.*; import javax.swing.border.TitledBorder; -import java.awt.Color; +import java.awt.*; import java.util.List; import java.util.Map; @@ -268,10 +257,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { private WizardState doExecuteAction0() { ObserveSwingDataSource leftSource = getStepModel().getLeftSource(); - boolean leftSourceIsPG = leftSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; - ObserveSwingDataSource rightSource = getStepModel().getRightSource(); - boolean rightSourceIsPG = rightSource.getConfiguration() instanceof ObserveDataSourceConfigurationTopiaPG; DefaultListModel<DataSynchronizeTaskSupport> tasks = getStepModel().getTasks(); int size = tasks.size(); @@ -328,7 +314,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.copyToLeftTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(rightSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!leftSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = rightTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.right.trip"), exportTripResult, @@ -352,7 +338,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler { sendMessage(t("observe.actions.synchro.data.prepare.copyToRightTask", programStr, tripStr)); - ExportTripRequest exportTripRequest = new ExportTripRequest(leftSourceIsPG, programId, tripId); + ExportTripRequest exportTripRequest = new ExportTripRequest(!rightSource.isLocal(), programId, tripId); ExportTripResult exportTripResult = leftTripManagementService.exportTrip(exportTripRequest); logExportResult(n("observe.actions.synchro.data.result.export.left.trip"), exportTripResult, View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a628cf8bf66c59df0a72fe94813…

1 0

[Git][ultreiaio/ird-observe][develop] Correction de la migration de base (See #752)
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cd4789de by Tony CHEMIT at 2017-03-29T16:08:46+02:00 Correction de la migration de base (See #752) - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java @@ -25,6 +25,7 @@ package fr.ird.observe.persistence.migration; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -35,10 +36,9 @@ import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; /** * Created on 27/10/16. @@ -90,32 +90,79 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { - ImmutableMap<String, String> missingCodesMapping = ImmutableMap.<String, String>builder() - .put("LT ?", "TL") - .put("LF", "FL") - .put("L1", "PDL") - .put("LC", "DL") - .put("LT", "TL") - .put("", "TL") + ImmutableMap<String, String> sqlMappingByCode = + ImmutableMap.<String, String>builder() + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336', 2, '2015-06-05', '2016-10-18 11:51:54.099140','FL', 1, null, 'Fork Length', 'Fork Length', 'Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541', 3, '2015-06-05', '2016-10-18 11:51:54.099140', 'CFL', 1, null, 'Curved Fork Length', 'Curved Fork Length', 'Curved Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PAL', 1, null, 'Pectoral-Anal Length', 'Pectoral-Anal Length', 'Pectoral-Anal Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'TL', 1, null, 'Total Length', 'Total Length', 'Total Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PD1', 1, null, 'Predorsal Length', 'Predorsal Length', 'Predorsal Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467059#0.563144549960271", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467059#0.563144549960271', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'SL', 1, null, 'Standard Length', 'Standard Length', 'Standard Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467326#0.537910396233201", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467326#0.537910396233201', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'LJFL', 1, null, 'Lower Jaw-Fork Length', 'Lower Jaw-Fork Length', 'Lower Jaw-Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467638#0.409153908025473", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467638#0.409153908025473', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CLJFL', 1, null, 'Curved Lower Jaw-Fork Length', 'Curved Lower Jaw-Fork Length', 'Curved Lower Jaw-Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467945#0.249704661779106", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467945#0.249704661779106', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'IDL', 1, null, 'Interdorsal Length', 'Interdorsal Length', 'Interdorsal Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468283#0.152317869942635", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468283#0.152317869942635', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'EFL', 1, null, 'Eye-Fork Length', 'Eye-Fork Length', 'Eye-Fork Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468646#0.710986209334806", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468646#0.710986209334806', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DW', 1, null, 'Disk Width', 'Disk Width', 'Disk Width', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469115#0.42996318358928", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469115#0.42996318358928', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DL', 1, null, 'Disk Length', 'Disk Length', 'Disk Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469572#0.969587777974084", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469572#0.969587777974084', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'TW', 1, null, 'Total Weight', 'Total Weight', 'Total Weight', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470528#0.813851526239887", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470528#0.813851526239887', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CTL', 1, null, 'Curved Total Length', 'Curved Total Length', 'Curved Total Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DML', 1, null, 'Dorsal Mantle Length', 'Dorsal Mantle Length', 'Dorsal Mantle Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CDML', 1, null, 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', null, null, null, null, null, false);") + .put("fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PFL', 1, null, 'Pectoral-Fork Length', 'Pectoral-Fork Length', 'Pectoral-Fork Length', null, null, null, null, null, false);") + .build(); + + ImmutableMap<String, String> knownSizeMeasureTypeMapping = ImmutableMap.<String, String>builder() + .put("LT ?", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") + .put("LF", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336") + .put("L1", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607") + .put("LC", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469115#0.42996318358928") + .put("LT", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") + .put("", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") + .put("FL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336") + .put("CFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541") + .put("PAL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359") + .put("TL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293") + .put("PD1", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607") + .put("PDL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607") + .put("SL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467059#0.563144549960271") + .put("LJFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467326#0.537910396233201") + .put("CLJFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467638#0.409153908025473") + .put("IDL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467945#0.249704661779106") + .put("EFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468283#0.152317869942635") + .put("DW", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468646#0.710986209334806") + .put("DL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469115#0.42996318358928") + .put("TW", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469572#0.969587777974084") + .put("CTL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470528#0.813851526239887") + .put("DML", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093") + .put("CDML", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447") + .put("PFL", "fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902") .build(); - List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { + + ImmutableMap.Builder<String, String> existingSizeMeasureMappingBuilder = ImmutableMap.builder(); + + topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<Pair<String, String>>() { @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT DISTINCT(lengthmeasuretype) FROM observe_common.species WHERE lengthmeasuretype IS NOT NULL"); + // Attention à ce moment là ce référentiel est encore dans le schema longline + return connection.prepareStatement("SELECT code, topiaid FROM observe_longline.sizemeasuretype "); } @Override - public String prepareResult(ResultSet set) throws SQLException { - return set.getString(1); + public Pair<String, String> prepareResult(ResultSet set) throws SQLException { + String code = set.getString(1); + String topiaId = set.getString(2); + return Pair.of(code, StringUtils.replace(topiaId, ".longline", "")); } - }); - List<String> existingLengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { + }).forEach(p -> existingSizeMeasureMappingBuilder.put(p.getKey(), p.getValue())); + + ImmutableMap<String, String> existingSizeMeasureMapping = existingSizeMeasureMappingBuilder.build(); + + List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - // Attention à ce moment là ce référentiel est encore dans le schema longline - return connection.prepareStatement("SELECT DISTINCT(code) FROM observe_longline.sizemeasuretype "); + return connection.prepareStatement("SELECT DISTINCT(lengthmeasuretype) FROM observe_common.species WHERE lengthmeasuretype IS NOT NULL"); } @Override @@ -124,115 +171,35 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC } }); - Set<String> missingLengthMeasureTypeCodes = new HashSet<>(); - for (String lengthMeasureType : lengthMeasureTypes) { - lengthMeasureType = lengthMeasureType.trim(); - String realCode = missingCodesMapping.get(lengthMeasureType); - if (realCode == null) { - realCode = lengthMeasureType; - } - missingLengthMeasureTypeCodes.add(realCode); - } - missingLengthMeasureTypeCodes.removeAll(existingLengthMeasureTypes); - - ImmutableMap.Builder<String, String> extraTopiaIdsByCodeBuilder = ImmutableMap.builder(); - - if (!missingLengthMeasureTypeCodes.isEmpty()) { - - // il manque des référentiels on va les ajouter - ImmutableMap<String, String> sqlMappingByCode = - ImmutableMap.<String, String>builder() - .put("FL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465700#0.0902433863375336', 2, '2015-06-05', '2016-10-18 11:51:54.099140','FL', 1, null, 'Fork Length', 'Fork Length', 'Fork Length', null, null, null, null, null, false);") - .put("CFL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499465999#0.707568018231541', 3, '2015-06-05', '2016-10-18 11:51:54.099140', 'CFL', 1, null, 'Curved Fork Length', 'Curved Fork Length', 'Curved Fork Length', null, null, null, null, null, false);") - .put("PAL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466255#0.444246932631359', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PAL', 1, null, 'Pectoral-Anal Length', 'Pectoral-Anal Length', 'Pectoral-Anal Length', null, null, null, null, null, false);") - .put("TL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466532#0.844473292818293', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'TL', 1, null, 'Total Length', 'Total Length', 'Total Length', null, null, null, null, null, false);") - .put("PDL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499466774#0.529249255312607', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PDL', 1, null, 'Predorsal Length', 'Predorsal Length', 'Predorsal Length', null, null, null, null, null, false);") - .put("SL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467059#0.563144549960271', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'SL', 1, null, 'Standard Length', 'Standard Length', 'Standard Length', null, null, null, null, null, false);") - .put("LJFL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467326#0.537910396233201', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'LJFL', 1, null, 'Lower Jaw-Fork Length', 'Lower Jaw-Fork Length', 'Lower Jaw-Fork Length', null, null, null, null, null, false);") - .put("CLJFL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467638#0.409153908025473', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CLJFL', 1, null, 'Curved Lower Jaw-Fork Length', 'Curved Lower Jaw-Fork Length', 'Curved Lower Jaw-Fork Length', null, null, null, null, null, false);") - .put("IDL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499467945#0.249704661779106', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'IDL', 1, null, 'Interdorsal Length', 'Interdorsal Length', 'Interdorsal Length', null, null, null, null, null, false);") - .put("EFL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468283#0.152317869942635', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'EFL', 1, null, 'Eye-Fork Length', 'Eye-Fork Length', 'Eye-Fork Length', null, null, null, null, null, false);") - .put("DW", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499468646#0.710986209334806', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DW', 1, null, 'Disk Width', 'Disk Width', 'Disk Width', null, null, null, null, null, false);") - .put("DL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469115#0.42996318358928', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DL', 1, null, 'Disk Length', 'Disk Length', 'Disk Length', null, null, null, null, null, false);") - .put("TW", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499469572#0.969587777974084', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'TW', 1, null, 'Total Weight', 'Total Weight', 'Total Weight', null, null, null, null, null, false);") - .put("CTL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470528#0.813851526239887', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CTL', 1, null, 'Curved Total Length', 'Curved Total Length', 'Curved Total Length', null, null, null, null, null, false);") - .put("DML", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499470887#0.950930784922093', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'DML', 1, null, 'Dorsal Mantle Length', 'Dorsal Mantle Length', 'Dorsal Mantle Length', null, null, null, null, null, false);") - .put("CDML", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499471278#0.425988764036447', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'CDML', 1, null, 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', 'Curved Dorsal Mantle Length', null, null, null, null, null, false);") - .put("PFL", "INSERT INTO observe_common.sizemeasuretype (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, status, uri, label1, label2, label3, label4, label5, label6, label7, label8, needcomment) VALUES ('fr.ird.observe.entities.referentiel.SizeMeasureType#1433499472220#0.885759855154902', 2, '2015-06-05', '2016-10-18 11:51:54.099140', 'PFL', 1, null, 'Pectoral-Fork Length', 'Pectoral-Fork Length', 'Pectoral-Fork Length', null, null, null, null, null, false);") - .build(); - - Iterator<String> iterator = missingLengthMeasureTypeCodes.iterator(); - while (iterator.hasNext()) { - String code = iterator.next(); - String sql = sqlMappingByCode.get(code); - if (sql != null) { - queries.add(sql); - iterator.remove(); - int i = sql.indexOf("'"); - String topiaId = sql.substring(i + 1); - int j = topiaId.indexOf("'"); - topiaId = topiaId.substring(0, j); - if (log.isInfoEnabled()) { - log.info("Add " + code + "::" + topiaId); - } - extraTopiaIdsByCodeBuilder.put(code, topiaId); - } - } + Set<String> unkownCodes = new HashSet<>(lengthMeasureTypes); + unkownCodes.removeAll(knownSizeMeasureTypeMapping.keySet()); + unkownCodes.removeAll(existingSizeMeasureMapping.keySet()); - if (!missingLengthMeasureTypeCodes.isEmpty()) { + if (!unkownCodes.isEmpty()) { - // migration impossible, il manque encore des référentiels - // ce cas ne devrait jamais arrivé - throw new IllegalStateException("Les types de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(missingLengthMeasureTypeCodes) + " sont requis pour la migration mais n'ont pas été trouvés en base."); - } + // migration impossible, il manque encore des référentiels + // ce cas ne devrait jamais arrivé + throw new IllegalStateException("Les types de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(unkownCodes) + " sont requis pour la migration mais n'ont pas été trouvés en base."); } - ImmutableMap<String, String> extraTopiaIdsByCode = extraTopiaIdsByCodeBuilder.build(); + Set<String> missingSizeMeasureTypeIds = knownSizeMeasureTypeMapping.values().stream().filter(id -> !existingSizeMeasureMapping.values().contains(id)).collect(Collectors.toSet()); - Set<String> invalidCodes = new LinkedHashSet<>(); - for (String lengthMeasureType : lengthMeasureTypes) { - - lengthMeasureType = lengthMeasureType.trim(); - if (lengthMeasureType.isEmpty()) { - continue; - } - if (missingCodesMapping.containsKey(lengthMeasureType)) { - lengthMeasureType = missingCodesMapping.get(lengthMeasureType); - } + for (String missingSizeMeasureTypeId : missingSizeMeasureTypeIds) { + queries.add(sqlMappingByCode.get(missingSizeMeasureTypeId)); + } - String finalLengthMeasureType = lengthMeasureType; - String sizeMeasureTypeId = extraTopiaIdsByCode.get(lengthMeasureType); - if (sizeMeasureTypeId == null) { - sizeMeasureTypeId = topiaSqlSupport.findSingleResult(new TopiaSqlQuery<String>() { - - @Override - public PreparedStatement prepareQuery(Connection connection) throws SQLException { - return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE code = '" + finalLengthMeasureType + "'"); - } - - @Override - public String prepareResult(ResultSet set) throws SQLException { - return set.getString(1); - } - }); - } + ImmutableMap.Builder<String, String> allSizeMeasureTypeMappingBuilder = ImmutableMap.<String, String>builder().putAll(existingSizeMeasureMapping); + knownSizeMeasureTypeMapping.entrySet().stream().filter(e -> !existingSizeMeasureMapping.containsKey(e.getKey())).forEach(e -> allSizeMeasureTypeMappingBuilder.put(e.getKey(), e.getValue())); + ImmutableMap<String, String> allSizeMeasureTypeMapping = allSizeMeasureTypeMappingBuilder.build(); - if (sizeMeasureTypeId == null) { + for (String lengthMeasureType : lengthMeasureTypes) { - if (log.isWarnEnabled()) { - log.warn("Impossible de trouver la type de mesure de taille pour le code: " + lengthMeasureType); - } - invalidCodes.add(lengthMeasureType); - } else { - sizeMeasureTypeId = StringUtils.replace(sizeMeasureTypeId, ".longline", ""); - queries.add(String.format("UPDATE observe_common.species SET sizeMeasureType = '%s' WHERE lengthMeasureType = '%s'", sizeMeasureTypeId, lengthMeasureType)); - } - } + lengthMeasureType = lengthMeasureType.trim(); - if (!invalidCodes.isEmpty()) { + String sizeMeasureTypeId = allSizeMeasureTypeMapping.get(lengthMeasureType); + queries.add(String.format("UPDATE observe_common.species SET sizeMeasureType = '%s' WHERE lengthMeasureType = '%s'", sizeMeasureTypeId, lengthMeasureType)); - throw new IllegalStateException("Impossible de trouver la type de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(invalidCodes)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cd4789de14996a02785959f9f6b…

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Mettre une largeur minimum sur l'arbre de navigation (See #751)
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8189b93a by Tony CHEMIT at 2017-03-29T09:49:40+02:00 Mettre une largeur minimum sur l'arbre de navigation (See #751) - - - - - 217017d7 by Tony CHEMIT at 2017-03-29T13:00:22+02:00 Amélioration du header de l'arbre de navigation (See #751) - - - - - 83996403 by Tony CHEMIT at 2017-03-29T13:02:10+02:00 Code couleurs (see #756) - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java @@ -34,6 +34,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIManager; import fr.ird.observe.application.swing.ui.content.ObserveActionMap; import fr.ird.observe.application.swing.ui.tree.ObserveNavigationTreeShowPopupAction; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree; +import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeHeader; import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeModel; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport; import fr.ird.observe.application.swing.ui.tree.navigation.nodes.ReferenceNavigationTreeNodeSupport; @@ -41,24 +42,22 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.StringNavigatio import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel; import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer; import fr.ird.observe.services.dto.constants.ReferentialLocale; -import org.nuiton.jaxx.runtime.context.JAXXInitialContext; -import org.nuiton.jaxx.widgets.error.ErrorDialogUI; -import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; -import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.jaxx.runtime.context.JAXXInitialContext; +import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel; +import org.nuiton.jaxx.validator.swing.SwingValidatorUtil; +import org.nuiton.jaxx.widgets.error.ErrorDialogUI; -import javax.swing.AbstractButton; -import javax.swing.JComponent; -import javax.swing.SwingUtilities; +import javax.swing.*; import javax.swing.border.Border; import javax.swing.border.LineBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.tree.TreePath; -import java.awt.Component; -import java.awt.Container; -import java.awt.Cursor; +import java.awt.*; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.ArrayList; @@ -427,6 +426,38 @@ public class ObserveMainUIInitializer { ui.getNavigationView().addMouseListener(mouseAdapter); ui.getNavigation().addMouseListener(mouseAdapter); ui.getNavigationTreeHeader().addMouseListener(mouseAdapter); + + ui.getNavigationView().setRightDecoration(ui.getNavigationTreeHeader().getToolbar()); + ui.getNavigationView().addComponentListener(new ComponentAdapter() { + + @Override + public void componentResized(ComponentEvent e) { + + JComponent source = (JComponent) e.getSource(); + + NavigationTreeHeader actions = ui.getNavigationTreeHeader(); + + Dimension preferredLayoutSize = actions.getLayout().preferredLayoutSize(actions); + + Dimension showLonglineSize = actions.getShowLongline().getSize(); + Dimension showSeineSize = actions.getShowSeine().getSize(); + Dimension showReferential = actions.getShowReferential().getSize(); + Dimension showEmpty = actions.getShowEmptyProgram().getSize(); + int minWidth = 18 + (int) Math.max(showLonglineSize.getWidth() + showSeineSize.getWidth(), showReferential.getWidth() + showEmpty.getWidth()); + source.setMinimumSize(new Dimension(minWidth, (int) source.getSize().getHeight())); + log.debug("Header resized to minumun: " + source.getMinimumSize()); + + int maxWidth = ui.getNavigationView().getWidth() - 10; + + int currentWidth = (int) preferredLayoutSize.getWidth(); + int height = 32; + if (currentWidth > maxWidth) { + height += 32; + } + actions.setPreferredSize(new Dimension(maxWidth, height)); + + } + }); } protected void init(ObserveActionMap actionMap, AbstractButton editor) { @@ -499,7 +530,7 @@ public class ObserveMainUIInitializer { /** * Nettoye des ui tout ce qui concerne un modèle de navigation. - * + * <p> * <b>Note:</b> cette méthode doit être appelée avant tout rechargement de modèle de naivgation. */ public void cleanNavigationUI() { @@ -522,7 +553,7 @@ public class ObserveMainUIInitializer { /** * Charge dans l'ui un nouveau modèle de navigation. - * + * <p> * <b>Note:</b> cette méthode doit être appelée après tout rechargement de modèle de naivgation. **/ public void loadNavigationUI() { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jaxx @@ -17,36 +17,22 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JPanel layout='{new BorderLayout()}'> +<JPanel layout='{new FlowLayout(FlowLayout.LEFT, 2, 2)}'> <import> java.awt.FlowLayout </import> - <JToolBar constraints='BorderLayout.WEST' layout="{new FlowLayout(FlowLayout.CENTER, 2, 2)}"> - <JToggleButton id='showSeine' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - <JToggleButton id='showLongline' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - <JToggleButton id='showReferential' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - <JToggleButton id='showEmptyProgram' onActionPerformed="handler.tryToUpdateNavigationTree()"/> - </JToolBar> - -  - <String id='labelText' javaBean='null'/> + <JToggleButton id='showSeine' onActionPerformed="handler.tryToUpdateNavigationTree()"/> + <JToggleButton id='showLongline' onActionPerformed="handler.tryToUpdateNavigationTree()"/> + <JToggleButton id='showReferential' onActionPerformed="handler.tryToUpdateNavigationTree()"/> + <JToggleButton id='showEmptyProgram' onActionPerformed="handler.tryToUpdateNavigationTree()"/> -  <NavigationTree id='tree' javaBean='new NavigationTree()'/> - <JTextField id="search" visible="false" constraints='BorderLayout.CENTER' - onKeyReleased="handler.search(search.getText())"/> - -  - - <JToolBar id='toolbar' constraints='BorderLayout.EAST'> - -  + <JToolBar id='toolbar'> <JButton id='colapseAll' onActionPerformed='handler.collapseAll()'/> <JButton id='expandAll' onActionPerformed='handler.expandAll()'/> - </JToolBar> </JPanel> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss @@ -42,10 +42,6 @@ toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip"; } -#label { - text:{getLabelText()}; -} - JToggleButton { focusable:false; focusPainted:false; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java @@ -69,10 +69,10 @@ public class NavigationTreeHeaderHandler implements UIHandler<NavigationTreeHead @Override public void afterInit(NavigationTreeHeader ui) { - ui.getShowSeine().setIcon(UIHelper.getUIManagerIcon("navigation." + TripSeineDto.class.getName() + "-16")); - ui.getShowLongline().setIcon(UIHelper.getUIManagerIcon("navigation." + TripLonglineDto.class.getName() + "-16")); + ui.getShowSeine().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); + ui.getShowLongline().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); ui.getShowReferential().setIcon(UIHelper.getUIManagerIcon("navigation.referentiel-16")); - ui.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation." + ProgramDto.class.getName() + "-16")); + ui.getShowEmptyProgram().setIcon(UIHelper.getUIManagerIcon("navigation." + TripSeineDto.class.getName() + "-16")); NavigationTree tree = ui.getTree(); TreeSearchable searchable = new TreeSearchable(tree); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2b989765bbb1a32f508f77298a…

1 0

[Git][ultreiaio/ird-observe][develop] Filtres d'affichage de l'arbre (See #750) /label ~Résolu /milestone %6.0-RC-2
by Tony CHEMIT March 29, 2017

March 29, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2b989765 by Tony CHEMIT at 2017-03-29T09:17:39+02:00 Filtres d'affichage de l'arbre (See #750) /label ~Résolu /milestone %6.0-RC-2 - - - - - 4 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeader.jcss @@ -38,6 +38,7 @@ #showEmptyProgram { selected: {tree.getTreeModel().isLoadEmptyProgram()}; + text:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY"; toolTipText:"observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip"; } ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1453,6 +1453,7 @@ observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Without trips observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Display programs with no trip observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Longline observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Display Palangre's programs ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1455,6 +1455,7 @@ observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Sans marée\#TODO observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée \#TODO observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre \#TODO ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1460,6 +1460,7 @@ observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise +observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY=Sans marée observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.EMPTY.tip=Voir les programmes sans marée observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL=Palangre observe.enum.fr.ird.observe.services.dto.constants.ObserveModelType.LL.tip=Voir les programmes Palangre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2b989765bbb1a32f508f77298a3…

1 0

[Git][ultreiaio/ird-observe][develop] fix builds
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6d2cf6e4 by Tony CHEMIT at 2017-03-22T13:23:39+01:00 fix builds - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ stages: - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - git config --global user.name $GITLAB_USER_ID - git config --global user.email $GITLAB_USER_EMAIL - - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) + - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone @@ -38,7 +38,7 @@ stages: - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - git config --global user.name $GITLAB_USER_ID - git config --global user.email $GITLAB_USER_EMAIL - - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) + - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" .env_test: &env_test View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6d2cf6e4142d925b62491404f91…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog with staging [skip ci]
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 79be8ad6 by Tony CHEMIT at 2017-03-22T08:32:40+01:00 update changelog with staging [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ **Closed at *In progress*.** +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/79be8ad6b8f1554595ac5062547…

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 6.0-RC-1
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6d2da517 by Tony CHEMIT at 2017-03-22T08:31:52+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,12 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-20 10:28. + * Last generated at 2017-03-22 08:31. ## Version [6.0-RC-1](https://gitlab.com/ultreiaio/ird-observe/milestones/85) **Closed at *In progress*.** -### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -57,6 +54,17 @@ * [[Evolution 742]](https://gitlab.com/ultreiaio/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 652]](https://gitlab.com/ultreiaio/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [5.3.6](https://gitlab.com/ultreiaio/ird-observe/milestones/90) + +**Closed at 2017-03-22.** + +### Download +* [Application (observe-5.3.6.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.6.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 748]](https://gitlab.com/ultreiaio/ird-observe/issues/748) **La migration d'une base centrale v3 ne fonctionne toujours pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [5.3.5](https://gitlab.com/ultreiaio/ird-observe/milestones/89) **Closed at 2017-03-19.** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6d2da517850e31a402d4e3170d3…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/5.3.6
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT deleted branch release/5.3.6 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][release/5.3.6] [jgitflow-maven-plugin]updating poms for branch'release/5.3.6' with non-snapshot versions
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch release/5.3.6 at ultreiaio / ird-observe Commits: 65a36ea1 by Tony CHEMIT at 2017-03-22T08:02:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.6' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.6</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/65a36ea1bc7047dfb9563ce580e…

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v5.3.6
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed new tag v5.3.6 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master-5.x] 7 commits: [jgitflow-maven-plugin]updating poms for 5.3.6-SNAPSHOT development
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch master-5.x at ultreiaio / ird-observe Commits: 379708f6 by Tony CHEMIT at 2017-03-20T09:55:06+01:00 [jgitflow-maven-plugin]updating poms for 5.3.6-SNAPSHOT development - - - - - 92250da3 by Tony CHEMIT at 2017-03-20T10:02:46+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 45e6d141 by Tony CHEMIT at 2017-03-20T10:02:47+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 387b6428 by Tony CHEMIT at 2017-03-20T10:02:48+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 86cf473d by Tony CHEMIT at 2017-03-22T07:55:44+01:00 La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 65a36ea1 by Tony CHEMIT at 2017-03-22T08:02:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.6' with non-snapshot versions - - - - - bca9fe1a by Tony CHEMIT at 2017-03-22T08:09:08+01:00 [jgitflow-maven-plugin]merging 'release/5.3.6' into 'master-5.x' - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5</version> + <version>5.3.6</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/af2cdd75bd2f2886fd0c6daf6f…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/5.3.6' with non-snapshot versions
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 65a36ea1 by Tony CHEMIT at 2017-03-22T08:02:54+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.6' with non-snapshot versions - - - - - bca9fe1a by Tony CHEMIT at 2017-03-22T08:09:08+01:00 [jgitflow-maven-plugin]merging 'release/5.3.6' into 'master-5.x' - - - - - fb98ce76 by Tony CHEMIT at 2017-03-22T08:09:13+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - efe6ea8e by Tony CHEMIT at 2017-03-22T08:09:14+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - cb3e4bbe by Tony CHEMIT at 2017-03-22T08:09:15+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/373c9219e99007a1dff0c3990d…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 373c9219 by Tony CHEMIT at 2017-03-22T08:02:38+01:00 [jgitflow-maven-plugin]updating poms for 5.3.7-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.6-SNAPSHOT</version> + <version>5.3.7-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/373c9219e99007a1dff0c3990d7…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/5.3.6
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed new branch release/5.3.6 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] Update README.md [skip ci]
by Tony CHEMIT March 22, 2017

March 22, 2017

1 0

[Git][ultreiaio/ird-observe][develop] [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748)
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ece95278 by Tony CHEMIT at 2017-03-22T07:58:15+01:00 [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 3 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -97,12 +97,6 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); - addScript("02", "add-foreign-key-indexes", queries); - } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -147,7 +147,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetSample", "set"); removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "transmittingBuoy", "floatingObject"); - addScript("01", "add-foreign-key-indexes", queries); + addScript("03", "add-foreign-key-indexes", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ece95278628e9d31d61bb116588…

1 0

[Git][ultreiaio/ird-observe][develop] [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748)
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ece95278 by Tony CHEMIT at 2017-03-22T07:58:15+01:00 [Report 5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 3 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -97,12 +97,6 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); - addScript("02", "add-foreign-key-indexes", queries); - } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -147,7 +147,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "targetSample", "set"); removeForeignKeyIndex(tx, queries, "OBSERVE_SEINE", "transmittingBuoy", "floatingObject"); - addScript("01", "add-foreign-key-indexes", queries); + addScript("03", "add-foreign-key-indexes", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_03_add-foreign-key-indexes-PG.sql View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ece95278628e9d31d61bb116588…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] La migration d'une base centrale v3 ne fonctionne toujours pas (See #748)
by Tony CHEMIT March 22, 2017

March 22, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 86cf473d by Tony CHEMIT at 2017-03-22T07:55:44+01:00 La migration d'une base centrale v3 ne fonctionne toujours pas (See #748) - - - - - 1 changed file: - entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql Changes: ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_01_add-foreign-key-indexes-PG.sql View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/86cf473db976ca6c715bf2f056a…

1 0

[Git][ultreiaio/ird-observe][develop] add build for site
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 18065729 by Tony CHEMIT at 2017-03-20T14:52:25+01:00 add build for site - - - - - 1 changed file: - + src/site/resources/.gitlab-ci.yml Changes: ===================================== src/site/resources/.gitlab-ci.yml ===================================== --- /dev/null +++ b/src/site/resources/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/18065729921aff29af11062b7a7…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: af150cfb by Tony CHEMIT at 2017-03-20T14:51:47+01:00 Site checkin for project ObServe - - - - - 2 changed files: - + .gitlab-ci.yml - config-report.html Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -97,226 +97,33 @@ <th>Nombre d'options</th> <th>Nombre d'actions</th></tr> <tr class="b"> -<td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> -<td>Observe web Configuration</td> -<td>16</td> -<td>0</td></tr> -<tr class="a"> <td><a href="./config-report.html#detail_ObserveSwingApplicationConfig">ObserveSwingApplicationConfig</a></td> <td>Configuration d'ObServe</td> <td>81</td> -<td>9</td></tr></table></div> +<td>9</td></tr> +<tr class="a"> +<td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> +<td>Observe web Configuration</td> +<td>16</td> +<td>0</td></tr></table></div> <div class="section"> <h2><a name="Dtail_des_configurations"></a>Détail des configurations</h2><br /> <p>On détaille ici une par une les configurations définies pour le projet</p> <div class="section"> -<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> -<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> -<p>Description : <b>Observe web Configuration</b></p> -<div class="section"> -<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> -<table border="0" class="table table-striped"> -<tr class="b"> -<th>Clef</th> -<th>Description</th> -<th>Valeur par défaut</th> -<th>Option modifiable</th> -<th>Option sauvegardable</th> -<th>Type</th></tr> -<tr class="a"> -<td>observeweb.build.version</td> -<td>Version de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> -<td>observeweb.build.date</td> -<td>Date de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.build.number</td> -<td>Numéro de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.adminApiKey</td> -<td>Clé API Admin (À changer)</td> -<td> -<div> -<pre style="monospaced">changeme</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.apiUrl</td> -<td>Url de l'api rest</td> -<td> -<div> -<pre style="monospaced">http://localhost:8080/observeweb/api/v1</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="b"> -<td>observeweb.model.version</td> -<td>Version du modèle</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="a"> -<td>observeweb.devMode</td> -<td>Mode développeur</td> -<td> -<div> -<pre style="monospaced">true</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">boolean</pre></div></td></tr> -<tr class="b"> -<td>observeweb.contextPath</td> -<td>Contexte applicatif</td> -<td> -<div> -<pre style="monospaced">observe</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.baseDirectory</td> -<td>Répertoire de l'application</td> -<td> -<div> -<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.temporaryDirectory</td> -<td>Chemin vers le répertoire temporaire</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.log4jConfigurationFile</td> -<td>Chemin vers le fichier de configuration des logs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.databasesConfigurationFile</td> -<td>Chemin vers le fichier de configuration des bases</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.usersConfigurationFile</td> -<td>Chemin vers le fichier de configuration des utilisateurs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.sessionExpirationDelay</td> -<td>Temps maximum d'une session (en minutes)</td> -<td> -<div> -<pre style="monospaced">60</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="a"> -<td>observeweb.sessionMaximumSize</td> -<td>Taille maximum de session</td> -<td> -<div> -<pre style="monospaced">10000</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="b"> -<td>observeweb.httpTimeout</td> -<td>Temps maximum de tentative de connection http (en millisecondes)</td> -<td> -<div> -<pre style="monospaced">30000</pre></div></td> -<td>Oui</td> -<td>Oui</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr></table></div> -<div class="section"> -<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> -<p><b>Aucune action définie pour cette configuration</b></p></div></div> -<div class="section"> <h3><a name="Configuration___ObserveSwingApplicationConfig"></a><a name="detail_ObserveSwingApplicationConfig">Configuration ObserveSwingApplicationConfig</a></h3> <p>Nom de la configuration : <b>ObserveSwingApplicationConfig</b></p> <p>Description : <b>Configuration d'ObServe</b></p> <div class="section"> <h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveSwingApplicationConfig">Options de la configuration</a></h4><br /> <table border="0" class="table table-striped"> -<tr class="a"> +<tr class="b"> <th>Clef</th> <th>Description</th> <th>Valeur par défaut</th> <th>Option modifiable</th> <th>Option sauvegardable</th> <th>Type</th></tr> -<tr class="b"> +<tr class="a"> <td>config.file</td> <td>Le nom du fichier de configuration</td> <td> @@ -327,7 +134,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observe.devMode</td> <td>Mode développeur</td> <td> @@ -338,7 +145,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observe.model.version</td> <td>Version du modèle</td> <td> @@ -349,7 +156,7 @@ <td> <div> <pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observe.build.version</td> <td>Numéro de version</td> <td> @@ -360,7 +167,7 @@ <td> <div> <pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observe.build.date</td> <td>Date de version</td> <td> @@ -371,7 +178,7 @@ <td> <div> <pre style="monospaced">java.util.Date</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observe.build.number</td> <td>Numéro de build</td> <td> @@ -382,7 +189,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>data.directory</td> <td>Répertoire par défaut des ressources utilisateurs de l'application</td> <td> @@ -393,7 +200,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>db.directory</td> <td>Le répertoire où est stockée la base locale.</td> <td> @@ -404,7 +211,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>initial.db.dump</td> <td>La base embarquée créée lors de le premier import d'une base distante.</td> <td> @@ -415,7 +222,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>backup.directory</td> <td>Répertoire par défaut où sauvegarder les bases locales</td> <td> @@ -426,7 +233,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>backup.file</td> <td>Fichier des informations des sauvegardes</td> <td> @@ -437,7 +244,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>import.directory</td> <td>Répertoire où chercher les imports</td> <td> @@ -448,7 +255,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>resources.directory</td> <td>Le répertoire où sont stockées les ressources de l'utilisateur comme les traductions ou les requêtes de rapports.</td> <td> @@ -459,7 +266,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>i18n.directory</td> <td>Répertoire par défaut des ressources de traduction de l'application</td> <td> @@ -470,7 +277,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>report.directory</td> <td>Répertoire par défaut des rapports de l'application</td> <td> @@ -481,7 +288,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.directory</td> <td>Le répertoire où sont stockées les cartes.</td> <td> @@ -492,7 +299,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>validation.report.directory</td> <td>Le répertoire par défaut où sont stockés les rapports de validation</td> <td> @@ -503,7 +310,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>tmp.directory</td> <td>Le répertoire temporaire par défaut</td> <td> @@ -514,7 +321,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>logConfigurationFile</td> <td>Fichier de configuration des logs</td> <td> @@ -525,7 +332,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>swingSessionFile</td> <td>Fichier de sauvegarde des états des UI.</td> <td> @@ -536,7 +343,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>h2.username</td> <td>L'identifiant H2</td> <td> @@ -547,7 +354,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>h2.password</td> <td>Le mot de passe H2</td> <td> @@ -558,7 +365,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>h2.canMigrate</td> <td>Autoriser la mise à jour des bases locales (H2)</td> <td> @@ -569,7 +376,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>h2.serverPort</td> <td>Port du serveur H2</td> <td> @@ -580,7 +387,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>remoteDataSourceConfigurations</td> <td>connexions à des sources distantes</td> <td> @@ -591,7 +398,7 @@ <td> <div> <pre style="monospaced">[Lfr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration;</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>serverDataSourceConfigurations</td> <td>connexions à des serveursdistantes</td> <td> @@ -602,7 +409,7 @@ <td> <div> <pre style="monospaced">[Lfr.ird.observe.services.dto.presets.ServerDataSourceConfiguration;</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>pg.canMigrate</td> <td>Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base)</td> <td> @@ -613,7 +420,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>defaultDbMode</td> <td>Le mode de connexion a créer par défaut</td> <td> @@ -624,7 +431,7 @@ <td> <div> <pre style="monospaced">fr.ird.observe.application.swing.configuration.constants.DbMode</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>defaultCreationMode</td> <td>Le mode de création de base locale par défaut</td> <td> @@ -635,7 +442,7 @@ <td> <div> <pre style="monospaced">fr.ird.observe.application.swing.configuration.constants.CreationMode</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.storeRemoteStorage</td> <td>Pour activer la sauvegarde de la configuration de la source distante</td> <td> @@ -646,7 +453,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.loadLocalStorage</td> <td>Charger la base locale au démarrage de l'application</td> <td> @@ -657,7 +464,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>showMigrationProgression</td> <td>Afficher dans les logs la progression de la mise à jour d'une base</td> <td> @@ -668,7 +475,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>showMigrationSql</td> <td>Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base</td> <td> @@ -679,7 +486,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>showSql</td> <td>Afficher dans les logs toutes les requêtes sql executées</td> <td> @@ -690,7 +497,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.changeSynchroSrc</td> <td>Pour autoriser la sélection de la base source dans les opérations sur base</td> <td> @@ -701,7 +508,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.showNumberEditorButton</td> <td>Pour afficher le bouton qui permet d'utiliser l'éditeur numérique à gauche de chaque champs numérique</td> <td> @@ -712,7 +519,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.autoPopupNumberEditor</td> <td>Pour afficher automatiquement l'éditeur numérique lors de l'édition d'un nombre</td> <td> @@ -723,7 +530,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.showTimeEditorSlider</td> <td>Pour afficher la réglette d'édition des heures</td> <td> @@ -734,7 +541,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.fullscreen</td> <td>Pour afficher l'application en mode pleine écran</td> <td> @@ -745,7 +552,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.locale</td> <td>Langue utilisée par l'application (fr_FR, en_GB ou es_ES)</td> <td> @@ -756,7 +563,7 @@ <td> <div> <pre style="monospaced">java.util.Locale</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>db.locale</td> <td>La langue du référentiel</td> <td> @@ -767,7 +574,7 @@ <td> <div> <pre style="monospaced">java.util.Locale</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.fauneAssociee</td> <td>Observation des Faunes associées</td> <td> @@ -778,7 +585,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.rejetsThons</td> <td>Observation des rejets thon</td> <td> @@ -789,7 +596,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.mensurations</td> <td>Observation des mensurations</td> <td> @@ -800,7 +607,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.floatingObject</td> <td>Observation des objets flottants</td> <td> @@ -811,7 +618,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.activitysDetaillees</td> <td>Observation des activités détaillées</td> <td> @@ -822,7 +629,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.mammiferes</td> <td>Observation des mammifères</td> <td> @@ -833,7 +640,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>observation.oiseaux</td> <td>Observation des oiseaux</td> <td> @@ -844,7 +651,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>observation.gleure</td> <td>Observation de la gleure</td> <td> @@ -855,7 +662,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.seine.targetCatch</td> <td>Espèces pour les captures cible</td> <td> @@ -866,7 +673,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.seine.schoolEstimate</td> <td>Espèces pour les estimations</td> <td> @@ -877,7 +684,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.seine.objectSchoolEstimate</td> <td>Espèces pour les estimations banc objet</td> <td> @@ -888,7 +695,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.seine.nonTargetCatch</td> <td>Espèces pour les captures non cible</td> <td> @@ -899,7 +706,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.seine.objectObservedSpecies</td> <td>Espèces pour les espèces non cible observées</td> <td> @@ -910,7 +717,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.longline.catch</td> <td>Espèces pour les captures - TDR</td> <td> @@ -921,7 +728,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>speciesList.longline.encounter</td> <td>Espèces pour les rencontre</td> <td> @@ -932,7 +739,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>speciesList.longline.depredator</td> <td>Espèces pour les rencontre</td> <td> @@ -943,7 +750,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.background.color</td> <td>Couleur du fond de carte</td> <td> @@ -954,7 +761,7 @@ <td> <div> <pre style="monospaced">java.awt.Color</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer1.path</td> <td>Fichier (Shape Files) du premier calque de la carte</td> <td> @@ -965,7 +772,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer2.path</td> <td>Fichier (Shape Files) du deuxième calque de la carte</td> <td> @@ -976,7 +783,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer3.path</td> <td>Fichier (Shape Files) du troisième calque de la carte</td> <td> @@ -987,7 +794,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer4.path</td> <td>Fichier (Shape Files) du quatrième calque de la carte</td> <td> @@ -998,7 +805,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer5.path</td> <td>Fichier (Shape Files) du cinquième calque de la carte</td> <td> @@ -1009,7 +816,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer6.path</td> <td>Fichier (Shape Files) du sixième calque de la carte</td> <td> @@ -1020,7 +827,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer7.path</td> <td>Fichier (Shape Files) du septième calque de la carte</td> <td> @@ -1031,7 +838,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer8.path</td> <td>Fichier (Shape Files) du huitième calque de la carte</td> <td> @@ -1042,7 +849,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.layer9.path</td> <td>Fichier (Shape Files) du neuvième calque de la carte</td> <td> @@ -1053,7 +860,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>map.layer10.path</td> <td>Fichier (Shape Files) du dixième calque de la carte</td> <td> @@ -1064,7 +871,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>map.style.path</td> <td>Fichier des style à appliquer sur les calques de la carte</td> <td> @@ -1075,7 +882,7 @@ <td> <div> <pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.treeOpenNodes</td> <td>Nœuds de l'arbre ouverts lors de la dernière fermeture de la base</td> <td> @@ -1086,7 +893,7 @@ <td> <div> <pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>validation.speedEnable</td> <td>Forcer la validation des vitesses d'activités</td> <td> @@ -1097,7 +904,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>validation.lengthWeightEnable</td> <td>Forcer la validation des bormes min/max de taille d'espèce</td> <td> @@ -1108,7 +915,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>validation.speedMaxValue</td> <td>Vitesse maximale autorisée dans le contrôle des vitesses d'activités</td> <td> @@ -1119,7 +926,7 @@ <td> <div> <pre style="monospaced">java.lang.Float</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>backup.use</td> <td>Pour activer la sauvegarde automatique</td> <td> @@ -1130,7 +937,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>backup.atClose</td> <td>Effectuer une sauvegarde de la base locale à la fermeture de l'application</td> <td> @@ -1141,7 +948,7 @@ <td> <div> <pre style="monospaced">java.lang.Boolean</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>backup.delay</td> <td>Temps en minutes entre chaque sauvegarde de la base locale</td> <td> @@ -1152,7 +959,7 @@ <td> <div> <pre style="monospaced">java.lang.Integer</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.coordinate.format</td> <td>Format des positions (DMD, DD, DMS)</td> <td> @@ -1163,7 +970,7 @@ <td> <div> <pre style="monospaced">org.nuiton.jaxx.widgets.gis.CoordinateFormat</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.focusBorder.color</td> <td>Couleur de la bordure de la zone qui a le focus</td> <td> @@ -1174,7 +981,7 @@ <td> <div> <pre style="monospaced">java.awt.Color</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>ui.noFocusBorderColor.color</td> <td>Couleur de la bordure de la zone qui n'a pas le focus</td> <td> @@ -1185,7 +992,7 @@ <td> <div> <pre style="monospaced">java.awt.Color</pre></div></td></tr> -<tr class="a"> +<tr class="b"> <td>ui.showMnemonic</td> <td>Afficher les racourcis clavier</td> <td> @@ -1196,7 +1003,7 @@ <td> <div> <pre style="monospaced">boolean</pre></div></td></tr> -<tr class="b"> +<tr class="a"> <td>http.timeout</td> <td>Maximum delay in millisecondes to http connections</td> <td> @@ -1210,49 +1017,242 @@ <div class="section"> <h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveSwingApplicationConfig">Actions de la configuration</a></h4><br /> <table border="0" class="table table-striped"> -<tr class="a"> +<tr class="b"> <th>Description</th> <th>Aliases</th> <th>Action</th></tr> -<tr class="b"> +<tr class="a"> <td>Afficher l'aide</td> <td>-h,--help</td> <td>fr.ird.observe.application.swing.ObserveCLAction#help</td></tr> -<tr class="a"> +<tr class="b"> <td>Afficher le manuel utilisateur (mode graphique)</td> <td>--help-ui</td> <td>fr.ird.observe.application.swing.ObserveCLAction#helpUI</td></tr> -<tr class="b"> +<tr class="a"> <td>Ne pas lancer l'interface graphique</td> <td>-n,--no-main</td> <td>fr.ird.observe.application.swing.ObserveCLAction#disableMainUI</td></tr> -<tr class="a"> +<tr class="b"> <td>Configurer l'application</td> <td>--configure</td> <td>fr.ird.observe.application.swing.ObserveCLAction#configure</td></tr> -<tr class="b"> +<tr class="a"> <td>Lancer une opération d'administration</td> <td>-a,--admin</td> <td>fr.ird.observe.application.swing.ObserveCLAction#launchAdminUI</td></tr> -<tr class="a"> +<tr class="b"> <td>Lancer une opération d'administration sur Obstuna</td> <td>--obstuna-admin</td> <td>fr.ird.observe.application.swing.ObserveCLAction#launchObstunaAdminUI</td></tr> -<tr class="b"> +<tr class="a"> <td>Lancer ObServe en mode serveur</td> <td>--h2-server</td> <td>fr.ird.observe.application.swing.ObserveCLAction#launchH2ServerMode</td></tr> -<tr class="a"> +<tr class="b"> <td>Ajouter le support JMX</td> <td>--jmx</td> <td>fr.ird.observe.application.swing.ObserveCLAction#useJMX</td></tr> -<tr class="b"> +<tr class="a"> <td>Générer des topiaIds. Deux paramètres sont nécessaires: Le FQN de la classe Le nombre d'id à générer.</td> <td>--create-id</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div></div> +<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div> +<div class="section"> +<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> +<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> +<p>Description : <b>Observe web Configuration</b></p> +<div class="section"> +<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Clef</th> +<th>Description</th> +<th>Valeur par défaut</th> +<th>Option modifiable</th> +<th>Option sauvegardable</th> +<th>Type</th></tr> +<tr class="a"> +<td>observeweb.build.version</td> +<td>Version de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.build.date</td> +<td>Date de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.build.number</td> +<td>Numéro de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.adminApiKey</td> +<td>Clé API Admin (À changer)</td> +<td> +<div> +<pre style="monospaced">changeme</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.apiUrl</td> +<td>Url de l'api rest</td> +<td> +<div> +<pre style="monospaced">http://localhost:8080/observeweb/api/v1</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="b"> +<td>observeweb.model.version</td> +<td>Version du modèle</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="a"> +<td>observeweb.devMode</td> +<td>Mode développeur</td> +<td> +<div> +<pre style="monospaced">true</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">boolean</pre></div></td></tr> +<tr class="b"> +<td>observeweb.contextPath</td> +<td>Contexte applicatif</td> +<td> +<div> +<pre style="monospaced">observe</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.baseDirectory</td> +<td>Répertoire de l'application</td> +<td> +<div> +<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.temporaryDirectory</td> +<td>Chemin vers le répertoire temporaire</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.log4jConfigurationFile</td> +<td>Chemin vers le fichier de configuration des logs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.databasesConfigurationFile</td> +<td>Chemin vers le fichier de configuration des bases</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.usersConfigurationFile</td> +<td>Chemin vers le fichier de configuration des utilisateurs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.sessionExpirationDelay</td> +<td>Temps maximum d'une session (en minutes)</td> +<td> +<div> +<pre style="monospaced">60</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="a"> +<td>observeweb.sessionMaximumSize</td> +<td>Taille maximum de session</td> +<td> +<div> +<pre style="monospaced">10000</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="b"> +<td>observeweb.httpTimeout</td> +<td>Temps maximum de tentative de connection http (en millisecondes)</td> +<td> +<div> +<pre style="monospaced">30000</pre></div></td> +<td>Oui</td> +<td>Oui</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr></table></div> +<div class="section"> +<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> +<p><b>Aucune action définie pour cette configuration</b></p></div></div></div> </div> </div> </div> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/af150cfb145f1bf31854e0fb006…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 680ab3d4 by Tony CHEMIT at 2017-03-20T14:42:32+01:00 Site checkin for project ObServe - - - - - 30 changed files: - − .gitlab-ci.yml - administration-web.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - model/observe-common.zargo - model/observe-longline.zargo - model/observe-seine.zargo - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - − site.js - sitemap.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/680ab3d470d67e68a98802b8fe4…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bd0dd9a2 by Tony CHEMIT at 2017-03-20T11:57:30+01:00 update changelog [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ **Closed at *In progress*.** ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bd0dd9a2362f3cf501b8d5ad0c8…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed new tag v6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master] 20 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 9f47ba93 by Tony CHEMIT at 2017-03-15T15:07:30+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - cd0ad7a7 by Tony CHEMIT at 2017-03-15T15:13:43+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 0349bd86 by Tony CHEMIT at 2017-03-15T15:13:44+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 618eb890 by Tony CHEMIT at 2017-03-15T15:13:45+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - ca63154c by Tony CHEMIT at 2017-03-15T15:14:33+01:00 update changelog - - - - - 50d10cea by Tony CHEMIT at 2017-03-20T08:57:40+00:00 Update .gitlab-ci.yml - - - - - f8460ca9 by Tony CHEMIT at 2017-03-20T08:59:51+00:00 Update .gitlab-ci.yml - - - - - 8b948b06 by Tony CHEMIT at 2017-03-20T09:03:16+00:00 Update README.md - - - - - 52c35b8c by Tony CHEMIT at 2017-03-20T10:22:58+01:00 review site - - - - - 8cb5d39b by Tony CHEMIT at 2017-03-20T10:23:07+01:00 review pom - - - - - dd4c4ab8 by Tony CHEMIT at 2017-03-20T10:28:04+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 2523f24e by Tony CHEMIT at 2017-03-20T10:50:12+01:00 update changelog - - - - - 221f6c43 by Tony CHEMIT at 2017-03-20T10:52:21+01:00 [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 7e42bc7e by Tony CHEMIT at 2017-03-20T10:53:04+01:00 rerool 6.0-RC-1 - - - - - f9dfb0a4 by Tony CHEMIT at 2017-03-20T10:55:02+01:00 update color [skip ci] - - - - - 41181596 by Tony CHEMIT at 2017-03-20T10:58:35+01:00 update readme [skip ci] - - - - - 8ae66bc2 by Tony CHEMIT at 2017-03-20T11:36:30+01:00 fix model version - - - - - c8e85e0a by Tony CHEMIT at 2017-03-20T11:40:15+01:00 better gitflow configuration [skip ci] - - - - - 6664279c by Tony CHEMIT at 2017-03-20T11:41:32+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 8d2b2cee by Tony CHEMIT at 2017-03-20T11:47:15+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 16 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - pom.xml - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png - src/site/resources/images/logo.png → src/site/resources/img/logo.png - src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - − src/site/resources/site.js - src/site/site_fr.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,10 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone tags: @@ -34,8 +36,10 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" .env_test: &env_test environment: @@ -51,8 +55,7 @@ stages: .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn clean verify site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test @@ -86,11 +89,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-chang… | sed 's/$1/frirdobserve/' | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -146,13 +149,13 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,17 +1,18 @@ # ObServe [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… -![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop/build.svg) +![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop/build.svg) +[![The GNU General Public License, Version 3.0](https://img.shields.io/badge/license-GPL3-green.svg)](http://www.gnu.o… # Resources -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG… -* [Documentation](http://observe.ultreia.io) +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.… +* [Documentation](http://ultreiaio.gitlab.io/ird-observe) # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.5) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-1) # Community @@ -19,3 +20,37 @@ * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) * [Contact](mailto:dev@tchemit.fr) + +# Release (without stage) + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +# Release (with stage) + +Create stage + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +And to release stage + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash +``` + +# Generate site + +``` +mvn clean verify site -DperformRelease scm-publish:publish-scm +``` \ No newline at end of file ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack return; } - boolean mustClose = false; ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource(); - if (mainDataSource == null || !mainDataSource.isLocal()) { - - mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig()); - mustClose = true; + if (mainDataSource == null) { + if (log.isInfoEnabled()) { + log.info("Skip, no database open."); + } + return; } - - try { - File file = doBackup(applicationContext, mainDataSource); - applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); - } finally { - - if (mustClose) { - mainDataSource.close(); + if (!mainDataSource.isLocal()) { + if (log.isInfoEnabled()) { + log.info("Skip, open database is not local."); } + return; } + File file = doBackup(applicationContext, mainDataSource); + applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); } ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>5</version> + <version>9</version> </parent> <groupId>fr.ird.observe</groupId> @@ -36,7 +36,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.ultreia.io</url> + <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -109,6 +109,11 @@ </developer> </developers> + <issueManagement> + <system>gitlab</system> + <url>https://gitlab.com/ultreia.io/ird-observe</url> + </issueManagement> + <modules> <module>toolbox-maven-plugin</module> <module>topia-extension</module> @@ -148,18 +153,34 @@ </scm> <distributionManagement> - <site> - <id>doc.ultreia.io</id> + <site> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> </site> </distributionManagement> <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> +  + <devMode>true</devMode> + +  + <observe.model.version>6.0</observe.model.version> + +  + <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> + <buildDate>${maven.build.timestamp}</buildDate> + + <mavenVersion>3.3.9</mavenVersion> + + <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> + <licensePluginVersion>1.9</licensePluginVersion> + <jaxxVersion>3.0-alpha-6</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> @@ -173,14 +194,9 @@ <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <webmotionVersion>2.5.1</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> - <licensePluginVersion>1.9</licensePluginVersion> - - <mavenVersion>3.3.9</mavenVersion> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -199,7 +215,6 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>  <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> @@ -207,12 +222,8 @@ <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> - <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> - <buildDate>${maven.build.timestamp}</buildDate> - <devMode>true</devMode> - -  - <observe.model.version>6.0</observe.model.version> +  + <scmCommentPrefix>Release [skip ci]</scmCommentPrefix>  <maven.deploy.skip>true</maven.deploy.skip> @@ -775,7 +786,6 @@ <pluginManagement> <plugins> -  <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -803,6 +813,24 @@ </plugin> <plugin> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.reporting.outputDirectory}</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <dependencies> @@ -874,14 +902,6 @@ </plugins> </pluginManagement> - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> </build> <reporting> @@ -938,6 +958,7 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -962,29 +983,40 @@ <plugin> <artifactId>maven-changes-plugin</artifactId> <version>${changesPluginVersion}</version> + <inherited>false</inherited> <configuration> <issueLinkTemplatePerSystem> - <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab> </issueLinkTemplatePerSystem> <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> </configuration> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> <artifactId>maven-changelog-plugin</artifactId> <version>${changelogPluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>${licensePluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -1044,20 +1076,6 @@ </executions> </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - </plugins> </build> ===================================== src/site/resources/images/architecture.png → src/site/resources/img/architecture.png ===================================== Binary files a/src/site/resources/images/architecture.png and b/src/site/resources/img/architecture.png differ ===================================== src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg ===================================== --- a/src/site/resources/images/architecture.svg +++ b/src/site/resources/img/architecture.svg ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png ===================================== Binary files a/src/site/resources/images/logos/jaxx-logo.png and b/src/site/resources/img/jaxx-logo.png differ ===================================== src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png ===================================== Binary files a/src/site/resources/images/logo-small.png and b/src/site/resources/img/logo-small.png differ ===================================== src/site/resources/images/logo.png → src/site/resources/img/logo.png ===================================== Binary files a/src/site/resources/images/logo.png and b/src/site/resources/img/logo.png differ ===================================== src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files a/src/site/resources/images/logos/logo_IntelliJIDEA.png and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/resources/site.js deleted ===================================== --- a/src/site/resources/site.js +++ /dev/null @@ -1,285 +0,0 @@ -/*- - * #%L - * ObServe - * %% - * Copyright (C) 2008 - 2017 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 - * 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 General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#mavenProjectProperties'); - - if (metas.length == 0) { - return; - } - - $.debugOn = function () { - $('#mavenProjectProperties').attr('DEBUG', true); - }; - - $.debugOff = function () { - $('#mavenProjectProperties').attr('DEBUG', null); - }; - - var debug = function (metas) { - return metas.attr('DEBUG'); - }; - - var urlParameters = decodeURIComponent(window.location.search.slice(1)) - .split('&') - .reduce(function _reduce(a, b) { - b = b.split('='); - a[b[0]] = b[1]; - return a; - }, {}); - - if (urlParameters.debug) { - $.debugOn(); - } - - var projectId = metas.attr('projectId'); - var version = metas.attr('version'); - var locale = metas.attr('locale'); - - var rootUrl= 'http://' + window.location.hostname ; - var useDocUrl = false; - var localeInPath = window.location.pathname.indexOf('/' + locale + '/') > -1; - - var DEBUG = debug(metas); - - if (DEBUG) { - console.info("localeInPath: " + localeInPath); - } - - var addVersion = function (metas) { - - var DEBUG = debug(metas); - - var versionsUrl = rootUrl + '/versions'; - - $.get(versionsUrl) - .fail(function () { - console.error("can't load url: " + versionsUrl); - }) - .done(function (allVersions) { - - if (DEBUG) { - console.info("Versions url: " + versionsUrl); - console.info("All versions: " + allVersions); - } - - var labels; - if ('en' == locale) { - labels = {develop: 'in progress', latest: 'latest release'}; - } else { - labels = {develop: 'en cours', latest: 'dernière stable'}; - } - var versions = allVersions.split(' '); - if (DEBUG) { - console.info("Versions : " + versions); - console.info("version : " + version); - } - var versionsHtml = "<select id='versions' class='versions pull-left'>"; - $(versions).each(function (index, value) { - value = value.trim(); - var label; - if ('develop' == value || 'latest' == value) { - label = labels[value]; - } else { - label = value; - } - - if (DEBUG) { - console.info("Version to add " + label + " (" + value + ")"); - } - versionsHtml += "<option value='" + value + "'"; - if (version == value) { - versionsHtml += " selected='selected'"; - } - versionsHtml += ">Version " + label + "</option>"; - }); - versionsHtml += "</select><span class='divider'>»</span>"; - - $('#breadcrumbs').find('> ul > li:nth-child(2)').html(versionsHtml); - $('#versions').change(function () { - var DEBUG = debug(metas); - var newVersion = $(this).val(); - var newUrl = rootUrl + '/' + newVersion; - if (localeInPath) { - newUrl += "/" + locale; - } - if (DEBUG) { - console.info("Change to version: " + newUrl); - } - window.location = newUrl; - }); - - }); - - }; - - var addScmwebeditor = function (metas) { - - var editorUrl = 'https://scmwebeditor.nuiton.org/scmwebeditor/edit.action'; - - if ('develop' != version) { - return; - } - - var skipDefaultFiles = [ - "project-info.html", - "team-list.html", - "mail-lists.html", - "integration.html", - "issue-tracking.html", - "license.html", - "source-repository.html", - "dependencies.html", - "dependency-info.html", - "dependency-convergence.html", - "plugin-management.html", - "plugins.html", - "dependency-management.html", - "project-summary.html", - "project-reports.html", - "dev-activity.html", - "file-activity.html", - "changelog.html", - "surefire-report.html", - "third-party-report.html", - "sonar.html", - "dependency-updates-report.html", - "plugin-updates-report.html", - "property-updates-report.html", - "changes-report.html", - "redmine-report.html", - "application-config-report.html" - ]; - - var DEBUG = debug(metas); - - var scm = 'https://gitlab.com/ultreia.io/observe.git'; - - if (DEBUG) { - console.info('scm: ' + scm); - } - - var sourcesType = metas.attr('sourcesType'); - - var pathname = document.location.pathname; - - // remove prefix - if (useDocUrl) { - pathname = pathname.replace('/' + projectId + '/develop', ''); - } else { - pathname = pathname.replace('/develop', ''); - } - - if (DEBUG) { - console.info('pathname: ' + pathname); - } - - var path; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). replace('/site/', ''); - } else { - if (pathname == '/' || pathname == '') { - // on / page - path = 'index.html'; - } else { - path = pathname; - } - } - - if (localeInPath) { - - // locale detected in path (means not default locale) - // remove locale from path - path = path.substr(('/' + locale).length); - } - - if (DEBUG) { - console.info('path: ' + path); - } - if ($.inArray(path, skipDefaultFiles) > -1) { - // skip this file - if (DEBUG) { - console.info('skipDefaultFiles: ' + path); - } - return; - } - - var skipFiles = metas.attr('scmwebeditor_skipFiles'); - if (skipFiles && skipFiles.indexOf(',' + path + ',') > -1) { - // skip this file - if (DEBUG) { - console.info('skipFiles: ' + path); - } - return; - } - - path = path.replace('.html', ''); - if (path.indexOf('/') == 0) { - path = path.substr(1); - } - - var vmFiles = metas.attr('scmwebeditor_vmFiles'); - - // add vm on vmFiles - if (vmFiles && vmFiles.indexOf(',' + path + ',') > -1) { - if (DEBUG) { - console.info("Found vm file: " + path); - } - path += '.' + sourcesType + '.vm'; - } else { - if (DEBUG) { - console.info("Not found vm file: " + path); - } - path += '.' + sourcesType; - } - - if (DEBUG) { - console.info('final path: ' + path); - } - - var address = scm + "/src/site"; - if (localeInPath) { - address += '/' + locale; - } - address += '/' + sourcesType + '/' + path; - if (DEBUG) { - console.info('address: ' + address); - } - var url = editorUrl + "?scmType=Git&selectedBranch=develop&repositoryRoot=" + scm + "&address=" + address; - - if (DEBUG) { - console.info('edit url: ' + url); - } - - $('#publishDate').prepend( - "<li class='pull-right'><a target='edit' href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>" - ); - - }; - - addScmwebeditor(metas); - - addVersion(metas); - -}); \ No newline at end of file ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -48,35 +48,26 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src> + <src>./img/logo-small.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - - <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> - <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/> - + <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/> + <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> - <head> <![CDATA[ <script type="text/javascript" src="site.js"> </script><link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/>]]> </head> - <links> - <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> + <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/> <item name="Ultreia.io" href="http://ultreia.io"/> </links> <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -84,8 +75,7 @@ <item name="Installation" href="install.html"/> <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> - <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md"/> + <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -98,7 +88,5 @@ <menu ref="reports"/> - <footer> <![CDATA[<div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='md' scmwebeditor_skipFiles=',config-report,' scmwebeditor_vmFiles=",index,"/>]]> </footer> - </body> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4a108146f5490d2a887f5de6ce…

1 0

[Git][ultreiaio/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreiaio / ird-observe Commits: 6664279c by Tony CHEMIT at 2017-03-20T11:41:32+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/6664279cdeccc0aa3baea862e38…

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6664279c by Tony CHEMIT at 2017-03-20T11:41:32+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 8d2b2cee by Tony CHEMIT at 2017-03-20T11:47:15+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 9056f57e by Tony CHEMIT at 2017-03-20T11:47:19+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 7d28b347 by Tony CHEMIT at 2017-03-20T11:47:20+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 46e3806f by Tony CHEMIT at 2017-03-20T11:47:21+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/81cd6cdc8057a7bdf24d16fd37…

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 81cd6cdc by Tony CHEMIT at 2017-03-20T11:40:54+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/81cd6cdc8057a7bdf24d16fd37c…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] better gitflow configuration [skip ci]
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c8e85e0a by Tony CHEMIT at 2017-03-20T11:40:15+01:00 better gitflow configuration [skip ci] - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,9 @@ <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> +  + <scmCommentPrefix>Release [skip ci]</scmCommentPrefix> +  <maven.deploy.skip>true</maven.deploy.skip> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c8e85e0ae295179539812eee248…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] fix model version
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8ae66bc2 by Tony CHEMIT at 2017-03-20T11:36:30+01:00 fix model version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -168,7 +168,7 @@ <devMode>true</devMode>  - <observe.model.version>5.0</observe.model.version> + <observe.model.version>6.0</observe.model.version>  <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8ae66bc2f6ee42f69c1208aa31e…

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bc955ada by Tony CHEMIT at 2017-03-20T11:19:18+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bc955ada3f53185692fc3d56b9c…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][master] Deleted 16 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: 9f47ba93 by Tony CHEMIT at 2017-03-15T15:07:30+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - cd0ad7a7 by Tony CHEMIT at 2017-03-15T15:13:43+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 0349bd86 by Tony CHEMIT at 2017-03-15T15:13:44+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 618eb890 by Tony CHEMIT at 2017-03-15T15:13:45+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - ca63154c by Tony CHEMIT at 2017-03-15T15:14:33+01:00 update changelog - - - - - 50d10cea by Tony CHEMIT at 2017-03-20T08:57:40+00:00 Update .gitlab-ci.yml - - - - - f8460ca9 by Tony CHEMIT at 2017-03-20T08:59:51+00:00 Update .gitlab-ci.yml - - - - - 8b948b06 by Tony CHEMIT at 2017-03-20T09:03:16+00:00 Update README.md - - - - - 52c35b8c by Tony CHEMIT at 2017-03-20T10:22:58+01:00 review site - - - - - 8cb5d39b by Tony CHEMIT at 2017-03-20T10:23:07+01:00 review pom - - - - - dd4c4ab8 by Tony CHEMIT at 2017-03-20T10:28:04+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 2523f24e by Tony CHEMIT at 2017-03-20T10:50:12+01:00 update changelog - - - - - 221f6c43 by Tony CHEMIT at 2017-03-20T10:52:21+01:00 [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 7e42bc7e by Tony CHEMIT at 2017-03-20T10:53:04+01:00 rerool 6.0-RC-1 - - - - - f9dfb0a4 by Tony CHEMIT at 2017-03-20T10:55:02+01:00 update color [skip ci] - - - - - 41181596 by Tony CHEMIT at 2017-03-20T10:58:35+01:00 update readme [skip ci] - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4a108146f5490d2a887f5de6ce…

1 0

[Git][ultreiaio/ird-observe][master] 16 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: 9f47ba93 by Tony CHEMIT at 2017-03-15T15:07:30+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - cd0ad7a7 by Tony CHEMIT at 2017-03-15T15:13:43+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 0349bd86 by Tony CHEMIT at 2017-03-15T15:13:44+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 618eb890 by Tony CHEMIT at 2017-03-15T15:13:45+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - ca63154c by Tony CHEMIT at 2017-03-15T15:14:33+01:00 update changelog - - - - - 50d10cea by Tony CHEMIT at 2017-03-20T08:57:40+00:00 Update .gitlab-ci.yml - - - - - f8460ca9 by Tony CHEMIT at 2017-03-20T08:59:51+00:00 Update .gitlab-ci.yml - - - - - 8b948b06 by Tony CHEMIT at 2017-03-20T09:03:16+00:00 Update README.md - - - - - 52c35b8c by Tony CHEMIT at 2017-03-20T10:22:58+01:00 review site - - - - - 8cb5d39b by Tony CHEMIT at 2017-03-20T10:23:07+01:00 review pom - - - - - dd4c4ab8 by Tony CHEMIT at 2017-03-20T10:28:04+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 2523f24e by Tony CHEMIT at 2017-03-20T10:50:12+01:00 update changelog - - - - - 221f6c43 by Tony CHEMIT at 2017-03-20T10:52:21+01:00 [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 7e42bc7e by Tony CHEMIT at 2017-03-20T10:53:04+01:00 rerool 6.0-RC-1 - - - - - f9dfb0a4 by Tony CHEMIT at 2017-03-20T10:55:02+01:00 update color [skip ci] - - - - - 41181596 by Tony CHEMIT at 2017-03-20T10:58:35+01:00 update readme [skip ci] - - - - - 30 changed files: - .gitlab-ci.yml - CHANGELOG.md - README.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4a108146f5490d2a887f5de6ce…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update color [skip ci]
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f9dfb0a4 by Tony CHEMIT at 2017-03-20T10:55:02+01:00 update color [skip ci] - - - - - 41181596 by Tony CHEMIT at 2017-03-20T10:58:35+01:00 update readme [skip ci] - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… ![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop/build.svg) -[![The GNU General Public License, Version 3.0](https://img.shields.io/badge/license-GPL3-blue.svg)](http://www.gnu.or… +[![The GNU General Public License, Version 3.0](https://img.shields.io/badge/license-GPL3-green.svg)](http://www.gnu.o… # Resources @@ -21,13 +21,36 @@ * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) * [Contact](mailto:dev@tchemit.fr) -# Release +# Release (without stage) ``` wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash -wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +# Release (with stage) + +Create stage + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +And to release stage + +``` wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash ``` + +# Generate site + +``` +mvn clean verify site -DperformRelease scm-publish:publish-scm +``` \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7e42bc7e1726c88d6667492808…

1 0

[Git][ultreiaio/ird-observe][develop] rerool 6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7e42bc7e by Tony CHEMIT at 2017-03-20T10:53:04+01:00 rerool 6.0-RC-1 - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7e42bc7e1726c88d66674928082…

1 0

[Git][ultreiaio/ird-observe] Deleted tag v6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT deleted tag v6.0-RC-1 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747)
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 221f6c43 by Tony CHEMIT at 2017-03-20T10:52:21+01:00 [Report from 5.x] Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack return; } - boolean mustClose = false; ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource(); - if (mainDataSource == null || !mainDataSource.isLocal()) { - - mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig()); - mustClose = true; + if (mainDataSource == null) { + if (log.isInfoEnabled()) { + log.info("Skip, no database open."); + } + return; } - - try { - File file = doBackup(applicationContext, mainDataSource); - applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); - } finally { - - if (mustClose) { - mainDataSource.close(); + if (!mainDataSource.isLocal()) { + if (log.isInfoEnabled()) { + log.info("Skip, open database is not local."); } + return; } + File file = doBackup(applicationContext, mainDataSource); + applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/221f6c4355d5d5f856df1a37a1f…

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2523f24e by Tony CHEMIT at 2017-03-20T10:50:12+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ **Closed at *In progress*.** +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreiaio/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2523f24ec3dc03915c53d990836…

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 6.0-RC-1
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dd4c4ab8 by Tony CHEMIT at 2017-03-20T10:28:04+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dd4c4ab822b343c0fc0e513de4c…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: review site
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 52c35b8c by Tony CHEMIT at 2017-03-20T10:22:58+01:00 review site - - - - - 8cb5d39b by Tony CHEMIT at 2017-03-20T10:23:07+01:00 review pom - - - - - 12 changed files: - pom.xml - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png - src/site/resources/images/logo.png → src/site/resources/img/logo.png - src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - − src/site/resources/site.js - src/site/site_fr.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>5</version> + <version>9</version> </parent> <groupId>fr.ird.observe</groupId> @@ -36,7 +36,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.ultreia.io</url> + <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -109,6 +109,11 @@ </developer> </developers> + <issueManagement> + <system>gitlab</system> + <url>https://gitlab.com/ultreia.io/ird-observe</url> + </issueManagement> + <modules> <module>toolbox-maven-plugin</module> <module>topia-extension</module> @@ -148,18 +153,34 @@ </scm> <distributionManagement> - <site> - <id>doc.ultreia.io</id> + <site> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> </site> </distributionManagement> <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> +  + <devMode>true</devMode> + +  + <observe.model.version>5.0</observe.model.version> + +  + <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> + <buildDate>${maven.build.timestamp}</buildDate> + + <mavenVersion>3.3.9</mavenVersion> + + <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> + <licensePluginVersion>1.9</licensePluginVersion> + <jaxxVersion>3.0-alpha-6</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> @@ -173,14 +194,9 @@ <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <webmotionVersion>2.5.1</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> - <licensePluginVersion>1.9</licensePluginVersion> - - <mavenVersion>3.3.9</mavenVersion> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -199,7 +215,6 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>  <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> @@ -207,13 +222,6 @@ <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> - <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> - <buildDate>${maven.build.timestamp}</buildDate> - <devMode>true</devMode> - -  - <observe.model.version>6.0</observe.model.version> -  <maven.deploy.skip>true</maven.deploy.skip> @@ -775,7 +783,6 @@ <pluginManagement> <plugins> -  <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -803,6 +810,24 @@ </plugin> <plugin> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.reporting.outputDirectory}</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <dependencies> @@ -874,14 +899,6 @@ </plugins> </pluginManagement> - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> </build> <reporting> @@ -938,6 +955,7 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -962,29 +980,40 @@ <plugin> <artifactId>maven-changes-plugin</artifactId> <version>${changesPluginVersion}</version> + <inherited>false</inherited> <configuration> <issueLinkTemplatePerSystem> - <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab> </issueLinkTemplatePerSystem> <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> </configuration> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> <artifactId>maven-changelog-plugin</artifactId> <version>${changelogPluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>${licensePluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -1044,20 +1073,6 @@ </executions> </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - </plugins> </build> ===================================== src/site/resources/images/architecture.png → src/site/resources/img/architecture.png ===================================== Binary files a/src/site/resources/images/architecture.png and b/src/site/resources/img/architecture.png differ ===================================== src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg ===================================== --- a/src/site/resources/images/architecture.svg +++ b/src/site/resources/img/architecture.svg ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png ===================================== Binary files a/src/site/resources/images/logos/jaxx-logo.png and b/src/site/resources/img/jaxx-logo.png differ ===================================== src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png ===================================== Binary files a/src/site/resources/images/logo-small.png and b/src/site/resources/img/logo-small.png differ ===================================== src/site/resources/images/logo.png → src/site/resources/img/logo.png ===================================== Binary files a/src/site/resources/images/logo.png and b/src/site/resources/img/logo.png differ ===================================== src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files a/src/site/resources/images/logos/logo_IntelliJIDEA.png and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/resources/site.js deleted ===================================== --- a/src/site/resources/site.js +++ /dev/null @@ -1,285 +0,0 @@ -/*- - * #%L - * ObServe - * %% - * Copyright (C) 2008 - 2017 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 - * 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 General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#mavenProjectProperties'); - - if (metas.length == 0) { - return; - } - - $.debugOn = function () { - $('#mavenProjectProperties').attr('DEBUG', true); - }; - - $.debugOff = function () { - $('#mavenProjectProperties').attr('DEBUG', null); - }; - - var debug = function (metas) { - return metas.attr('DEBUG'); - }; - - var urlParameters = decodeURIComponent(window.location.search.slice(1)) - .split('&') - .reduce(function _reduce(a, b) { - b = b.split('='); - a[b[0]] = b[1]; - return a; - }, {}); - - if (urlParameters.debug) { - $.debugOn(); - } - - var projectId = metas.attr('projectId'); - var version = metas.attr('version'); - var locale = metas.attr('locale'); - - var rootUrl= 'http://' + window.location.hostname ; - var useDocUrl = false; - var localeInPath = window.location.pathname.indexOf('/' + locale + '/') > -1; - - var DEBUG = debug(metas); - - if (DEBUG) { - console.info("localeInPath: " + localeInPath); - } - - var addVersion = function (metas) { - - var DEBUG = debug(metas); - - var versionsUrl = rootUrl + '/versions'; - - $.get(versionsUrl) - .fail(function () { - console.error("can't load url: " + versionsUrl); - }) - .done(function (allVersions) { - - if (DEBUG) { - console.info("Versions url: " + versionsUrl); - console.info("All versions: " + allVersions); - } - - var labels; - if ('en' == locale) { - labels = {develop: 'in progress', latest: 'latest release'}; - } else { - labels = {develop: 'en cours', latest: 'dernière stable'}; - } - var versions = allVersions.split(' '); - if (DEBUG) { - console.info("Versions : " + versions); - console.info("version : " + version); - } - var versionsHtml = "<select id='versions' class='versions pull-left'>"; - $(versions).each(function (index, value) { - value = value.trim(); - var label; - if ('develop' == value || 'latest' == value) { - label = labels[value]; - } else { - label = value; - } - - if (DEBUG) { - console.info("Version to add " + label + " (" + value + ")"); - } - versionsHtml += "<option value='" + value + "'"; - if (version == value) { - versionsHtml += " selected='selected'"; - } - versionsHtml += ">Version " + label + "</option>"; - }); - versionsHtml += "</select><span class='divider'>»</span>"; - - $('#breadcrumbs').find('> ul > li:nth-child(2)').html(versionsHtml); - $('#versions').change(function () { - var DEBUG = debug(metas); - var newVersion = $(this).val(); - var newUrl = rootUrl + '/' + newVersion; - if (localeInPath) { - newUrl += "/" + locale; - } - if (DEBUG) { - console.info("Change to version: " + newUrl); - } - window.location = newUrl; - }); - - }); - - }; - - var addScmwebeditor = function (metas) { - - var editorUrl = 'https://scmwebeditor.nuiton.org/scmwebeditor/edit.action'; - - if ('develop' != version) { - return; - } - - var skipDefaultFiles = [ - "project-info.html", - "team-list.html", - "mail-lists.html", - "integration.html", - "issue-tracking.html", - "license.html", - "source-repository.html", - "dependencies.html", - "dependency-info.html", - "dependency-convergence.html", - "plugin-management.html", - "plugins.html", - "dependency-management.html", - "project-summary.html", - "project-reports.html", - "dev-activity.html", - "file-activity.html", - "changelog.html", - "surefire-report.html", - "third-party-report.html", - "sonar.html", - "dependency-updates-report.html", - "plugin-updates-report.html", - "property-updates-report.html", - "changes-report.html", - "redmine-report.html", - "application-config-report.html" - ]; - - var DEBUG = debug(metas); - - var scm = 'https://gitlab.com/ultreia.io/observe.git'; - - if (DEBUG) { - console.info('scm: ' + scm); - } - - var sourcesType = metas.attr('sourcesType'); - - var pathname = document.location.pathname; - - // remove prefix - if (useDocUrl) { - pathname = pathname.replace('/' + projectId + '/develop', ''); - } else { - pathname = pathname.replace('/develop', ''); - } - - if (DEBUG) { - console.info('pathname: ' + pathname); - } - - var path; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). replace('/site/', ''); - } else { - if (pathname == '/' || pathname == '') { - // on / page - path = 'index.html'; - } else { - path = pathname; - } - } - - if (localeInPath) { - - // locale detected in path (means not default locale) - // remove locale from path - path = path.substr(('/' + locale).length); - } - - if (DEBUG) { - console.info('path: ' + path); - } - if ($.inArray(path, skipDefaultFiles) > -1) { - // skip this file - if (DEBUG) { - console.info('skipDefaultFiles: ' + path); - } - return; - } - - var skipFiles = metas.attr('scmwebeditor_skipFiles'); - if (skipFiles && skipFiles.indexOf(',' + path + ',') > -1) { - // skip this file - if (DEBUG) { - console.info('skipFiles: ' + path); - } - return; - } - - path = path.replace('.html', ''); - if (path.indexOf('/') == 0) { - path = path.substr(1); - } - - var vmFiles = metas.attr('scmwebeditor_vmFiles'); - - // add vm on vmFiles - if (vmFiles && vmFiles.indexOf(',' + path + ',') > -1) { - if (DEBUG) { - console.info("Found vm file: " + path); - } - path += '.' + sourcesType + '.vm'; - } else { - if (DEBUG) { - console.info("Not found vm file: " + path); - } - path += '.' + sourcesType; - } - - if (DEBUG) { - console.info('final path: ' + path); - } - - var address = scm + "/src/site"; - if (localeInPath) { - address += '/' + locale; - } - address += '/' + sourcesType + '/' + path; - if (DEBUG) { - console.info('address: ' + address); - } - var url = editorUrl + "?scmType=Git&selectedBranch=develop&repositoryRoot=" + scm + "&address=" + address; - - if (DEBUG) { - console.info('edit url: ' + url); - } - - $('#publishDate').prepend( - "<li class='pull-right'><a target='edit' href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>" - ); - - }; - - addScmwebeditor(metas); - - addVersion(metas); - -}); \ No newline at end of file ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -48,35 +48,26 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src> + <src>./img/logo-small.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - - <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> - <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/> - + <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/> + <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> - <head> <![CDATA[ <script type="text/javascript" src="site.js"> </script><link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/>]]> </head> - <links> - <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> + <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/> <item name="Ultreia.io" href="http://ultreia.io"/> </links> <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -84,8 +75,7 @@ <item name="Installation" href="install.html"/> <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> - <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md"/> + <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -98,7 +88,5 @@ <menu ref="reports"/> - <footer> <![CDATA[<div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='md' scmwebeditor_skipFiles=',config-report,' scmwebeditor_vmFiles=",index,"/>]]> </footer> - </body> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b948b06956ad1d68e65de589e…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: ce0ac6e4 by Tony CHEMIT at 2017-03-20T10:12:39+01:00 Site checkin for project ObServe - - - - - 28 changed files: - administration-web.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - plugin-management.html - plugin-updates-report.html - plugins.html - project-info.html - project-reports.html - project-summary.html - property-updates-report.html - sitemap.html - source-repository.html - team-list.html - third-party-report.html Changes: ===================================== administration-web.html ===================================== --- a/administration-web.html +++ b/administration-web.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -56,7 +56,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -99,7 +99,7 @@ <div class="source"><pre class="prettyprint linenums"> /var/local/observeweb/ |-- databases.yml # configuration des bases de données |-- log - | `-- observeweb-5.3.5-SNAPSHOT.log # logs de l'application + | `-- observeweb-5.3.5.log # logs de l'application |-- observeweb-log4j.conf # configuration des logs |-- temp # répertoire temporaire `-- users.yml # configuration des utilisateurs ===================================== architecture-logicielle.html ===================================== --- a/architecture-logicielle.html +++ b/architecture-logicielle.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -55,7 +55,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== changelog.html ===================================== --- a/changelog.html +++ b/changelog.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">Change Log Report</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -91,13 +91,37 @@ <p>Total number of changed sets: 1</p> <div class="section"> <h3><a name="Changes_between_2017-02-18_and_2017-03-21"></a>Changes between 2017-02-18 and 2017-03-21</h3> -<p>Total commits: 99<br />Total number of files changed: 123</p> +<p>Total commits: 105<br />Total number of files changed: 142</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Timestamp</th> <th>Author</th> <th>Details</th></tr> <tr class="b"> +<td>2017-03-20 09:55:44</td> +<td>Tony CHEMIT <dev(a)tchemit.fr></td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-configuration/p…">application-swing-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-configuration/p…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-decoration/pom.…">application-swing-decoration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-decoration/pom.…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-validation/pom.…">application-swing-validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-validation/pom.…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-validators/pom.…">application-swing-validators/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-validators/pom.…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/pom.xml">application-swing/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/pom.xml?rev=287…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-web-configuration/pom…">application-web-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-web-configuration/pom…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-web/pom.xml">application-web/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-web/pom.xml?rev=287cb…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/entities-migration/pom.xml">entities-migration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/entities-migration/pom.xml?rev=28…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/entities/pom.xml">entities/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/entities/pom.xml?rev=287cbbf6b360…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/observe/pom.xml?rev=287cbbf6b360d…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml?rev=287cbbf6b360dd8ea24c8…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration-rest/pom.x…">services-configuration-rest/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration-rest/pom.x…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration-topia/pom.…">services-configuration-topia/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration-topia/pom.…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration/pom.xml">services-configuration/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration/pom.xml?re…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-dto/pom.xml">services-dto/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-dto/pom.xml?rev=287cbbf6…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-rest/pom.xml">services-rest/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-rest/pom.xml?rev=287cbbf…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-runner/pom.xml">services-runner/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-runner/pom.xml?rev=287cb…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia-validation/pom.xml">services-topia-validation/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia-validation/pom.xml…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia-validators/pom.xml">services-topia-validators/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia-validators/pom.xml…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/pom.xml">services-topia/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/pom.xml?rev=287cbb…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services/pom.xml?rev=287cbbf6b360…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/test/pom.xml?rev=287cbbf6b360dd8e…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/toolbox-maven-plugin/pom.xml">toolbox-maven-plugin/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/toolbox-maven-plugin/pom.xml?rev=…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/topia-extension/pom.xml">topia-extension/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/topia-extension/pom.xml?rev=287cb…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/topia-templates-extension/pom.xml">topia-templates-extension/<b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/topia-templates-extension/pom.xml…">v 287cbbf6b360dd8ea24c8317d4729c2140a6fed2</a><br /><br />[jgitflow-maven-plugin]updating poms for branch'release/5.3.5' with non-snapshot versions</td></tr> +<tr class="a"> +<td>2017-03-20 09:53:46</td> +<td>Tony CHEMIT <dev(a)tchemit.fr></td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/backup/<b>AtCloseApplicationLocalDatabaseBackupTask.java</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">v 2670b655fde8345af25727cc6b03f63f92e6fb81</a><br /><br />Message d'erreur à chaque fermeture de l'application (See #747)</td></tr> +<tr class="b"> +<td>2017-03-20 09:43:06</td> +<td>Tony CHEMIT <dev(a)tchemit.fr></td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md"><b>README.md</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md?rev=44a7ffb1f22a5ee0480…">v 44a7ffb1f22a5ee048041f073207b4d68eb75a69</a><br /><br />update link</td></tr> +<tr class="a"> +<td>2017-03-20 09:42:27</td> +<td>Tony CHEMIT <dev(a)tchemit.fr></td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md"><b>README.md</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md?rev=88ed9fae950065b69cf…">v 88ed9fae950065b69cf2b1b4231568da7fc12c94</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml?rev=88ed9fae950065b69cf2b…">v 88ed9fae950065b69cf2b1b4231568da7fc12c94</a><br /><br />continue site review</td></tr> +<tr class="b"> +<td>2017-03-20 09:30:54</td> +<td>Tony CHEMIT <dev(a)tchemit.fr></td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml?rev=87804f3ef4175db74f15d…">v 87804f3ef4175db74f15d2757285a1d93f45a5b8</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/.gitlab-ci.yml">src/site/resources/<b>.gitlab-ci.yml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/.gitlab-ci.yml…">v 87804f3ef4175db74f15d2757285a1d93f45a5b8</a><br /><br />continue site review</td></tr> +<tr class="a"> +<td>2017-03-20 09:24:37</td> +<td>Tony CHEMIT <dev(a)tchemit.fr></td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/.gitlab-ci.yml"><b>.gitlab-ci.yml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/.gitlab-ci.yml?rev=c4cd675030f082…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md"><b>README.md</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md?rev=c4cd675030f082a1c86…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml?rev=c4cd675030f082a1c86b3…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/architecture-lo…">src/site/markdown/<b>architecture-logicielle.md</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/architecture-lo…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/archite…">src/site/resources/images/<b>architecture.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/archite…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/archite…">src/site/resources/images/<b>architecture.svg</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/archite…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo-sm…">src/site/resources/images/<b>logo-small.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo-sm…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo.png">src/site/resources/images/<b>logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo.pn…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo_ir…">src/site/resources/images/<b>logo_ird.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo_ir…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/a…">src/site/resources/images/logos/<b>argouml-logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/a…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/j…">src/site/resources/images/logos/<b>jaxx-logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/j…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/l…">src/site/resources/images/logos/<b>logo_IntelliJIDEA.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/l…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/t…">src/site/resources/images/logos/<b>topia-logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/t…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/architectu…">src/site/resources/img/<b>architecture.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/architectu…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/architectu…">src/site/resources/img/<b>architecture.svg</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/architectu…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/argouml-lo…">src/site/resources/img/<b>argouml-logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/argouml-lo…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/jaxx-logo.…">src/site/resources/img/<b>jaxx-logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/jaxx-logo.…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo-small…">src/site/resources/img/<b>logo-small.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo-small…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo.png">src/site/resources/img/<b>logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo.png?r…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo_Intel…">src/site/resources/img/<b>logo_IntelliJIDEA.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo_Intel…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo_ird.p…">src/site/resources/img/<b>logo_ird.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo_ird.p…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/topia-logo…">src/site/resources/img/<b>topia-logo.png</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/topia-logo…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/site_fr.xml">src/site/<b>site_fr.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/site_fr.xml?rev=c4cd6750…">v c4cd675030f082a1c86b3ab00c25c0bb463b580a</a><br /><br />review site (deploy it now under gitlab.io)</td></tr> +<tr class="b"> <td>2017-03-20 08:21:23</td> <td>Tony CHEMIT <dev(a)tchemit.fr></td> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml"><b>pom.xml</b></a> <a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml?rev=1dd2dde09f9369ef83d83…">v 1dd2dde09f9369ef83d8382cd135cccb6cea1c5e</a><br /><br />update pom to 7</td></tr> ===================================== changes-report.html ===================================== --- a/changes-report.html +++ b/changes-report.html @@ -26,10 +26,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">ObServe changelog</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -69,7 +69,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== config-report.html ===================================== --- a/config-report.html +++ b/config-report.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">Configuration</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -97,19 +97,201 @@ <th>Nombre d'options</th> <th>Nombre d'actions</th></tr> <tr class="b"> -<td><a href="./config-report.html#detail_ObserveSwingApplicationConfig">ObserveSwingApplicationConfig</a></td> -<td>Configuration d'ObServe</td> -<td>78</td> -<td>9</td></tr> -<tr class="a"> <td><a href="./config-report.html#detail_ObserveWebApplicationConfig">ObserveWebApplicationConfig</a></td> <td>Observe web Configuration</td> <td>15</td> -<td>0</td></tr></table></div> +<td>0</td></tr> +<tr class="a"> +<td><a href="./config-report.html#detail_ObserveSwingApplicationConfig">ObserveSwingApplicationConfig</a></td> +<td>Configuration d'ObServe</td> +<td>78</td> +<td>9</td></tr></table></div> <div class="section"> <h2><a name="Dtail_des_configurations"></a>Détail des configurations</h2><br /> <p>On détaille ici une par une les configurations définies pour le projet</p> <div class="section"> +<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> +<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> +<p>Description : <b>Observe web Configuration</b></p> +<div class="section"> +<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> +<table border="0" class="table table-striped"> +<tr class="b"> +<th>Clef</th> +<th>Description</th> +<th>Valeur par défaut</th> +<th>Option modifiable</th> +<th>Option sauvegardable</th> +<th>Type</th></tr> +<tr class="a"> +<td>observeweb.build.version</td> +<td>Version de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="b"> +<td>observeweb.build.date</td> +<td>Date de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.build.number</td> +<td>Numéro de construction</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="b"> +<td>observeweb.adminApiKey</td> +<td>Clé API Admin (À changer)</td> +<td> +<div> +<pre style="monospaced">changeme</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.apiUrl</td> +<td>Url de l'api rest</td> +<td> +<div> +<pre style="monospaced">http://localhost:8080/observeweb/api/v1</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.net.URL</pre></div></td></tr> +<tr class="b"> +<td>observeweb.model.version</td> +<td>Version du modèle</td> +<td> +<div> +<pre style="monospaced">Pas de valeur par défaut</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> +<tr class="a"> +<td>observeweb.devMode</td> +<td>Mode développeur</td> +<td> +<div> +<pre style="monospaced">true</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">boolean</pre></div></td></tr> +<tr class="b"> +<td>observeweb.contextPath</td> +<td>Contexte applicatif</td> +<td> +<div> +<pre style="monospaced">observe</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.lang.String</pre></div></td></tr> +<tr class="a"> +<td>observeweb.baseDirectory</td> +<td>Répertoire de l'application</td> +<td> +<div> +<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.temporaryDirectory</td> +<td>Chemin vers le répertoire temporaire</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.log4jConfigurationFile</td> +<td>Chemin vers le fichier de configuration des logs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.databasesConfigurationFile</td> +<td>Chemin vers le fichier de configuration des bases</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="a"> +<td>observeweb.usersConfigurationFile</td> +<td>Chemin vers le fichier de configuration des utilisateurs</td> +<td> +<div> +<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">java.io.File</pre></div></td></tr> +<tr class="b"> +<td>observeweb.sessionExpirationDelay</td> +<td>Temps maximum d'une session (en minutes)</td> +<td> +<div> +<pre style="monospaced">60</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr> +<tr class="a"> +<td>observeweb.sessionMaximumSize</td> +<td>Taille maximum de session</td> +<td> +<div> +<pre style="monospaced">10000</pre></div></td> +<td>Oui</td> +<td>Non</td> +<td> +<div> +<pre style="monospaced">int</pre></div></td></tr></table></div> +<div class="section"> +<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> +<p><b>Aucune action définie pour cette configuration</b></p></div></div> +<div class="section"> <h3><a name="Configuration___ObserveSwingApplicationConfig"></a><a name="detail_ObserveSwingApplicationConfig">Configuration ObserveSwingApplicationConfig</a></h3> <p>Nom de la configuration : <b>ObserveSwingApplicationConfig</b></p> <p>Description : <b>Configuration d'ObServe</b></p> @@ -1026,189 +1208,7 @@ Deux paramètres sont nécessaires: Le FQN de la classe Le nombre d'id à générer.</td> <td>--create-id</td> -<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div> -<div class="section"> -<h3><a name="Configuration___ObserveWebApplicationConfig"></a><a name="detail_ObserveWebApplicationConfig">Configuration ObserveWebApplicationConfig</a></h3> -<p>Nom de la configuration : <b>ObserveWebApplicationConfig</b></p> -<p>Description : <b>Observe web Configuration</b></p> -<div class="section"> -<h4><a name="Options_de_la_configuration"></a><a name="detail_options_ObserveWebApplicationConfig">Options de la configuration</a></h4><br /> -<table border="0" class="table table-striped"> -<tr class="a"> -<th>Clef</th> -<th>Description</th> -<th>Valeur par défaut</th> -<th>Option modifiable</th> -<th>Option sauvegardable</th> -<th>Type</th></tr> -<tr class="b"> -<td>observeweb.build.version</td> -<td>Version de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="a"> -<td>observeweb.build.date</td> -<td>Date de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.build.number</td> -<td>Numéro de construction</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="a"> -<td>observeweb.adminApiKey</td> -<td>Clé API Admin (À changer)</td> -<td> -<div> -<pre style="monospaced">changeme</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.apiUrl</td> -<td>Url de l'api rest</td> -<td> -<div> -<pre style="monospaced">http://localhost:8080/observeweb/api/v1</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.net.URL</pre></div></td></tr> -<tr class="a"> -<td>observeweb.model.version</td> -<td>Version du modèle</td> -<td> -<div> -<pre style="monospaced">Pas de valeur par défaut</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">org.nuiton.version.Version</pre></div></td></tr> -<tr class="b"> -<td>observeweb.devMode</td> -<td>Mode développeur</td> -<td> -<div> -<pre style="monospaced">true</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">boolean</pre></div></td></tr> -<tr class="a"> -<td>observeweb.contextPath</td> -<td>Contexte applicatif</td> -<td> -<div> -<pre style="monospaced">observe</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.lang.String</pre></div></td></tr> -<tr class="b"> -<td>observeweb.baseDirectory</td> -<td>Répertoire de l'application</td> -<td> -<div> -<pre style="monospaced">/var/local/observeweb/${observeweb.contextPath}</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.temporaryDirectory</td> -<td>Chemin vers le répertoire temporaire</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/temp</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.log4jConfigurationFile</td> -<td>Chemin vers le fichier de configuration des logs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/observeweb-log4j.conf</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.databasesConfigurationFile</td> -<td>Chemin vers le fichier de configuration des bases</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/databases.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="b"> -<td>observeweb.usersConfigurationFile</td> -<td>Chemin vers le fichier de configuration des utilisateurs</td> -<td> -<div> -<pre style="monospaced">${observeweb.baseDirectory}/users.yml</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">java.io.File</pre></div></td></tr> -<tr class="a"> -<td>observeweb.sessionExpirationDelay</td> -<td>Temps maximum d'une session (en minutes)</td> -<td> -<div> -<pre style="monospaced">60</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr> -<tr class="b"> -<td>observeweb.sessionMaximumSize</td> -<td>Taille maximum de session</td> -<td> -<div> -<pre style="monospaced">10000</pre></div></td> -<td>Oui</td> -<td>Non</td> -<td> -<div> -<pre style="monospaced">int</pre></div></td></tr></table></div> -<div class="section"> -<h4><a name="Actions_de_la_configuration"></a><a name="detail_actions_ObserveWebApplicationConfig">Actions de la configuration</a></h4><br /> -<p><b>Aucune action définie pour cette configuration</b></p></div></div></div> +<td>fr.ird.observe.application.swing.ObserveCLAction#createId</td></tr></table></div></div></div> </div> </div> </div> ===================================== dependency-convergence.html ===================================== --- a/dependency-convergence.html +++ b/dependency-convergence.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -133,12 +133,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:5.3.5-SNAPSHOT<br />\- fr.ird.observe:services-topia:jar:5.3.5-SNAPSHOT:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:application-web:war:5.3.5<br />\- fr.ird.observe:services-topia:jar:5.3.5:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm:jar:3.3:compile<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:5.3.5-SNAPSHOT<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:application-web:war:5.3.5<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      \- asm:asm-tree:jar:3.3.1:compile<br />         \- (asm:asm:jar:3.3.1:compile - omitted for conflict with 3.3)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="asm:asm-tree"></a>asm:asm-tree</h4> <table border="0" class="table table-striped"> @@ -150,12 +150,12 @@ <td width="25%">3.3</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:5.3.5-SNAPSHOT<br />\- fr.ird.observe:services-topia:jar:5.3.5-SNAPSHOT:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:application-web:war:5.3.5<br />\- fr.ird.observe:services-topia:jar:5.3.5:compile<br />   \- org.apache.struts.xwork:xwork-core:jar:2.3.31:compile<br />      \- asm:asm-commons:jar:3.3:compile<br />         \- (asm:asm-tree:jar:3.3:compile - omitted for conflict with 3.3.1)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.3.1</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:application-web:war:5.3.5-SNAPSHOT<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:application-web:war:5.3.5<br />\- org.debux.webmotion:webmotion:jar:2.5.1:compile<br />   \- org.parboiled:parboiled-java:jar:1.0.2:compile<br />      +- asm:asm-util:jar:3.3.1:compile<br />      |  \- (asm:asm-tree:jar:3.3.1:compile - omitted for conflict with 3.3)<br />      +- asm:asm-tree:jar:3.3.1:compile<br />      \- asm:asm-analysis:jar:3.3.1:compile<br />         \- (asm:asm-tree:jar:3.3.1:compile - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="org.codehaus.plexus:plexus-component-annotations"></a>org.codehaus.plexus:plexus-component-annotations</h4> <table border="0" class="table table-striped"> @@ -167,12 +167,12 @@ <td width="25%">1.5.5</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5-SNAPSHOT<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.6)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-component-annotations:jar:1.5.5:compile - omitted for conflict with 1.6)<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">1.6</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5-SNAPSHOT<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.apache.maven.shared:maven-dependency-tree:jar:3.0:compile<br />|     \- org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-component-annotations:jar:1.6:compile - scope updated from provided; omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div> <div class="section"> <h4><a name="org.codehaus.plexus:plexus-utils"></a>org.codehaus.plexus:plexus-utils</h4> <table border="0" class="table table-striped"> @@ -184,22 +184,22 @@ <td width="25%">1.5.5</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5-SNAPSHOT<br />\- org.apache.maven:maven-core:jar:3.3.9:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.3:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5<br />\- org.apache.maven:maven-core:jar:3.3.9:provided<br />   \- org.sonatype.plexus:plexus-sec-dispatcher:jar:1.3:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:1.5.5:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.0.15</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5-SNAPSHOT<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- org.apache.maven.wagon:wagon-provider-api:jar:2.10:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.15:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5<br />\- org.apache.maven:maven-compat:jar:3.3.9:provided<br />   \- org.apache.maven.wagon:wagon-provider-api:jar:2.10:provided<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.15:provided - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="a"> <td width="25%">3.0.17</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5-SNAPSHOT<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5<br />\- org.apache.maven:maven-plugin-api:jar:3.3.9:compile<br />   \- org.eclipse.sisu:org.eclipse.sisu.plexus:jar:0.3.2:compile<br />      \- (org.codehaus.plexus:plexus-utils:jar:3.0.17:compile - omitted for conflict with 3.0.22)<br /></li><br /></ol></td></tr> <tr class="b"> <td width="25%">3.0.22</td> <td> <ol style="list-style-type: decimal"> -<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5-SNAPSHOT<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.3.9:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-compat:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-model:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-settings:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />\- org.apache.maven:maven-artifact:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> +<li>fr.ird.observe:toolbox-maven-plugin:maven-plugin:5.3.5<br />+- org.nuiton:helper-maven-plugin-api:jar:2.3.2:compile<br />|  \- org.codehaus.plexus:plexus-utils:jar:3.0.22:compile<br />+- org.apache.maven:maven-core:jar:3.3.9:provided<br />|  +- org.apache.maven:maven-settings-builder:jar:3.3.9:provided<br />|  |  +- org.apache.maven:maven-builder-support:jar:3.3.9:provided<br />|  |  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-repository-metadata:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-model-builder:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  +- org.apache.maven:maven-aether-provider:jar:3.3.9:provided<br />|  |  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-compat:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-model:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />+- org.apache.maven:maven-settings:jar:3.3.9:provided<br />|  \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br />\- org.apache.maven:maven-artifact:jar:3.3.9:provided<br />   \- (org.codehaus.plexus:plexus-utils:jar:3.0.22:provided - omitted for duplicate)<br /></li><br /></ol></td></tr></table></td></tr></table></div></div> </div> </div> </div> ===================================== dependency-info.html ===================================== --- a/dependency-info.html +++ b/dependency-info.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">Informations de dépendance</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -95,31 +95,31 @@ <div class="source"><pre class="prettyprint linenums"><dependency> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> <type>pom</type> </dependency></pre></div></div> <div class="section"> <h3><a name="Apache_Buildr"></a>Apache Buildr</h3><a name="Apache_Buildr"></a> -<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:pom:pom:5.3.5-SNAPSHOT'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">'fr.ird.observe:pom:pom:5.3.5'</pre></div></div> <div class="section"> <h3><a name="Apache_Ivy"></a>Apache Ivy</h3><a name="Apache_Ivy"></a> -<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="pom" rev="5.3.5-SNAPSHOT"> +<div class="source"><pre class="prettyprint linenums"><dependency org="fr.ird.observe" name="pom" rev="5.3.5"> <artifact name="pom" type="pom" /> </dependency></pre></div></div> <div class="section"> <h3><a name="Groovy_Grape"></a>Groovy Grape</h3><a name="Groovy_Grape"></a> <div class="source"><pre class="prettyprint linenums">@Grapes( -@Grab(group='fr.ird.observe', module='pom', version='5.3.5-SNAPSHOT') +@Grab(group='fr.ird.observe', module='pom', version='5.3.5') )</pre></div></div> <div class="section"> <h3><a name="GradleGrails"></a>Gradle/Grails</h3><a name="GradleGrails"></a> -<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:pom:5.3.5-SNAPSHOT'</pre></div></div> +<div class="source"><pre class="prettyprint linenums">compile 'fr.ird.observe:pom:5.3.5'</pre></div></div> <div class="section"> <h3><a name="Scala_SBT"></a>Scala SBT</h3><a name="Scala_SBT"></a> -<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "pom" % "5.3.5-SNAPSHOT"</pre></div></div> +<div class="source"><pre class="prettyprint linenums">libraryDependencies += "fr.ird.observe" % "pom" % "5.3.5"</pre></div></div> <div class="section"> <h3><a name="Leiningen"></a>Leiningen</h3><a name="Leiningen"></a> -<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/pom "5.3.5-SNAPSHOT"]</pre></div></div></div> +<div class="source"><pre class="prettyprint linenums">[fr.ird.observe/pom "5.3.5"]</pre></div></div></div> </div> </div> </div> ===================================== dependency-management.html ===================================== --- a/dependency-management.html +++ b/dependency-management.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== dependency-updates-report.html ===================================== --- a/dependency-updates-report.html +++ b/dependency-updates-report.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -90,7 +90,7 @@ <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2017-02-18_and_2017-03-21"></a>Changes between 2017-02-18 and 2017-03-21</h3> -<p>Total commits: 99<br />Total number of files changed: 123</p> +<p>Total commits: 105<br />Total number of files changed: 142</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -102,8 +102,8 @@ <td>25</td></tr> <tr class="a"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>96</td> -<td>123</td></tr></table></div></div> +<td>102</td> +<td>142</td></tr></table></div></div> </div> </div> </div> ===================================== file-activity.html ===================================== --- a/file-activity.html +++ b/file-activity.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">File Activity Report</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -90,94 +90,94 @@ <h2><a name="File_Activity_Report"></a>File Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2017-02-18_and_2017-03-21"></a>Changes between 2017-02-18 and 2017-03-21</h3> -<p>Total commits: 99<br />Total number of files changed: 123</p> +<p>Total commits: 105<br />Total number of files changed: 142</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Filename</th> <th>Number of Times Changed</th></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/pom.xml"><b>pom.xml</b></a> </td> -<td>42</td></tr> +<td>46</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/pom.xml">application-swing/<b>pom.xml</b></a> </td> -<td>31</td></tr> +<td>32</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-web/pom.xml">application-web/<b>pom.xml</b></a> </td> -<td>27</td></tr> +<td>28</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-web-configuration/pom…">application-web-configuration/<b>pom.xml</b></a> </td> -<td>25</td></tr> +<td>26</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-configuration/p…">application-swing-configuration/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-decoration/pom.…">application-swing-decoration/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-validation/pom.…">application-swing-validation/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing-validators/pom.…">application-swing-validators/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/entities-migration/pom.xml">entities-migration/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/entities/pom.xml">entities/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration-rest/pom.x…">services-configuration-rest/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration-topia/pom.…">services-configuration-topia/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-configuration/pom.xml">services-configuration/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-dto/pom.xml">services-dto/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-rest/pom.xml">services-rest/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-runner/pom.xml">services-runner/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia-validation/pom.xml">services-topia-validation/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia-validators/pom.xml">services-topia-validators/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/pom.xml">services-topia/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services/pom.xml">services/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/test/pom.xml">test/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/toolbox-maven-plugin/pom.xml">toolbox-maven-plugin/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/topia-extension/pom.xml">topia-extension/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/topia-templates-extension/pom.xml">topia-templates-extension/<b>pom.xml</b></a> </td> -<td>24</td></tr> +<td>25</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/observe/pom.xml">observe/<b>pom.xml</b></a> </td> -<td>23</td></tr> +<td>24</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/.gitlab-ci.yml"><b>.gitlab-ci.yml</b></a> </td> -<td>13</td></tr> +<td>14</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/CHANGELOG.md"><b>CHANGELOG.md</b></a> </td> -<td>9</td></tr> -<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/README.md"><b>README.md</b></a> </td> +<td>12</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/CHANGELOG.md"><b>CHANGELOG.md</b></a> </td> <td>9</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/bin/stage_create.sh">bin/<b>stage_create.sh</b></a> </td> @@ -207,28 +207,34 @@ <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/bin/stage_release.sh">bin/<b>stage_release.sh</b></a> </td> <td>3</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/bin/release_create.sh">bin/<b>release_create.sh</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/site_fr.xml">src/site/<b>site_fr.xml</b></a> </td> <td>3</td></tr> <tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/bin/release_create.sh">bin/<b>release_create.sh</b></a> </td> +<td>3</td></tr> +<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/<b>ShowAboutAction.java</b></a> </td> <td>2</td></tr> -<tr class="a"> +<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/resour…">application-swing/src/main/resources/ftl/<b>initStorage_en.ftl</b></a> </td> <td>2</td></tr> -<tr class="b"> +<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/resour…">application-swing/src/main/resources/ftl/<b>initStorage_es.ftl</b></a> </td> <td>2</td></tr> -<tr class="a"> +<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/resour…">application-swing/src/main/resources/ftl/<b>initStorage_fr.ftl</b></a> </td> <td>2</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/architecture-lo…">src/site/markdown/<b>architecture-logicielle.md</b></a> </td> +<td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/site_fr.xml">src/site/<b>site_fr.xml</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/src/main/java/fr/i…">services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/<b>SectionBinder.java</b></a> </td> <td>2</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/src/main/java/fr/i…">services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/<b>SectionBinder.java</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/src/main/java/fr/i…">services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/<b>UnidirectionalReferentialSynchronizeLocalServiceTopia.java</b></a> </td> <td>2</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/src/main/java/fr/i…">services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/<b>UnidirectionalReferentialSynchronizeLocalServiceTopia.java</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/backup/<b>AtCloseApplicationLocalDatabaseBackupTask.java</b></a> </td> <td>2</td></tr> <tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/backup/<b>BackupStorage.java</b></a> </td> @@ -378,46 +384,46 @@ <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/administration-…">src/site/markdown/<b>administration-web.md.vm</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/architecture-lo…">src/site/markdown/<b>architecture-logicielle.md</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/index.md">src/site/markdown/<b>index.md</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/index.md">src/site/markdown/<b>index.md</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/install-serverP…">src/site/markdown/<b>install-serverPG.md</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/install-serverP…">src/site/markdown/<b>install-serverPG.md</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/install.md">src/site/markdown/<b>install.md</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/markdown/install.md">src/site/markdown/<b>install.md</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/j…">src/site/resources/images/logos/<b>jrst-logo.png</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/j…">src/site/resources/images/logos/<b>jrst-logo.png</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/l…">src/site/resources/images/logos/<b>logo_YouTrack.png</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/l…">src/site/resources/images/logos/<b>logo_YouTrack.png</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/r…">src/site/resources/images/logos/<b>restructuredtext-logo.png</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/r…">src/site/resources/images/logos/<b>restructuredtext-logo.png</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/site.js">src/site/resources/<b>site.js</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/site.js">src/site/resources/<b>site.js</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/administration-web.r…">src/site/rst/<b>administration-web.rst.vm</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/administration-web.r…">src/site/rst/<b>administration-web.rst.vm</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/architecture-logicie…">src/site/rst/<b>architecture-logicielle.rst</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/architecture-logicie…">src/site/rst/<b>architecture-logicielle.rst</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/index.rst">src/site/rst/<b>index.rst</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/index.rst">src/site/rst/<b>index.rst</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/install-serverPG.rst">src/site/rst/<b>install-serverPG.rst</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/install-serverPG.rst">src/site/rst/<b>install-serverPG.rst</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/install.rst">src/site/rst/<b>install.rst</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/rst/install.rst">src/site/rst/<b>install.rst</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/<b>SynchronizeUIHandler.java</b></a> </td> <td>1</td></tr> <tr class="a"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/<b>SynchronizeUIHandler.java</b></a> </td> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/.gitlab-ci.yml">src/site/resources/<b>.gitlab-ci.yml</b></a> </td> <td>1</td></tr> <tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/<b>ReferentialSynchroUIHandler.java</b></a> </td> @@ -435,6 +441,60 @@ <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/services-topia/src/main/java/fr/i…">services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/<b>BranchlineBinder.java</b></a> </td> <td>1</td></tr> <tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/archite…">src/site/resources/images/<b>architecture.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/archite…">src/site/resources/images/<b>architecture.svg</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo-sm…">src/site/resources/images/<b>logo-small.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo.png">src/site/resources/images/<b>logo.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logo_ir…">src/site/resources/images/<b>logo_ird.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/a…">src/site/resources/images/logos/<b>argouml-logo.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/j…">src/site/resources/images/logos/<b>jaxx-logo.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/l…">src/site/resources/images/logos/<b>logo_IntelliJIDEA.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/images/logos/t…">src/site/resources/images/logos/<b>topia-logo.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/architectu…">src/site/resources/img/<b>architecture.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/architectu…">src/site/resources/img/<b>architecture.svg</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/argouml-lo…">src/site/resources/img/<b>argouml-logo.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/jaxx-logo.…">src/site/resources/img/<b>jaxx-logo.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo-small…">src/site/resources/img/<b>logo-small.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo.png">src/site/resources/img/<b>logo.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo_Intel…">src/site/resources/img/<b>logo_IntelliJIDEA.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/logo_ird.p…">src/site/resources/img/<b>logo_ird.png</b></a> </td> +<td>1</td></tr> +<tr class="b"> +<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/src/site/resources/img/topia-logo…">src/site/resources/img/<b>topia-logo.png</b></a> </td> +<td>1</td></tr> +<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/test/src/main/resources/db/3.15/r…">test/src/main/resources/db/3.15/<b>referentiel.sql.gz</b></a> </td> <td>1</td></tr> <tr class="b"> @@ -450,18 +510,15 @@ <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/<b>LocalDatabaseBackupTask.java</b></a> </td> <td>1</td></tr> <tr class="b"> -<td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/backup/<b>AtCloseApplicationLocalDatabaseBackupTask.java</b></a> </td> -<td>1</td></tr> -<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/backup/<b>AutomaticLocalDatabaseBackupTask.java</b></a> </td> <td>1</td></tr> -<tr class="b"> +<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/backup/<b>LocalDatabaseBackupTaskSupport.java</b></a> </td> <td>1</td></tr> -<tr class="a"> +<tr class="b"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/<b>StorageBackupUILauncher.java</b></a> </td> <td>1</td></tr> -<tr class="b"> +<tr class="a"> <td><a class="externalLink" href="https://gitlab.com/ultreia.io/ird-observe/application-swing/src/main/java/f…">application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/<b>ConsolidateUIHandler.java</b></a> </td> <td>1</td></tr></table></div></div> </div> ===================================== index.html ===================================== --- a/index.html +++ b/index.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">ObServe</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -56,7 +56,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== install-serverPG.html ===================================== --- a/install-serverPG.html +++ b/install-serverPG.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -56,7 +56,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== install.html ===================================== --- a/install.html +++ b/install.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -56,7 +56,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== integration.html ===================================== --- a/integration.html +++ b/integration.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== issue-tracking.html ===================================== --- a/issue-tracking.html +++ b/issue-tracking.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== license.html ===================================== --- a/license.html +++ b/license.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== plugin-management.html ===================================== --- a/plugin-management.html +++ b/plugin-management.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== plugin-updates-report.html ===================================== --- a/plugin-updates-report.html +++ b/plugin-updates-report.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== plugins.html ===================================== --- a/plugins.html +++ b/plugins.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== project-info.html ===================================== --- a/project-info.html +++ b/project-info.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== project-reports.html ===================================== --- a/project-reports.html +++ b/project-reports.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== project-summary.html ===================================== --- a/project-summary.html +++ b/project-summary.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> @@ -104,7 +104,7 @@ <td>Projet ObServe</td></tr> <tr class="b"> <td>Page d'accueil</td> -<td><a class="externalLink" href="http://ultreiaio.gitlab.io/observe">http://ultreiaio.gitlab.io/observe</a></td></tr></table></div> +<td><a class="externalLink" href="https://ultreiaio.gitlab.io/ird-observe">https://ultreiaio.gitlab.io/ird-observe</a></td></tr></table></div> <div class="section"> <h3><a name="Organisation"></a>Organisation</h3><a name="Organisation"></a> <table border="0" class="table table-striped"> @@ -131,7 +131,7 @@ <td>pom</td></tr> <tr class="b"> <td>Version</td> -<td>5.3.5-SNAPSHOT</td></tr> +<td>5.3.5</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 @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== sitemap.html ===================================== --- a/sitemap.html +++ b/sitemap.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">Sitemap</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -55,7 +55,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== source-repository.html ===================================== --- a/source-repository.html +++ b/source-repository.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== team-list.html ===================================== --- a/team-list.html +++ b/team-list.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</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: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -70,7 +70,7 @@ <li><a href="project-reports.html" title="Rapports Projet"><span class="icon-chevron-right"></span>Rapports Projet</a> </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> ===================================== third-party-report.html ===================================== --- a/third-party-report.html +++ b/third-party-report.html @@ -25,10 +25,10 @@ <div id="breadcrumbs"> <ul class="breadcrumb"> - <li class=""><a href="http://ultreiaio.gitlab.io/observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> + <li class=""><a href="https://ultreiaio.gitlab.io/ird-observe/index.html" class="externalLink" title="ObServe">ObServe</a><span class="divider">»</span></li> <li class="active ">Tierces parties</li> <li id="publishDate" class="pull-right"><span class="divider">|</span> Dernière publication: 2017-03-20</li> - <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5-SNAPSHOT</li> + <li id="projectVersion" class="pull-right"><span class="divider">|</span>Version: 5.3.5</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> @@ -68,7 +68,7 @@ </li> </ul> <form id="search-form" action="https://www.google.com/search" method="get" > - <input value="ultreiaio.gitlab.io/observe" name="sitesearch" type="hidden"/> + <input value="ultreiaio.gitlab.io/ird-observe" name="sitesearch" type="hidden"/> <input class="search-query" name="q" id="query" type="text" /> </form> <script type="text/javascript">asyncJs( 'https://cse.google.com/brand?form=search-form' )</script> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ce0ac6e429adf0a315bbd6f24dd…

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/5.3.5
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT deleted branch release/5.3.5 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v5.3.5
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed new tag v5.3.5 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] Update README.md
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8b948b06 by Tony CHEMIT at 2017-03-20T09:03:16+00:00 Update README.md - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,17 +1,18 @@ # ObServe [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… -![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop/build.svg) +![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop/build.svg) +[![The GNU General Public License, Version 3.0](https://img.shields.io/badge/license-GPL3-blue.svg)](http://www.gnu.or… # Resources -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG… -* [Documentation](http://observe.ultreia.io) +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.… +* [Documentation](http://ultreiaio.gitlab.io/ird-observe) # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.5) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-1) # Community @@ -19,3 +20,14 @@ * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-de…) * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/observe-…) * [Contact](mailto:dev@tchemit.fr) + +# Release + +``` +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash +``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8b948b06956ad1d68e65de589ed…

1 0

[Git][ultreiaio/ird-observe][release/5.3.5] [jgitflow-maven-plugin]updating poms for branch'release/5.3.5' with non-snapshot versions
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch release/5.3.5 at ultreiaio / ird-observe Commits: 287cbbf6 by Tony CHEMIT at 2017-03-20T09:55:44+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.5' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.5</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/287cbbf6b360dd8ea24c8317d47…

1 0

[Git][ultreiaio/ird-observe][master-5.x] 12 commits: [jgitflow-maven-plugin]updating poms for 5.3.5-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch master-5.x at ultreiaio / ird-observe Commits: 29db823d by Tony CHEMIT at 2017-03-15T14:05:18+01:00 [jgitflow-maven-plugin]updating poms for 5.3.5-SNAPSHOT development - - - - - 0a7dd011 by Tony CHEMIT at 2017-03-15T14:11:28+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 00fb7385 by Tony CHEMIT at 2017-03-15T14:11:28+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 53ab9cd1 by Tony CHEMIT at 2017-03-15T14:11:29+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 1dd2dde0 by Tony CHEMIT at 2017-03-20T08:21:23+01:00 update pom to 7 - - - - - c4cd6750 by Tony CHEMIT at 2017-03-20T09:24:37+01:00 review site (deploy it now under gitlab.io) - - - - - 87804f3e by Tony CHEMIT at 2017-03-20T09:30:54+01:00 continue site review - - - - - 88ed9fae by Tony CHEMIT at 2017-03-20T09:42:27+01:00 continue site review - - - - - 44a7ffb1 by Tony CHEMIT at 2017-03-20T09:43:06+01:00 update link - - - - - 2670b655 by Tony CHEMIT at 2017-03-20T09:53:46+01:00 Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 287cbbf6 by Tony CHEMIT at 2017-03-20T09:55:44+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.5' with non-snapshot versions - - - - - af2cdd75 by Tony CHEMIT at 2017-03-20T10:02:43+01:00 [jgitflow-maven-plugin]merging 'release/5.3.5' into 'master-5.x' - - - - - 30 changed files: - .gitlab-ci.yml - README.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - src/site/markdown/architecture-logicielle.md - + src/site/resources/.gitlab-ci.yml - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/01d5eec43dbcb2641af7a7bc31…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/5.3.5' with non-snapshot versions
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 287cbbf6 by Tony CHEMIT at 2017-03-20T09:55:44+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.5' with non-snapshot versions - - - - - af2cdd75 by Tony CHEMIT at 2017-03-20T10:02:43+01:00 [jgitflow-maven-plugin]merging 'release/5.3.5' into 'master-5.x' - - - - - 92250da3 by Tony CHEMIT at 2017-03-20T10:02:46+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 45e6d141 by Tony CHEMIT at 2017-03-20T10:02:47+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 387b6428 by Tony CHEMIT at 2017-03-20T10:02:48+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/379708f65bf2072d1683665bc9…

1 0

[Git][ultreiaio/ird-observe][develop] Update .gitlab-ci.yml
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f8460ca9 by Tony CHEMIT at 2017-03-20T08:59:51+00:00 Update .gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,8 +21,10 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone tags: @@ -34,8 +36,10 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" .env_test: &env_test environment: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/f8460ca93d2e6a419427e6fd9e3…

1 0

[Git][ultreiaio/ird-observe][develop] Update .gitlab-ci.yml
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 50d10cea by Tony CHEMIT at 2017-03-20T08:57:40+00:00 Update .gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,8 +51,7 @@ stages: .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn clean verify site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test @@ -86,11 +85,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-chang… | sed 's/$1/frirdobserve/' | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -146,13 +145,13 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/50d10cea3483a4e14f62cf7cb33…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] [jgitflow-maven-plugin]updating poms for 5.3.6-SNAPSHOT development
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 379708f6 by Tony CHEMIT at 2017-03-20T09:55:06+01:00 [jgitflow-maven-plugin]updating poms for 5.3.6-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.5-SNAPSHOT</version> + <version>5.3.6-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/379708f65bf2072d1683665bc9e…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/5.3.5
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed new branch release/5.3.5 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop-5.x] Message d'erreur à chaque fermeture de l'application (See #747)
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 2670b655 by Tony CHEMIT at 2017-03-20T09:53:46+01:00 Message d'erreur à chaque fermeture de l'application (See #747) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/backup/AtCloseApplicationLocalDatabaseBackupTask.java @@ -51,24 +51,22 @@ public class AtCloseApplicationLocalDatabaseBackupTask extends LocalDatabaseBack return; } - boolean mustClose = false; ObserveSwingDataSource mainDataSource = applicationContext.getDataSourcesManager().getMainDataSource(); - if (mainDataSource == null || !mainDataSource.isLocal()) { - - mainDataSource = applicationContext.getDataSourcesManager().newLocalDatasource(applicationContext.getConfig()); - mustClose = true; + if (mainDataSource == null) { + if (log.isInfoEnabled()) { + log.info("Skip, no database open."); + } + return; } - - try { - File file = doBackup(applicationContext, mainDataSource); - applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); - } finally { - - if (mustClose) { - mainDataSource.close(); + if (!mainDataSource.isLocal()) { + if (log.isInfoEnabled()) { + log.info("Skip, open database is not local."); } + return; } + File file = doBackup(applicationContext, mainDataSource); + applicationContext.getBackupsManager().addAutomaticBackup(file.toPath()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2670b655fde8345af25727cc6b0…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] update link
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 44a7ffb1 by Tony CHEMIT at 2017-03-20T09:43:06+01:00 update link - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ # Demo * [Demo (latest)](https://demo.ultreia.io/observe-latest) -* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.2) +* [Demo (5.x)](https://demo.ultreia.io/observe-5.3.5) * [Demo (6.x)](https://demo.ultreia.io/observe-6.0-RC-3) # Community View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/44a7ffb1f22a5ee048041f07320…

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: continue site review
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 87804f3e by Tony CHEMIT at 2017-03-20T09:30:54+01:00 continue site review - - - - - 88ed9fae by Tony CHEMIT at 2017-03-20T09:42:27+01:00 continue site review - - - - - 3 changed files: - README.md - pom.xml - + src/site/resources/.gitlab-ci.yml Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ # Resources * [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop-5.x/CHANGE… -* [Documentation](http://ultreiaio.gitlab.io/observe) +* [Documentation](http://ultreiaio.gitlab.io/ird-observe) # Demo ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://ultreiaio.gitlab.io/observe</url> + <url>https://ultreiaio.gitlab.io/ird-observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -154,6 +154,13 @@ <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> + <distributionManagement> + <site> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> + </site> + + </distributionManagement> <properties> <organizationId>ultreiaio</organizationId> ===================================== src/site/resources/.gitlab-ci.yml ===================================== --- /dev/null +++ b/src/site/resources/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c4cd675030f082a1c86b3ab00c…

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 71ba2d5b by Tony CHEMIT at 2017-03-20T09:36:33+01:00 Site checkin for project ObServe - - - - - 12 changed files: - − .gitignore - + administration-web.html - + architecture-logicielle.html - + changelog.html - + changes-report.html - + config-report.html - + css/apache-maven-fluido-1.6.min.css - + css/print.css - + css/site.css - + dependency-convergence.html - + dependency-info.html - + dependency-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/71ba2d5b6b0cc6e10f49f471cdd…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch pages
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed new branch pages at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop-5.x] 2 commits: update pom to 7
by Tony CHEMIT March 20, 2017

March 20, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreiaio / ird-observe Commits: 1dd2dde0 by Tony CHEMIT at 2017-03-20T08:21:23+01:00 update pom to 7 - - - - - c4cd6750 by Tony CHEMIT at 2017-03-20T09:24:37+01:00 review site (deploy it now under gitlab.io) - - - - - 14 changed files: - .gitlab-ci.yml - README.md - pom.xml - src/site/markdown/architecture-logicielle.md - src/site/resources/images/architecture.png → src/site/resources/img/architecture.png - src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png - src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png - src/site/resources/images/logo.png → src/site/resources/img/logo.png - src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - src/site/site_fr.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -51,8 +51,8 @@ stages: .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn verify site site:stage -DperformRelease + - mvn scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,12 +1,12 @@ # ObServe [![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.observe/observe.svg)]… -![Build Status](https://gitlab.com/ultreia.io/ird-observe/badges/develop-5.x/build.… +![Build Status](https://gitlab.com/ultreiaio/ird-observe/badges/develop-5.x/build.s… # Resources -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-observe/blob/develop-5.x/CHANG… -* [Documentation](http://observe.ultreia.io) +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-observe/blob/develop-5.x/CHANGE… +* [Documentation](http://ultreiaio.gitlab.io/observe) # Demo ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>4</version> + <version>9</version> </parent> <groupId>fr.ird.observe</groupId> @@ -37,7 +37,7 @@ <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.ultreia.io</url> + <url>http://ultreiaio.gitlab.io/observe</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -154,20 +154,28 @@ <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> - <distributionManagement> - <site> - <id>doc.ultreia.io</id> - </site> - </distributionManagement> - <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-observe</projectId> +  + <devMode>true</devMode> + +  + <observe.model.version>5.0</observe.model.version> + +  + <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> + <buildDate>${maven.build.timestamp}</buildDate> + + <mavenVersion>3.3.9</mavenVersion> + <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> + <licensePluginVersion>1.9</licensePluginVersion> + <jaxxVersion>2.42</jaxxVersion> <nuitonI18nVersion>3.6.3</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> @@ -181,14 +189,9 @@ <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <webmotionVersion>2.5.1</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> - <licensePluginVersion>1.9</licensePluginVersion> - - <mavenVersion>3.3.9</mavenVersion> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -207,7 +210,6 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix>  <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> @@ -215,38 +217,12 @@ <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> - <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> - <buildDate>${maven.build.timestamp}</buildDate> - <devMode>true</devMode> - -  - <observe.model.version>5.0</observe.model.version> - +  <jgitflow.developBranchName>develop-5.x</jgitflow.developBranchName> <jgitflow.masterBranchName>master-5.x</jgitflow.masterBranchName> </properties> - <repositories> - <repository> - <id>before-central</id> - <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>before-central</id> - <url>https://nexus.nuiton.org/nexus/content/repositories/central-releases</url> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> <dependencyManagement> <dependencies> @@ -792,7 +768,6 @@ <pluginManagement> <plugins> -  <plugin> <artifactId>maven-site-plugin</artifactId> <dependencies> @@ -815,6 +790,24 @@ </plugin> <plugin> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.reporting.outputDirectory}</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.codehaus.gmavenplus</groupId> <artifactId>gmavenplus-plugin</artifactId> <dependencies> @@ -871,7 +864,7 @@ <releaseArtifact> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <name>Application</name> + <name>Client</name> <type>zip</type> </releaseArtifact> <releaseArtifact> @@ -886,14 +879,6 @@ </plugins> </pluginManagement> - <extensions> -  - <extension> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh-external</artifactId> - <version>1.0</version> - </extension> - </extensions> </build> <reporting> @@ -947,6 +932,7 @@ <plugin> <artifactId>maven-project-info-reports-plugin</artifactId> <version>${projectInfoReportsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -971,29 +957,40 @@ <plugin> <artifactId>maven-changes-plugin</artifactId> <version>${changesPluginVersion}</version> + <inherited>false</inherited> <configuration> <issueLinkTemplatePerSystem> - <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + <gitlab>https://gitlab.com/${organizationId}/${projectId}/issues/%ISSUE%</gitlab> </issueLinkTemplatePerSystem> <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> </configuration> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> </plugin> <plugin> <artifactId>maven-changelog-plugin</artifactId> <version>${changelogPluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> <version>${licensePluginVersion}</version> + <inherited>false</inherited> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> + <inherited>false</inherited> <reportSets> <reportSet> <reports> @@ -1053,20 +1050,6 @@ </executions> </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> - </plugins> </build> ===================================== src/site/markdown/architecture-logicielle.md ===================================== --- a/src/site/markdown/architecture-logicielle.md +++ b/src/site/markdown/architecture-logicielle.md @@ -15,9 +15,7 @@ Il est basé sur une architecture n-tiers en couches, à savoir : - une couche de Services - une couche de Persistance -.. image:: images/architecture.png - :scale: 50 - :align: center +[Architecture](!./img/architecture.png) # La couche de Présentation ===================================== src/site/resources/images/architecture.png → src/site/resources/img/architecture.png ===================================== Binary files a/src/site/resources/images/architecture.png and b/src/site/resources/img/architecture.png differ ===================================== src/site/resources/images/architecture.svg → src/site/resources/img/architecture.svg ===================================== --- a/src/site/resources/images/architecture.svg +++ b/src/site/resources/img/architecture.svg ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/jaxx-logo.png → src/site/resources/img/jaxx-logo.png ===================================== Binary files a/src/site/resources/images/logos/jaxx-logo.png and b/src/site/resources/img/jaxx-logo.png differ ===================================== src/site/resources/images/logo-small.png → src/site/resources/img/logo-small.png ===================================== Binary files a/src/site/resources/images/logo-small.png and b/src/site/resources/img/logo-small.png differ ===================================== src/site/resources/images/logo.png → src/site/resources/img/logo.png ===================================== Binary files a/src/site/resources/images/logo.png and b/src/site/resources/img/logo.png differ ===================================== src/site/resources/images/logos/logo_IntelliJIDEA.png → src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files a/src/site/resources/images/logos/logo_IntelliJIDEA.png and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -22,14 +22,14 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.6</version> </skin> <custom> @@ -48,38 +48,26 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logo-small.png</src> + <src>./img/logo-small.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - - <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/jaxx-logo.png"/> - <logo href="http://topia.nuiton.org" name="ToPIA" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> - <logo href="https://www.jetbrains.com/idea" name="IntelliJ" width="120" - img="${project.url}/${siteDeployClassifier}/images/logos/logo_IntelliJIDEA.png"/> - + <logo href="http://jaxx.nuiton.org" name="JAXX" width="120" img="./img/jaxx-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" width="120" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" width="120" img="./img/argouml-logo.png"/> + <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" src="site.js"> </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> - <links> - <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> + <item name="GitLab" href="https://gitlab.com/ultreiaio/ird-observe"/> <item name="Ultreia.io" href="http://ultreia.io"/> </links> <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -87,8 +75,7 @@ <item name="Installation" href="install.html"/> <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> - <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/observe/blob/e7881100e542f7fa62209d49edf84501…"/> + <item name="Historique des versions" href="https://gitlab.com/ultreiaio/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -101,14 +88,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='md' - scmwebeditor_skipFiles=',config-report,' - scmwebeditor_vmFiles=",index,"/> - </footer> - </body> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/53ab9cd143cf817335468f724a…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: ca63154c by Tony CHEMIT at 2017-03-15T15:14:33+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ **Closed at *In progress*.** ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/ca63154c93efd1e4e134d7bd90…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreia.io / ird-observe Commits: 4362e374 by Tony CHEMIT at 2017-03-15T15:07:46+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/4362e3749f0e4b87f6db1bb8a7…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v6.0-RC-1
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed new tag v6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master] 13 commits: [jgitflow-maven-plugin]Updating develop poms back to pre merge state
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: ebf49628 by Tony CHEMIT at 2017-03-11T12:56:06+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9eb36475 by Tony CHEMIT at 2017-03-11T12:59:33+01:00 Update changelog for staging version 6.0-RC-1 - - - - - 2f75e9a1 by Tony CHEMIT at 2017-03-11T13:02:24+01:00 update changelog - - - - - 06ff52a8 by Tony CHEMIT at 2017-03-12T12:08:23+01:00 update changelog - - - - - 3d110ad4 by Tony CHEMIT at 2017-03-12T13:17:44+01:00 remove release scripts, use pom ones - - - - - bfdcbff8 by Tony CHEMIT at 2017-03-12T13:48:49+01:00 use pom 5 - - - - - 82f0c7f5 by Tony CHEMIT at 2017-03-15T14:28:40+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 742331a6 by Tony CHEMIT at 2017-03-15T14:35:26+01:00 fix changelog - - - - - 8445cb2e by Tony CHEMIT at 2017-03-15T15:01:46+01:00 report from version 5.x (See #745 and #742) - - - - - fb325b37 by Tony CHEMIT at 2017-03-15T15:05:26+01:00 update changelog before release - - - - - db5e4a1d by Tony CHEMIT at 2017-03-15T15:06:19+01:00 prepare release 6.0-RC-1 - - - - - 4362e374 by Tony CHEMIT at 2017-03-15T15:07:46+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 4a108146 by Tony CHEMIT at 2017-03-15T15:13:40+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 24 changed files: - .gitlab-ci.yml - CHANGELOG.md - − bin/stage_create.sh - − bin/stage_drop.sh - − bin/stage_release.sh - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - . bin/create_stage.sh + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-chang… | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -142,7 +146,13 @@ release: <<: *staging when: manual script: - - . bin/stage_release.sh + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + +drop: + <<: *staging + when: manual + script: + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== bin/stage_create.sh deleted ===================================== --- a/bin/stage_create.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -PROJECT=ird-observe -MASTER=master -DEVELOP=develop -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "version to release: $VERSION" -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -git checkout -B ${MASTER} -git checkout -B ${DEVELOP} - -echo "Start release: $VERSION ($LOG_DIR/release-start.log)" -mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" -mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') - -echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi - -echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" -rm -rf target/gitlab_cache - -mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi - -git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== bin/stage_drop.sh deleted ===================================== --- a/bin/stage_drop.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -PROJECT=ird-observe -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) - -echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" -mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log ===================================== bin/stage_release.sh deleted ===================================== --- a/bin/stage_release.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -PROJECT=ird-observe -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -echo "Get staging id..." -STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) - -echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java @@ -69,7 +69,6 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM addScript("07", "drop_not_null_constraint_gearUseFeatures", queries); addScript("08", "drop_not_null_constraint_hauling_identifier", queries); - addScript("09", "add_non_target_length_sex_fk", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { @@ -86,7 +85,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); if (!collect.contains("fk_nontargetlength_sex")) { - addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } } @@ -106,7 +105,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); if (!collect.contains("fk_nontargetlength_sex")) { - addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -98,6 +98,11 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat super(callBack, PGDataSourceMigration.TYPE); } + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + addScript("02", "add-foreign-key-indexes", queries); + } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -71,10 +71,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse addMissingForeignKeys(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/6983 - addScript("02", "update-senne-gear-usedInTrip", queries); + addScript("01", "update-senne-gear-usedInTrip", queries); // See https://forge.codelutin.com/issues/6991 - addScript("03", "rename-unknown-longliner", queries); + addScript("02", "rename-unknown-longliner", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>4</version> + <version>5</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/76b52572c97d33a6e0c2f254e…

1 0

[Git][ultreia.io/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 4362e374 by Tony CHEMIT at 2017-03-15T15:07:46+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 4a108146 by Tony CHEMIT at 2017-03-15T15:13:40+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - cd0ad7a7 by Tony CHEMIT at 2017-03-15T15:13:43+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 0349bd86 by Tony CHEMIT at 2017-03-15T15:13:44+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 618eb890 by Tony CHEMIT at 2017-03-15T15:13:45+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/9f47ba9343a1fcb3548f55052…

1 0

[Git][ultreia.io/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 9f47ba93 by Tony CHEMIT at 2017-03-15T15:07:30+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/9f47ba9343a1fcb3548f550523…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/6.0-RC-1
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed new branch release/6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] 2 commits: update changelog before release
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: fb325b37 by Tony CHEMIT at 2017-03-15T15:05:26+01:00 update changelog before release - - - - - db5e4a1d by Tony CHEMIT at 2017-03-15T15:06:19+01:00 prepare release 6.0-RC-1 - - - - - 26 changed files: - CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ **Closed at *In progress*.** ### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-1-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/8445cb2e29c682336b3d91c46…

1 0

[Git][ultreia.io/ird-observe] Deleted tag v6.0-RC-1
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT deleted tag v6.0-RC-1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] report from version 5.x (See #745 and #742)
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 8445cb2e by Tony CHEMIT at 2017-03-15T15:01:46+01:00 report from version 5.x (See #745 and #742) - - - - - 18 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql - persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java @@ -69,7 +69,6 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM addScript("07", "drop_not_null_constraint_gearUseFeatures", queries); addScript("08", "drop_not_null_constraint_hauling_identifier", queries); - addScript("09", "add_non_target_length_sex_fk", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { @@ -86,7 +85,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); if (!collect.contains("fk_nontargetlength_sex")) { - addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } } @@ -106,7 +105,7 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); if (!collect.contains("fk_nontargetlength_sex")) { - addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -98,6 +98,11 @@ public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrat super(callBack, PGDataSourceMigration.TYPE); } + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + addScript("02", "add-foreign-key-indexes", queries); + } } } ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -71,10 +71,10 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse addMissingForeignKeys(topiaSqlSupport, queries); // See https://forge.codelutin.com/issues/6983 - addScript("02", "update-senne-gear-usedInTrip", queries); + addScript("01", "update-senne-gear-usedInTrip", queries); // See https://forge.codelutin.com/issues/6991 - addScript("03", "rename-unknown-longliner", queries); + addScript("02", "rename-unknown-longliner", queries); } ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC2/V4_0_RC2_02_add-foreign-key-indexes-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_01_update-senne-gear-usedInTrip-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC3/V4_0_RC3_02_rename-unknown-longliner-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC4/V4_0_RC4_01_add-gear-data-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC6/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== --- a/persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql +++ b/persistence/src/main/resources/db/migration/old/4.0-RC7/V4_0_RC7_02_rename-unknown-longliner-PG.sql View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/8445cb2e29c682336b3d91c465…

1 0

[Git][ultreia.io/ird-observe][develop] fix changelog
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 742331a6 by Tony CHEMIT at 2017-03-15T14:35:26+01:00 fix changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ **Closed at *In progress*.** +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/742331a689798c0f889073f11a…

1 0

[Git][ultreia.io/ird-observe][develop] Update changelog after stage of milestone 6.0-RC-1
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 82f0c7f5 by Tony CHEMIT at 2017-03-15T14:28:40+01:00 Update changelog after stage of milestone 6.0-RC-1 - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,12 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-12 12:06. + * Last generated at 2017-03-15 14:28. ## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) **Closed at *In progress*.** -### Download -* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) -* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) ### Issues * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -57,6 +54,17 @@ * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Tâche 652]](https://gitlab.com/ultreia.io/ird-observe/issues/652) **Corriger le référentiel Espèce** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) +## Version [5.3.4](https://gitlab.com/ultreia.io/ird-observe/milestones/88) + +**Closed at 2017-03-15.** + +### Download +* [Application (observe-5.3.4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) +* [Serveur (observe-5.3.4.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe/5.…) + +### Issues + * [[Anomalie 745]](https://gitlab.com/ultreia.io/ird-observe/issues/745) **La migration de base centrale depuis v3 ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + ## Version [5.3.3](https://gitlab.com/ultreia.io/ird-observe/milestones/86) **Closed at 2017-03-10.** View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/82f0c7f59ea6f8503e6e5a7b1f…

1 0

[Git][ultreia.io/ird-observe] Deleted branch release/5.3.4
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT deleted branch release/5.3.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.5.1
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed new tag v3.5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][release/5.3.4] [jgitflow-maven-plugin]updating poms for branch'release/5.3.4' with non-snapshot versions
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch release/5.3.4 at ultreia.io / ird-observe Commits: 5e3e005d by Tony CHEMIT at 2017-03-15T14:05:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.4' with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.4</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/5e3e005da7d876156ebe1f42b4…

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.3.4
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed new tag v5.3.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][master-5.x] 11 commits: [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch master-5.x at ultreia.io / ird-observe Commits: 7a3b962f by Tony CHEMIT at 2017-03-10T16:47:18+01:00 [jgitflow-maven-plugin]updating poms for 5.3.4-SNAPSHOT development - - - - - 130e5b95 by Tony CHEMIT at 2017-03-10T16:55:05+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - e2471f05 by Tony CHEMIT at 2017-03-10T16:55:06+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - ef647c78 by Tony CHEMIT at 2017-03-10T16:55:07+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 24ed6789 by Tony CHEMIT at 2017-03-11T10:24:15+01:00 fix release script - - - - - 0249db84 by Tony CHEMIT at 2017-03-15T13:54:17+01:00 rename migration scripts to fit the version pattern (See #745) - - - - - c65a057c by Tony CHEMIT at 2017-03-15T13:54:54+01:00 add old databases, could be usefull for old migrations (See #745) - - - - - 821edfea by Tony CHEMIT at 2017-03-15T12:56:24+00:00 Merge branch 'feature/745' into 'develop-5.x' Fix #745 See merge request !1 - - - - - 2c015073 by Tony CHEMIT at 2017-03-15T14:04:57+01:00 update gitlab plugin version - - - - - 5e3e005d by Tony CHEMIT at 2017-03-15T14:05:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.4' with non-snapshot versions - - - - - 01d5eec4 by Tony CHEMIT at 2017-03-15T14:11:24+01:00 [jgitflow-maven-plugin]merging 'release/5.3.4' into 'master-5.x' - - - - - 30 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/release_create.sh - entities-migration/pom.xml - entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-PG.sql - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/1ab6d696a59e21d3528eb54a8…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/5.3.4' with non-snapshot versions
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 5e3e005d by Tony CHEMIT at 2017-03-15T14:05:36+01:00 [jgitflow-maven-plugin]updating poms for branch'release/5.3.4' with non-snapshot versions - - - - - 01d5eec4 by Tony CHEMIT at 2017-03-15T14:11:24+01:00 [jgitflow-maven-plugin]merging 'release/5.3.4' into 'master-5.x' - - - - - 0a7dd011 by Tony CHEMIT at 2017-03-15T14:11:28+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 00fb7385 by Tony CHEMIT at 2017-03-15T14:11:28+01:00 [jgitflow-maven-plugin]merging 'master-5.x' into 'develop-5.x' - - - - - 53ab9cd1 by Tony CHEMIT at 2017-03-15T14:11:29+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/29db823d143d5fa2944aaa283…

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 2 commits: update gitlab plugin version
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 2c015073 by Tony CHEMIT at 2017-03-15T14:04:57+01:00 update gitlab plugin version - - - - - 29db823d by Tony CHEMIT at 2017-03-15T14:05:18+01:00 [jgitflow-maven-plugin]updating poms for 5.3.5-SNAPSHOT development - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - entities-migration/pom.xml - entities/pom.xml - observe/pom.xml - pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-dto/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia-validation/pom.xml - services-topia-validators/pom.xml - services-topia/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== entities-migration/pom.xml ===================================== --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> ===================================== entities/pom.xml ===================================== --- a/entities/pom.xml +++ b/entities/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> @@ -165,6 +165,7 @@ <organizationId>ultreia.io</organizationId> <projectId>ird-observe</projectId> + <gitlabPluginVersion>1.0.7</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>2.42</jaxxVersion> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-dto/pom.xml ===================================== --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia-validation/pom.xml ===================================== --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> ===================================== services-topia-validators/pom.xml ===================================== --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>5.3.4-SNAPSHOT</version> + <version>5.3.5-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/821edfea1699a75842b943c1e…

1 0

[Git][ultreia.io/ird-observe] Pushed new branch release/5.3.4
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed new branch release/5.3.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop-5.x] 3 commits: rename migration scripts to fit the version pattern (See #745)
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed to branch develop-5.x at ultreia.io / ird-observe Commits: 0249db84 by Tony CHEMIT at 2017-03-15T13:54:17+01:00 rename migration scripts to fit the version pattern (See #745) - - - - - c65a057c by Tony CHEMIT at 2017-03-15T13:54:54+01:00 add old databases, could be usefull for old migrations (See #745) - - - - - 821edfea by Tony CHEMIT at 2017-03-15T12:56:24+00:00 Merge branch 'feature/745' into 'develop-5.x' Fix #745 See merge request !1 - - - - - 17 changed files: - entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-H2.sql - entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-PG.sql - + test/src/main/resources/db/3.15/referentiel.sql.gz - + test/src/main/resources/db/3.16/referentiel.sql.gz Changes: ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC2_01_add-foreign-key-indexes-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC2_01_clean-program-gear-type-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_02_update-senne-gear-usedInTrip-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC3_03_rename-unknown-longliner-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC4_01_add-gear-data-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC6_01_fix-gearUseFeatures-topiaIds-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC7_01_update-senne-gear-usedInTrip-PG.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-H2.sql ===================================== entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql → entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== --- a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql +++ b/entities-migration/src/main/resources/db/migration/V4_0_RC7_02_rename-unknown-longliner-PG.sql ===================================== test/src/main/resources/db/3.15/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/3.15/referentiel.sql.gz differ ===================================== test/src/main/resources/db/3.16/referentiel.sql.gz ===================================== Binary files /dev/null and b/test/src/main/resources/db/3.16/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/24ed67892bb7da0a0c4c44c37…

1 0

[Git][ultreia.io/ird-observe] Deleted branch feature/745
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT deleted branch feature/745 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new branch feature/745
by Tony CHEMIT March 15, 2017

March 15, 2017

Tony CHEMIT pushed new branch feature/745 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe][develop] use pom 5
by Tony CHEMIT March 12, 2017

March 12, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: bfdcbff8 by Tony CHEMIT at 2017-03-12T13:48:49+01:00 use pom 5 - - - - - 2 changed files: - .gitlab-ci.yml - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,11 +86,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/close-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/create-stage.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/update-staging-chan… | sed 's/$1/frirdobserve/' | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/create-milestone.sh | bash - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/update-staging-chang… | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -146,13 +146,13 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>4</version> + <version>5</version> </parent> <groupId>fr.ird.observe</groupId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/bfdcbff81c74431b6a7fca0dc2…

1 0

[Git][ultreia.io/ird-observe][develop] remove release scripts, use pom ones
by Tony CHEMIT March 12, 2017

March 12, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 3d110ad4 by Tony CHEMIT at 2017-03-12T13:17:44+01:00 remove release scripts, use pom ones - - - - - 4 changed files: - .gitlab-ci.yml - − bin/stage_create.sh - − bin/stage_drop.sh - − bin/stage_release.sh Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,7 +86,11 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - . bin/create_stage.sh + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/update-staging-chan… | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -142,7 +146,13 @@ release: <<: *staging when: manual script: - - . bin/stage_release.sh + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + +drop: + <<: *staging + when: manual + script: + - wget -O - https://gitlab.com/maven.ultreia.io/pom/raw/develop/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash production: stage: Production ===================================== bin/stage_create.sh deleted ===================================== --- a/bin/stage_create.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env bash - -PROJECT=ird-observe -MASTER=master -DEVELOP=develop -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "version to release: $VERSION" -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -git checkout -B ${MASTER} -git checkout -B ${DEVELOP} - -echo "Start release: $VERSION ($LOG_DIR/release-start.log)" -mvn jgitflow:release-start -B -Prelease-profile --log-file ${LOG_DIR}/release-start.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Finish release: $VERSION ($LOG_DIR/release-finish.log)" -mvn jgitflow:release-finish -Prelease-profile --log-file ${LOG_DIR}/release-finish.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | grep OPEN | cut -d' ' -f2 | awk '/./{line=$0} END{print line}') - -echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi - -echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" -rm -rf target/gitlab_cache - -mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi - -git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== bin/stage_drop.sh deleted ===================================== --- a/bin/stage_drop.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -PROJECT=ird-observe -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) - -echo "Stage drop: $STAGE_ID ($LOG_DIR/stage-drop.log)" -mvn -N nexus-staging:drop -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-drop.log ===================================== bin/stage_release.sh deleted ===================================== --- a/bin/stage_release.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env sh - -PROJECT=ird-observe -STAGE=frirdobserve - -VERSION=$(grep -e "-SNAPSHOT" pom.xml | cut -d'>' -f2 | cut -d'<' -f1) -VERSION=${VERSION/-SNAPSHOT/} -LOG_DIR=/tmp/${PROJECT}-${VERSION} -echo "log dir: $LOG_DIR" -rm -rf ${LOG_DIR} -mkdir -p ${LOG_DIR} - -echo "Get staging id..." -STAGE_ID=$(mvn -N nexus-staging:rc-list | grep ${STAGE} | grep CLOSED | cut -d' ' -f2) - -echo "Stage release: $STAGE_ID ($LOG_DIR/stage-release.log)" -mvn -N nexus-staging:release -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/stage-release.log View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/3d110ad4b08fcdbe6e2bfd9ff0…

1 0

[Git][ultreia.io/ird-observe][master] Deleted 4 commits: [jgitflow-maven-plugin]Updating develop poms back to pre merge state
by Tony CHEMIT March 12, 2017

March 12, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe WARNING: The push did not contain any new commits, but force pushed to delete the commits and changes below. Deleted commits: ebf49628 by Tony CHEMIT at 2017-03-11T12:56:06+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9eb36475 by Tony CHEMIT at 2017-03-11T12:59:33+01:00 Update changelog for staging version 6.0-RC-1 - - - - - 2f75e9a1 by Tony CHEMIT at 2017-03-11T13:02:24+01:00 update changelog - - - - - 06ff52a8 by Tony CHEMIT at 2017-03-12T12:08:23+01:00 update changelog - - - - - 26 changed files: - CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/76b52572c97d33a6e0c2f254e…

1 0

[Git][ultreia.io/ird-observe][master] 7 commits: [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development
by Tony CHEMIT March 12, 2017

March 12, 2017

Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: 5c4ba81e by Tony CHEMIT at 2017-03-11T12:49:31+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - f0350492 by Tony CHEMIT at 2017-03-11T12:56:05+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 76b52572 by Tony CHEMIT at 2017-03-11T12:56:05+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - ebf49628 by Tony CHEMIT at 2017-03-11T12:56:06+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 9eb36475 by Tony CHEMIT at 2017-03-11T12:59:33+01:00 Update changelog for staging version 6.0-RC-1 - - - - - 2f75e9a1 by Tony CHEMIT at 2017-03-11T13:02:24+01:00 update changelog - - - - - 06ff52a8 by Tony CHEMIT at 2017-03-12T12:08:23+01:00 update changelog - - - - - 26 changed files: - CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1</version> + <version>6.0-RC-2-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/365fe5e3013c3eeddce4c5be5…

1 0

[Git][ultreia.io/ird-observe][develop] update changelog
by Tony CHEMIT March 12, 2017

March 12, 2017

Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 06ff52a8 by Tony CHEMIT at 2017-03-12T12:08:23+01:00 update changelog - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/06ff52a8d312292b68ee7bf036…

1 0

[Git][ultreia.io/ird-observe] Deleted tag v3.5.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag v3.5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag v3.5.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag v3.5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag vird-5.3.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag vird-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.3.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag vird-5.3.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag vird-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag ird-observe-5.3.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag ird-observe-5.3.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.3.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.3.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.3.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.3.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.3
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.3
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.2.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.2.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.2.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.2.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.1.4
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.1.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.1.4
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.1.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.1.3
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.1.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.1.3
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.1.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.1.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.1.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.1.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.1.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.1.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.1.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.1.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.1.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.0.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.0.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.0.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.0.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.0.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.0.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.0.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.0.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v5.0
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v5.0 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-5.0
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-5.0 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.6
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.6 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.6
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.6 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.5
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.5 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.5
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.5 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.4
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.4
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.4 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.3
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.3
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.3 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.1.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.1.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.1.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.1.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v4.0
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v4.0 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-4.0
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-4.0 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.9
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.9 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.9
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.9 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.15
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.15 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.8
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.8 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.7.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.7.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.8
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.8 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.7.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.7.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.7
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.7 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.7
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.7 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.6
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.6 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.6
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.6 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.5.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.12
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.12 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.1.2
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.1.2 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.5.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.5.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.5
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.5 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.5
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.5 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.15.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.15.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Pushed new tag v3.15.1
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT pushed new tag v3.15.1 at ultreia.io / ird-observe

1 0

[Git][ultreia.io/ird-observe] Deleted tag observe-3.15
by Tony CHEMIT March 11, 2017

March 11, 2017

Tony CHEMIT deleted tag observe-3.15 at ultreia.io / ird-observe

1 0