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

Commits:

7 changed files:

Changes:

  • dto/pom.xml
    ... ... @@ -62,6 +62,7 @@
    62 62 
         <dependency>
    63 63 
           <groupId>io.ultreia.java4all.http</groupId>
    64 64 
           <artifactId>http-api</artifactId>
    65 
    +      <scope>provided</scope>
    65 66 
         </dependency>
    66 67 
         <dependency>
    67 68 
           <groupId>io.ultreia.java4all.i18n</groupId>

  • dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java
    1 1 
     package fr.ird.observe.spi;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Dto
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 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 com.google.common.collect.ImmutableSet;
    4 26 
     import fr.ird.observe.dto.data.DataDto;
    5 27 
     import fr.ird.observe.dto.data.longline.ActivityLonglineDto;

  • persistence/pom.xml
    ... ... @@ -84,6 +84,7 @@
    84 84 
         <dependency>
    85 85 
           <groupId>io.ultreia.java4all.http</groupId>
    86 86 
           <artifactId>http-api</artifactId>
    87 
    +      <scope>provided</scope>
    87 88 
         </dependency>
    88 89
    89 90 
         <!-- commons -->

  • persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql
    1 
    +---
    2 
    +-- #%L
    3 
    +-- ObServe :: Persistence
    4 
    +-- %%
    5 
    +-- Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io
    6 
    +-- %%
    7 
    +-- This program is free software: you can redistribute it and/or modify
    8 
    +-- it under the terms of the GNU General Public License as
    9 
    +-- published by the Free Software Foundation, either version 3 of the
    10 
    +-- License, or (at your option) any later version.
    11 
    +--
    12 
    +-- This program is distributed in the hope that it will be useful,
    13 
    +-- but WITHOUT ANY WARRANTY; without even the implied warranty of
    14 
    +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15 
    +-- GNU General Public License for more details.
    16 
    +--
    17 
    +-- You should have received a copy of the GNU General Public
    18 
    +-- License along with this program.  If not, see
    19 
    +-- <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 
    +-- #L%
    21 
    +---
    1 22 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, NULL           , 'FAD'     , '1'            , NULL                                                             , 'FAD'                                             , 'FAD'                                             , 'FAD'                                             , false, false, false, NULL                                                              , NULL                          , false, false);
    2 23 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  1, '16'           , 'DFAD'    , '1-1'          , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)'                             , 'DFAD (FAD dérivant)'                             , 'DFAD (FAD a la deriva)'                          , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);
    3 24 
     INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false,  0, '19'           , NULL      , '1-1-1'        , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD'                                , 'Objet expérimental'                              , 'Objeto experimental'                             , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL                          , false, false);

  • persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java
    1 1 
     package fr.ird.observe.spi;
    2 2
    3 
    +/*-
    4 
    + * #%L
    5 
    + * ObServe :: Persistence
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2017 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 fr.ird.observe.binder.data.DataDtoReferenceBinderSupport;
    4 26 
     import fr.ird.observe.binder.referential.ReferentialDtoReferenceBinderSupport;
    5 27 
     import fr.ird.observe.dto.data.DataDto;

  • services-client/pom.xml
    ... ... @@ -62,10 +62,6 @@
    62 62 
         </dependency>
    63 63 
         <dependency>
    64 64 
           <groupId>fr.ird.observe.toolkit</groupId>
    65 
    -      <artifactId>common-db</artifactId>
    66 
    -    </dependency>
    67 
    -    <dependency>
    68 
    -      <groupId>fr.ird.observe.toolkit</groupId>
    69 65 
           <artifactId>common-service</artifactId>
    70 66 
         </dependency>
    71 67

  • services-client/src/license/THIRD-PARTY.properties
    ... ... @@ -2,26 +2,22 @@
    2 2 
     #-------------------------------------------------------------------------------
    3 3 
     # Already used licenses in project :
    4 4 
     # - Apache 2.0
    5 
    -# - Apache License 2.0
    6 5 
     # - BSD License
    7 6 
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    8 7 
     # - Eclipse Public License 1.0
    9 
    -# - GNU Lesser Public License
    10 8 
     # - General Public License (GPL)
    11 
    -# - Indiana University Extreme! Lab Software License, vesion 1.1.1
    9 
    +# - Indiana University Extreme! Lab Software License, version 1.1.1
    12 10 
     # - Lesser General Public License (LGPL)
    13 11 
     # - Lesser General Public License (LGPL) v 3.0
    14 12 
     # - Lesser General Public License (LPGL)
    15 13 
     # - Lesser General Public License (LPGL) v 2.1
    16 14 
     # - MIT License
    17 
    -# - MPL 1.1
    18 15 
     # - New BSD License
    19 16 
     # - The Apache Software License, Version 2.0
    20 
    -# - The New BSD License
    21 
    -# - WTFPL
    17 
    +# - The MIT License
    22 18 
     #-------------------------------------------------------------------------------
    23 19 
     # Please fill the missing licenses for dependencies :
    24 20 
     #
    25 21 
     #
    26 
    -#Thu Sep 01 11:23:55 CEST 2016
    22 
    +#Mon Sep 04 00:38:17 CEST 2017
    27 23 
     commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0

    • —
    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.