Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

10 changed files:

Changes:

  • .mvn/jvm.config deleted
    1 
    --Xmx4096m
    \ No newline at end of file

  • .mvn/maven.config deleted
    1 
    --Dmaven.artifact.threads=10 -Dmaven.wagon.http.ssl.insecure=true -Dmaven.wagon.http.ssl.allowall=true -Dmaven.wagon.http.ssl.ignore.validity.dates=true
    \ No newline at end of file

  • client/pom.xml
    ... ... @@ -376,12 +376,12 @@
    376 376 
           <artifactId>common-service</artifactId>
    377 377 
         </dependency>
    378 378 
         <dependency>
    379 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    380 
    -      <artifactId>topia-extension</artifactId>
    379 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    380 
    +      <artifactId>persistence</artifactId>
    381 381 
         </dependency>
    382 382 
         <dependency>
    383 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    384 
    -      <artifactId>topia-extension-migration</artifactId>
    383 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    384 
    +      <artifactId>service-migration</artifactId>
    385 385 
         </dependency>
    386 386
    387 387 
         <dependency>

  • dto/src/main/java/fr/ird/observe/dto/data/longline/TripLonglineDto.java
    1 1 
     package fr.ird.observe.dto.data.longline;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Dto
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    3 25 
     import io.ultreia.java4all.bean.JavaBean;
    4 26 
     import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore;
    5 27 
     import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;

  • persistence/pom.xml
    ... ... @@ -50,16 +50,16 @@
    50 50 
         </dependency>
    51 51
    52 52 
         <dependency>
    53 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    54 
    -      <artifactId>topia-extension</artifactId>
    53 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    54 
    +      <artifactId>persistence</artifactId>
    55 55 
         </dependency>
    56 56 
         <dependency>
    57 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    58 
    -      <artifactId>topia-extension-migration</artifactId>
    57 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    58 
    +      <artifactId>service-migration</artifactId>
    59 59 
         </dependency>
    60 60 
         <dependency>
    61 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    62 
    -      <artifactId>topia-extension-script</artifactId>
    61 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    62 
    +      <artifactId>service-script</artifactId>
    63 63 
         </dependency>
    64 64
    65 65 
         <dependency>
    ... ... @@ -202,9 +202,9 @@
    202 202 
                   <version>${project.version}</version>
    203 203 
                 </dependency>
    204 204 
                 <dependency>
    205 
    -              <groupId>fr.ird.observe.toolkit</groupId>
    206 
    -              <artifactId>topia-templates-extension</artifactId>
    207 
    -              <version>${observeToolkitVersion}</version>
    205 
    +              <groupId>io.ultreia.java4all.topia</groupId>
    206 
    +              <artifactId>templates</artifactId>
    207 
    +              <version>${lib.version.java4all.topia}</version>
    208 208 
                   <scope>compile</scope>
    209 209 
                 </dependency>
    210 210 
                 <dependency>

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26 
       <parent>
    27 27 
         <groupId>io.ultreia.maven</groupId>
    28 28 
         <artifactId>pom</artifactId>
    29 
    -    <version>2018.36</version>
    29 
    +    <version>2018.37</version>
    30 30 
       </parent>
    31 31
    32 32 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -199,30 +199,6 @@
    199 199
    200 200 
           <dependency>
    201 201 
             <groupId>fr.ird.observe.toolkit</groupId>
    202 
    -        <artifactId>topia-extension</artifactId>
    203 
    -        <version>${observeToolkitVersion}</version>
    204 
    -      </dependency>
    205 
    -
    206 
    -      <dependency>
    207 
    -        <groupId>fr.ird.observe.toolkit</groupId>
    208 
    -        <artifactId>topia-extension-migration</artifactId>
    209 
    -        <version>${observeToolkitVersion}</version>
    210 
    -      </dependency>
    211 
    -
    212 
    -      <dependency>
    213 
    -        <groupId>fr.ird.observe.toolkit</groupId>
    214 
    -        <artifactId>topia-extension-script</artifactId>
    215 
    -        <version>${observeToolkitVersion}</version>
    216 
    -      </dependency>
    217 
    -
    218 
    -      <dependency>
    219 
    -        <groupId>fr.ird.observe.toolkit</groupId>
    220 
    -        <artifactId>topia-templates-extension</artifactId>
    221 
    -        <version>${observeToolkitVersion}</version>
    222 
    -      </dependency>
    223 
    -
    224 
    -      <dependency>
    225 
    -        <groupId>fr.ird.observe.toolkit</groupId>
    226 202 
             <artifactId>common-dto</artifactId>
    227 203 
             <version>${observeToolkitVersion}</version>
    228 204 
           </dependency>

  • server/pom.xml
    ... ... @@ -76,8 +76,8 @@
    76 76 
           <artifactId>common-service</artifactId>
    77 77 
         </dependency>
    78 78 
         <dependency>
    79 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    80 
    -      <artifactId>topia-extension</artifactId>
    79 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    80 
    +      <artifactId>persistence</artifactId>
    81 81 
         </dependency>
    82 82
    83 83 
         <dependency>

  • services-client/pom.xml
    ... ... @@ -65,8 +65,8 @@
    65 65 
           <artifactId>common-service</artifactId>
    66 66 
         </dependency>
    67 67 
         <dependency>
    68 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    69 
    -      <artifactId>topia-extension</artifactId>
    68 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    69 
    +      <artifactId>persistence</artifactId>
    70 70 
         </dependency>
    71 71 
         <dependency>
    72 72 
           <groupId>io.ultreia.java4all</groupId>

  • services-local/pom.xml
    ... ... @@ -79,12 +79,12 @@
    79 79 
           <artifactId>common-service</artifactId>
    80 80 
         </dependency>
    81 81 
         <dependency>
    82 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    83 
    -      <artifactId>topia-extension-migration</artifactId>
    82 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    83 
    +      <artifactId>service-migration</artifactId>
    84 84 
         </dependency>
    85 85 
         <dependency>
    86 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    87 
    -      <artifactId>topia-extension-script</artifactId>
    86 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    87 
    +      <artifactId>service-script</artifactId>
    88 88 
         </dependency>
    89 89
    90 90 
         <dependency>
    ... ... @@ -151,9 +151,8 @@
    151 151 
           <artifactId>topia-service-migration</artifactId>
    152 152 
         </dependency>
    153 153 
         <dependency>
    154 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    155 
    -      <artifactId>topia-extension</artifactId>
    156 
    -      <version>${observeToolkitVersion}</version>
    154 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    155 
    +      <artifactId>persistence</artifactId>
    157 156 
         </dependency>
    158 157
    159 158 
         <dependency>

  • services/pom.xml
    ... ... @@ -59,8 +59,8 @@
    59 59 
           <artifactId>common-service</artifactId>
    60 60 
         </dependency>
    61 61 
         <dependency>
    62 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    63 
    -      <artifactId>topia-extension</artifactId>
    62 
    +      <groupId>io.ultreia.java4all.topia</groupId>
    63 
    +      <artifactId>persistence</artifactId>
    64 64 
         </dependency>
    65 65
    66 66 
         <!-- nuiton dependencies -->

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.