[Git][ultreiaio/ird-observe][master-7.x] 12 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-19-SNAPSHOT development[skip ci]

16 Sep 2018


      Tony CHEMIT pushed to branch master-7.x at ultreiaio / ird-observe


Commits:
db1b8e89 by Tony CHEMIT at 2018-09-12T15:57:18Z
[jgitflow-maven-plugin]updating poms for 7.0-RC-19-SNAPSHOT development[skip ci]
- - - - -
90a42d1e by Tony CHEMIT at 2018-09-12T16:05:38Z
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
- - - - -
d483d020 by Tony CHEMIT at 2018-09-12T16:05:38Z
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
- - - - -
ae47ea00 by Tony CHEMIT at 2018-09-12T16:05:39Z
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
- - - - -
21029817 by Tony CHEMIT at 2018-09-12T20:59:13Z
use last pom

- - - - -
80b457bd by Tony CHEMIT at 2018-09-16T14:24:43Z
[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés - Closes #1038

- - - - -
cb74f6ad by Tony CHEMIT at 2018-09-16T14:32:14Z
Remove very bad files...

- - - - -
f46a0c7e by Tony CHEMIT at 2018-09-16T14:32:30Z
Improve log levels (to see migration progress)

- - - - -
aa485583 by Tony CHEMIT at 2018-09-16T14:38:18Z
reset default size measure type should not be focusable

- - - - -
09ef469d by Tony CHEMIT at 2018-09-16T15:12:41Z
update changelog

- - - - -
2ad1d291 by Tony CHEMIT at 2018-09-16T15:13:26Z
[jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-19' with non-snapshot versions[skip ci]
- - - - -
3cfed19f by Tony CHEMIT at 2018-09-16T15:21:33Z
[jgitflow-maven-plugin]merging 'release/7.0-RC-19' into 'master-7.x'
- - - - -


24 changed files:

- + .mvn/gitlab-cache/milestones/644883-artifacts.json
- + .mvn/gitlab-cache/milestones/644883-issues.json
- + .mvn/gitlab-cache/milestones/644883.json
- CHANGELOG.md
- client-configuration/pom.xml
- client-configuration/src/main/resources/log4j2.xml
- client-configuration/src/main/resources/observe-log4j2.xml
- client/pom.xml
- client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
- dto/pom.xml
- − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~
- − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- server-configuration/pom.xml
- server-configuration/src/main/resources/log4j2.xml
- server-configuration/src/main/resources/observeweb-log4j2.xml
- server/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services/pom.xml
- test/pom.xml
- validation/pom.xml


Changes:

=====================================
.mvn/gitlab-cache/milestones/644883-artifacts.json
=====================================
@@ -0,0 +1,12 @@
+[
+  {
+    "name": "Application",
+    "filename": "observe-7.0-RC-19.zip",
+    "url": "https://ultreia.io/release/observe-7.0-RC-19.zip"
+  },
+  {
+    "name": "Serveur",
+    "filename": "observe-7.0-RC-19.war",
+    "url": "https://ultreia.io/release/observe-7.0-RC-19.war"
+  }
+]
\ No newline at end of file


=====================================
.mvn/gitlab-cache/milestones/644883-issues.json
=====================================
@@ -0,0 +1,52 @@
+[
+  {
+    "id": 13673624,
+    "iid": 1038,
+    "projectId": 2722779,
+    "title": "[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés",
+    "description": "Idéalement, on nous demande des racourcis clavier supplémentaires sur les flêches \u003c- et -\u003e du formaulaire PS systèmes observés :\n\n![image](/uploads/236e6a93607d63560815a257519b7a32/image.png)\n\nEffectivement cela pourrait pas mal fluidifier l\u0027ajout d\u0027éléments.",
+    "labels": [
+      "Bas",
+      "Contrat Code Lutin-2016",
+      "Evolution"
+    ],
+    "milestone": {
+      "id": 644883,
+      "iid": 122,
+      "projectId": 2722779,
+      "groupId": 0,
+      "title": "7.0-RC-19",
+      "description": "",
+      "dueDate": "Sep 16, 2018 12:00:00 AM",
+      "startDate": "Sep 14, 2018 12:00:00 AM",
+      "state": "closed"
+    },
+    "assignee": {
+      "_id": 166231,
+      "_username": "tchemit",
+      "_name": "Tony CHEMIT",
+      "_state": "active",
+      "_darkScheme": false,
+      "_isAdmin": false,
+      "_canCreateGroup": false,
+      "_canCreateProject": false,
+      "_canCreateTeam": false,
+      "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d80\u0026d\u003didenticon"
+    },
+    "author": {
+      "_id": 1111318,
+      "_username": "pcauquil",
+      "_name": "Pascal Cauquil",
+      "_state": "active",
+      "_darkScheme": false,
+      "_isAdmin": false,
+      "_canCreateGroup": false,
+      "_canCreateProject": false,
+      "_canCreateTeam": false,
+      "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d80\u0026d\u003didenticon"
+    },
+    "state": "closed",
+    "updatedAt": "Sep 16, 2018 3:10:02 PM",
+    "createdAt": "Aug 24, 2018 10:25:25 AM"
+  }
+]
\ No newline at end of file


=====================================
.mvn/gitlab-cache/milestones/644883.json
=====================================
@@ -0,0 +1,11 @@
+{
+  "id": 644883,
+  "iid": 122,
+  "projectId": 2722779,
+  "groupId": 0,
+  "title": "7.0-RC-19",
+  "description": "",
+  "dueDate": "Sep 16, 2018 12:00:00 AM",
+  "startDate": "Sep 14, 2018 12:00:00 AM",
+  "state": "closed"
+}
\ No newline at end of file


=====================================
CHANGELOG.md
=====================================
@@ -1,7 +1,7 @@
 # ObServe changelog
 
  * Author [Tony Chemit](mailto:dev@tchemit.fr)
- * Last generated at 2018-09-12 17:47.
+ * Last generated at 2018-09-16 15:11.
 
 ## Version [8.0-alpha-2](https://gitlab.com/ultreiaio/ird-observe/milestones/113)
 Second lot du contrat IRD-2018-01-V8
@@ -48,6 +48,17 @@ Premier lot du contrat IRD-2018-01-V8
   * [[Evolution 922]](https://gitlab.com/ultreiaio/ird-observe/issues/922) **Ajoute le référentiel observe_common.DataQuality sur les données existantes** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
   * [[Evolution 950]](https://gitlab.com/ultreiaio/ird-observe/issues/950) **Renommage de la classe seine.WeightCategory en seine.WeightCategorySeine** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
 
+## Version [7.0-RC-19](https://gitlab.com/ultreiaio/ird-observe/milestones/122)
+
+**Closed at 2018-09-16.**
+
+### Download
+* [Application (observe-7.0-RC-19.zip)](https://ultreia.io/release/observe-7.0-RC-19.zip)
+* [Serveur (observe-7.0-RC-19.war)](https://ultreia.io/release/observe-7.0-RC-19.war)
+
+### Issues
+  * [[Evolution 1038]](https://gitlab.com/ultreiaio/ird-observe/issues/1038) **[PS] Ajout de racourcis clavier sur le formulaire des systèmes observés** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+
 ## Version [7.0-RC-18](https://gitlab.com/ultreiaio/ird-observe/milestones/121)
 
 **Closed at 2018-09-12.**


=====================================
client-configuration/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>client-configuration</artifactId>


=====================================
client-configuration/src/main/resources/log4j2.xml
=====================================
@@ -49,6 +49,10 @@
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="File"/>
+    </Logger>
     <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>


=====================================
client-configuration/src/main/resources/observe-log4j2.xml
=====================================
@@ -49,6 +49,10 @@
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="File"/>
+    </Logger>
     <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>


=====================================
client/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>client</artifactId>


=====================================
client/src/main/java/fr/ird/observe/client/ui/content/data/seine/AbstractSampleUI.jcss
=====================================
@@ -87,6 +87,7 @@ JToolBar {
   actionIcon:combobox-reset2;
   toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip";
   enabled:{model.getDefaultSizeMeasureType() != null};
+  focusable:false;
 }
 
 #length {


=====================================
dto/pom.xml
=====================================
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>dto</artifactId>


=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GearCaracteristicDtoDecorator.java~ deleted
=====================================
@@ -1,51 +0,0 @@
-package fr.ird.observe.dto.decoration.decorators;
-
-<<<<<<< HEAD
-=======
-/*-
- * #%L
- * ObServe :: Dto
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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%
- */
-
->>>>>>> refs/heads/master-7.x
-import fr.ird.observe.dto.referential.GearCaracteristicDto;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * Created by tchemit on 13/06/2018.
- *
- * @author Tony Chemit - dev@tchemit.fr
- */
-public class GearCaracteristicDtoDecorator extends ObserveDecorator<GearCaracteristicDto> {
-
-    public GearCaracteristicDtoDecorator(String libelle) {
-        super(GearCaracteristicDto.class, "${code}$s##${" + libelle + "}$s##${unit}$s", " ");
-    }
-
-    @Override
-    protected Comparable<?> getDefaultNullValue(String token) {
-        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
-        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
-            return t("observe.common.no.unit");
-        }
-        return defaultNullValue;
-    }
-}


=====================================
dto/src/main/java/fr/ird/observe/dto/decoration/decorators/GeatCaracteristicReferenceDecorator.java~ deleted
=====================================
@@ -1,51 +0,0 @@
-package fr.ird.observe.dto.decoration.decorators;
-
-<<<<<<< HEAD
-=======
-/*-
- * #%L
- * ObServe :: Dto
- * %%
- * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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%
- */
-
->>>>>>> refs/heads/master-7.x
-import fr.ird.observe.dto.referential.GearCaracteristicDto;
-import fr.ird.observe.dto.referential.GearCaracteristicReference;
-
-import static org.nuiton.i18n.I18n.t;
-
-/**
- * Created by tchemit on 13/06/2018.
- *
- * @author Tony Chemit - dev@tchemit.fr
- */
-public class GeatCaracteristicReferenceDecorator extends ReferentialReferenceDecorator<GearCaracteristicReference> {
-    public GeatCaracteristicReferenceDecorator( ) {
-        super(GearCaracteristicReference.class, "${code}$s##${label}$s##${unit}$s");
-    }
-
-    @Override
-    protected Comparable<?> getDefaultNullValue(String token) {
-        Comparable<?> defaultNullValue = super.getDefaultNullValue(token);
-        if (defaultNullValue == null && token.equals(GearCaracteristicDto.PROPERTY_UNIT)) {
-            return t("observe.common.no.unit");
-        }
-        return defaultNullValue;
-    }
-}


=====================================
observe/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>observe</artifactId>


=====================================
persistence/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>persistence</artifactId>


=====================================
pom.xml
=====================================
@@ -26,12 +26,12 @@
   <parent>
     <groupId>io.ultreia.maven</groupId>
     <artifactId>pom</artifactId>
-    <version>2018.50</version>
+    <version>2018.51</version>
   </parent>
 
   <groupId>fr.ird.observe</groupId>
   <artifactId>ird-observe</artifactId>
-  <version>7.0-RC-18</version>
+  <version>7.0-RC-19</version>
   <packaging>pom</packaging>
 
   <name>ObServe :: Pom</name>
@@ -153,10 +153,10 @@
     <buildDate>${maven.build.timestamp}</buildDate>
 
     <observeToolkitVersion>3.7.4</observeToolkitVersion>
-    <!--<lib.version.java4all.jaxx>3.0-alpha-33-SNAPSHOT</lib.version.java4all.jaxx>-->
+    <lib.version.java4all.jaxx>3.0-alpha-35</lib.version.java4all.jaxx>
     <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
     <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
-    <xworkVersion>2.3.34</xworkVersion>
+    <xworkVersion>2.3.35</xworkVersion>
     <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->
     <!--can't use 1.4.197 (date has changed + blob also-->
     <lib.version.h2>1.4.196</lib.version.h2>


=====================================
server-configuration/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>server-configuration</artifactId>


=====================================
server-configuration/src/main/resources/log4j2.xml
=====================================
@@ -34,6 +34,9 @@
     <Logger name="org.nuiton" level="warn" additivity="false">
       <AppenderRef ref="console"/>
     </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
+      <AppenderRef ref="console"/>
+    </Logger>
     <Logger name="fr.ird.observe.client.validators" level="warn" additivity="false">
       <AppenderRef ref="console"/>
     </Logger>


=====================================
server-configuration/src/main/resources/observeweb-log4j2.xml
=====================================
@@ -42,7 +42,11 @@
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>
-    <Logger name="org.nuiton" level="info" additivity="false">
+    <Logger name="org.nuiton" level="warn" additivity="false">
+      <AppenderRef ref="console"/>
+      <AppenderRef ref="File"/>
+    </Logger>
+    <Logger name="org.nuiton.topia" level="info" additivity="false">
       <AppenderRef ref="console"/>
       <AppenderRef ref="File"/>
     </Logger>


=====================================
server/pom.xml
=====================================
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>server</artifactId>


=====================================
services-client/pom.xml
=====================================
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>services-client</artifactId>


=====================================
services-local/pom.xml
=====================================
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>services-local</artifactId>


=====================================
services/pom.xml
=====================================
@@ -27,7 +27,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>services</artifactId>


=====================================
test/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>test</artifactId>


=====================================
validation/pom.xml
=====================================
@@ -26,7 +26,7 @@
   <parent>
     <groupId>fr.ird.observe</groupId>
     <artifactId>ird-observe</artifactId>
-    <version>7.0-RC-18</version>
+    <version>7.0-RC-19</version>
   </parent>
 
   <artifactId>validation</artifactId>



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/db7414ec9e3d872b668c754e1ce...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/db7414ec9e3d872b668c754e1ce...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)