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

Commits:

18 changed files:

Changes:

  • client-configuration/src/license/THIRD-PARTY.properties
    ... ... @@ -6,14 +6,18 @@
    6 6
     # - Apache License, version 2.0
    
    7 7
     # - BSD 3-clause New License
    
    8 8
     # - BSD License
    
    9
    +# - CDDL 1.1
    
    10
    +# - CDDL+GPL License
    
    11
    +# - CDDL/GPLv2+CE
    
    9 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    10 13
     # - Common Development and Distribution License
    
    11
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    12
    -# - Eclipse Public License (EPL), Version 1.0
    
    14
    +# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    13 16
     # - Eclipse Public License 1.0
    
    14
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    15 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    16
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    20
    +# - GPL2 w/ CPE
    
    17 21
     # - General Public License (GPL)
    
    18 22
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    19 23
     # - Lesser General Public License (LGPL)
    
    ... ... @@ -30,5 +34,6 @@
    30 34
     # Please fill the missing licenses for dependencies :
    
    31 35
     #
    
    32 36
     #
    
    33
    -#Mon Feb 04 13:59:54 CET 2019
    
    34
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    37
    +#Wed Apr 10 14:53:37 CEST 2019
    
    38
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    39
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • client-core/src/license/THIRD-PARTY.properties
    ... ... @@ -9,20 +9,18 @@
    9 9
     # - BSD License
    
    10 10
     # - BSD License for HSQL
    
    11 11
     # - CDDL 1.1
    
    12
    -# - CDDL+GPL License
    
    13 12
     # - CDDL/GPLv2+CE
    
    14 13
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    15 14
     # - Common Development and Distribution License
    
    16
    -# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    +# - EDL 1.0
    
    17 16
     # - EPSG database distribution license
    
    18
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    19 17
     # - Eclipse Distribution License - v 1.0
    
    20
    -# - Eclipse Public License (EPL), Version 1.0
    
    18
    +# - Eclipse Distribution License v. 1.0
    
    21 19
     # - Eclipse Public License 1.0
    
    22
    -# - Eclipse Public License, Version 1.0
    
    20
    +# - Eclipse Public License v1.0
    
    23 21
     # - Eclipse Publish License, Version 1.0
    
    24 22
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    25
    -# - GNU Lesser General Public License, Version 2.1
    
    23
    +# - GNU Library General Public License v2.1 or later
    
    26 24
     # - GPL2 w/ CPE
    
    27 25
     # - General Public License (GPL)
    
    28 26
     # - HSQLDB License, a BSD open source license
    
    ... ... @@ -49,6 +47,7 @@
    49 47
     # Please fill the missing licenses for dependencies :
    
    50 48
     #
    
    51 49
     #
    
    52
    -#Mon Feb 04 14:00:16 CET 2019
    
    53
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    
    50
    +#Wed Apr 10 16:18:22 CEST 2019
    
    51
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    52
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
    
    54 53
     javax.media--jai_core--1.1.3=JDL (Java Distribution License)

  • client-runner/src/license/THIRD-PARTY.properties
    ... ... @@ -14,15 +14,13 @@
    14 14
     # - Common Development and Distribution License
    
    15 15
     # - Dual license consisting of the CDDL v1.1 and GPL v2
    
    16 16
     # - EPSG database distribution license
    
    17
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    18 17
     # - Eclipse Distribution License - v 1.0
    
    19
    -# - Eclipse Public License (EPL), Version 1.0
    
    18
    +# - Eclipse Distribution License v. 1.0
    
    20 19
     # - Eclipse Public License 1.0
    
    21
    -# - Eclipse Public License, Version 1.0
    
    20
    +# - Eclipse Public License v1.0
    
    22 21
     # - Eclipse Publish License, Version 1.0
    
    23 22
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    24
    -# - GNU Lesser General Public License
    
    25
    -# - GNU Lesser General Public License, Version 2.1
    
    23
    +# - GNU Library General Public License v2.1 or later
    
    26 24
     # - GPL2 w/ CPE
    
    27 25
     # - General Public License (GPL)
    
    28 26
     # - HSQLDB License, a BSD open source license
    
    ... ... @@ -48,6 +46,7 @@
    48 46
     # Please fill the missing licenses for dependencies :
    
    49 47
     #
    
    50 48
     #
    
    51
    -#Sun Feb 03 20:51:50 CET 2019
    
    52
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    
    49
    +#Wed Apr 10 14:45:39 CEST 2019
    
    50
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    51
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
    
    53 52
     javax.media--jai_core--1.1.3=JDL (Java Distribution License)

  • dto/src/license/THIRD-PARTY.properties
    1 1
     # Generated by org.codehaus.mojo.license.AddThirdPartyMojo
    
    2 2
     #-------------------------------------------------------------------------------
    
    3 3
     # Already used licenses in project :
    
    4
    +# - Apache 2.0
    
    4 5
     # - Apache License 2.0
    
    5 6
     # - BSD License
    
    6 7
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    7 8
     # - Eclipse Public License 1.0
    
    8 9
     # - General Public License (GPL)
    
    9
    -# - Indiana University Extreme! Lab Software License, vesion 1.1.1
    
    10
    +# - Indiana University Extreme! Lab Software License, version 1.1.1
    
    10 11
     # - Lesser General Public License (LGPL)
    
    11 12
     # - Lesser General Public License (LGPL) v 3.0
    
    12 13
     # - Lesser General Public License (LPGL)
    
    ... ... @@ -15,9 +16,11 @@
    15 16
     # - MPL 1.1
    
    16 17
     # - New BSD License
    
    17 18
     # - The Apache Software License, Version 2.0
    
    19
    +# - The MIT License
    
    18 20
     #-------------------------------------------------------------------------------
    
    19 21
     # Please fill the missing licenses for dependencies :
    
    20 22
     #
    
    21 23
     #
    
    22
    -#Mon Sep 07 10:22:53 CEST 2015
    
    23
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    24
    +#Wed Apr 10 16:20:09 CEST 2019
    
    25
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    26
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • observe-i18n/src/license/THIRD-PARTY.properties
    1
    +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
    
    2
    +#-------------------------------------------------------------------------------
    
    3
    +# Already used licenses in project :
    
    4
    +# - Apache 2.0
    
    5
    +# - BSD License
    
    6
    +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    7
    +# - Indiana University Extreme! Lab Software License, version 1.1.1
    
    8
    +# - Lesser General Public License (LGPL) v 3.0
    
    9
    +# - Lesser General Public License (LPGL)
    
    10
    +# - Lesser General Public License (LPGL) v 2.1
    
    11
    +# - MIT License
    
    12
    +# - The Apache Software License, Version 2.0
    
    13
    +# - The MIT License
    
    14
    +#-------------------------------------------------------------------------------
    
    15
    +# Please fill the missing licenses for dependencies :
    
    16
    +#
    
    17
    +#
    
    18
    +#Wed Apr 10 14:54:15 CEST 2019
    
    19
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0

  • persistence/pom.xml
    ... ... @@ -135,6 +135,16 @@
    135 135
         <dependency>
    
    136 136
           <groupId>org.hibernate</groupId>
    
    137 137
           <artifactId>hibernate-core</artifactId>
    
    138
    +      <exclusions>
    
    139
    +        <exclusion>
    
    140
    +          <groupId>javax.xml.bind</groupId>
    
    141
    +          <artifactId>jaxb-api</artifactId>
    
    142
    +        </exclusion>
    
    143
    +        <exclusion>
    
    144
    +          <groupId>javax.activation</groupId>
    
    145
    +          <artifactId>javax.activation-api</artifactId>
    
    146
    +        </exclusion>
    
    147
    +      </exclusions>
    
    138 148
         </dependency>
    
    139 149
         <dependency>
    
    140 150
           <groupId>net.bytebuddy</groupId>
    
    ... ... @@ -182,11 +192,11 @@
    182 192
           <artifactId>postgresql</artifactId>
    
    183 193
           <scope>test</scope>
    
    184 194
         </dependency>
    
    185
    -    <dependency>
    
    186
    -      <groupId>javax.xml.bind</groupId>
    
    187
    -      <artifactId>jaxb-api</artifactId>
    
    188
    -      <scope>runtime</scope>
    
    189
    -    </dependency>
    
    195
    +<!--    <dependency>-->
    
    196
    +<!--      <groupId>javax.xml.bind</groupId>-->
    
    197
    +<!--      <artifactId>jaxb-api</artifactId>-->
    
    198
    +<!--      <scope>runtime</scope>-->
    
    199
    +<!--    </dependency>-->
    
    190 200
         <dependency>
    
    191 201
           <groupId>org.glassfish.jaxb</groupId>
    
    192 202
           <artifactId>jaxb-runtime</artifactId>
    

  • persistence/src/license/THIRD-PARTY.properties
    ... ... @@ -12,12 +12,11 @@
    12 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    13 13
     # - Common Development and Distribution License
    
    14 14
     # - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    16
    -# - Eclipse Public License (EPL), Version 1.0
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    17 16
     # - Eclipse Public License 1.0
    
    18
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    19 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    20
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    21 20
     # - GNU Library or Lesser General Public License
    
    22 21
     # - GPL2 w/ CPE
    
    23 22
     # - General Public License (GPL)
    
    ... ... @@ -37,5 +36,6 @@
    37 36
     # Please fill the missing licenses for dependencies :
    
    38 37
     #
    
    39 38
     #
    
    40
    -#Mon Feb 04 13:56:32 CET 2019
    
    41
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    39
    +#Wed Apr 10 14:50:08 CEST 2019
    
    40
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    41
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • pom.xml
    ... ... @@ -26,7 +26,7 @@
    26 26
       <parent>
    
    27 27
         <groupId>io.ultreia.maven</groupId>
    
    28 28
         <artifactId>pom</artifactId>
    
    29
    -    <version>2019.8.12</version>
    
    29
    +    <version>2019.8.13</version>
    
    30 30
       </parent>
    
    31 31
     
    
    32 32
       <groupId>fr.ird.observe</groupId>
    
    ... ... @@ -163,7 +163,7 @@
    163 163
     
    
    164 164
         <!--<lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>-->
    
    165 165
         <!--<lib.version.java4all.eugene>3.0-alpha-22</lib.version.java4all.eugene>-->
    
    166
    -    <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>
    
    166
    +<!--    <lib.version.java4all.jaxx>3.0-alpha-50</lib.version.java4all.jaxx>-->
    
    167 167
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->
    
    168 168
         <!--<lib.version.java4all.config>1.0.8-SNAPSHOT</lib.version.java4all.config>-->
    
    169 169
         <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->
    
    ... ... @@ -238,11 +238,11 @@
    238 238
             <version>1.08</version>
    
    239 239
           </dependency>
    
    240 240
     
    
    241
    -      <dependency>
    
    242
    -        <groupId>org.glassfish.jaxb</groupId>
    
    243
    -        <artifactId>jaxb-runtime</artifactId>
    
    244
    -        <version>2.3.1</version>
    
    245
    -      </dependency>
    
    241
    +<!--      <dependency>-->
    
    242
    +<!--        <groupId>org.glassfish.jaxb</groupId>-->
    
    243
    +<!--        <artifactId>jaxb-runtime</artifactId>-->
    
    244
    +<!--        <version>2.3.1</version>-->
    
    245
    +<!--      </dependency>-->
    
    246 246
     
    
    247 247
           <dependency>
    
    248 248
             <groupId>org.nuiton.topia</groupId>
    

  • server-configuration/src/license/THIRD-PARTY.properties
    ... ... @@ -21,5 +21,6 @@
    21 21
     # Please fill the missing licenses for dependencies :
    
    22 22
     #
    
    23 23
     #
    
    24
    -#Fri Oct 19 16:06:54 CEST 2018
    
    25
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    24
    +#Wed Apr 10 14:53:30 CEST 2019
    
    25
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    26
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • server-core/src/license/THIRD-PARTY.properties
    ... ... @@ -17,12 +17,11 @@
    17 17
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    18 18
     # - Common Development and Distribution License
    
    19 19
     # - Dual license consisting of the CDDL v1.1 and GPL v2
    
    20
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    21
    -# - Eclipse Public License (EPL), Version 1.0
    
    20
    +# - Eclipse Distribution License v. 1.0
    
    22 21
     # - Eclipse Public License 1.0
    
    23
    -# - Eclipse Public License, Version 1.0
    
    22
    +# - Eclipse Public License v1.0
    
    24 23
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    25
    -# - GNU Lesser General Public License, Version 2.1
    
    24
    +# - GNU Library General Public License v2.1 or later
    
    26 25
     # - GPL2 w/ CPE
    
    27 26
     # - General Public License (GPL)
    
    28 27
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    ... ... @@ -44,6 +43,7 @@
    44 43
     # Please fill the missing licenses for dependencies :
    
    45 44
     #
    
    46 45
     #
    
    47
    -#Mon Feb 04 13:59:51 CET 2019
    
    48
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    
    46
    +#Wed Apr 10 14:53:34 CEST 2019
    
    47
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    48
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
    
    49 49
     org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0

  • server-runner/src/license/THIRD-PARTY.properties
    ... ... @@ -11,17 +11,16 @@
    11 11
     # - BSD licence
    
    12 12
     # - Bouncy Castle Licence
    
    13 13
     # - CDDL 1.1
    
    14
    -# - CDDL+GPL License
    
    15 14
     # - CDDL/GPLv2+CE
    
    16 15
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    17 16
     # - Common Development and Distribution License
    
    18
    -# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    19
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    20
    -# - Eclipse Public License (EPL), Version 1.0
    
    17
    +# - EDL 1.0
    
    18
    +# - Eclipse Distribution License - v 1.0
    
    19
    +# - Eclipse Distribution License v. 1.0
    
    21 20
     # - Eclipse Public License 1.0
    
    22
    -# - Eclipse Public License, Version 1.0
    
    21
    +# - Eclipse Public License v1.0
    
    23 22
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    24
    -# - GNU Lesser General Public License, Version 2.1
    
    23
    +# - GNU Library General Public License v2.1 or later
    
    25 24
     # - GPL2 w/ CPE
    
    26 25
     # - General Public License (GPL)
    
    27 26
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    ... ... @@ -43,6 +42,7 @@
    43 42
     # Please fill the missing licenses for dependencies :
    
    44 43
     #
    
    45 44
     #
    
    46
    -#Mon Feb 04 14:00:38 CET 2019
    
    47
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    
    45
    +#Wed Apr 10 16:40:05 CEST 2019
    
    46
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    47
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
    
    48 48
     org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0

  • services-client/src/license/THIRD-PARTY.properties
    ... ... @@ -6,14 +6,18 @@
    6 6
     # - Apache License, version 2.0
    
    7 7
     # - BSD 3-clause New License
    
    8 8
     # - BSD License
    
    9
    +# - CDDL 1.1
    
    10
    +# - CDDL+GPL License
    
    11
    +# - CDDL/GPLv2+CE
    
    9 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    10 13
     # - Common Development and Distribution License
    
    11
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    12
    -# - Eclipse Public License (EPL), Version 1.0
    
    14
    +# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    13 16
     # - Eclipse Public License 1.0
    
    14
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    15 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    16
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    20
    +# - GPL2 w/ CPE
    
    17 21
     # - General Public License (GPL)
    
    18 22
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    19 23
     # - Lesser General Public License (LGPL)
    
    ... ... @@ -30,5 +34,6 @@
    30 34
     # Please fill the missing licenses for dependencies :
    
    31 35
     #
    
    32 36
     #
    
    33
    -#Mon Feb 04 13:59:43 CET 2019
    
    34
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    37
    +#Wed Apr 10 14:53:26 CEST 2019
    
    38
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    39
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • services-local/src/license/THIRD-PARTY.properties
    ... ... @@ -12,12 +12,11 @@
    12 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    13 13
     # - Common Development and Distribution License
    
    14 14
     # - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    16
    -# - Eclipse Public License (EPL), Version 1.0
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    17 16
     # - Eclipse Public License 1.0
    
    18
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    19 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    20
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    21 20
     # - GPL2 w/ CPE
    
    22 21
     # - General Public License (GPL)
    
    23 22
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    ... ... @@ -36,5 +35,6 @@
    36 35
     # Please fill the missing licenses for dependencies :
    
    37 36
     #
    
    38 37
     #
    
    39
    -#Mon Feb 04 13:56:50 CET 2019
    
    40
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    38
    +#Wed Apr 10 14:50:27 CEST 2019
    
    39
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    40
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • services-validation/src/license/THIRD-PARTY.properties
    ... ... @@ -6,14 +6,18 @@
    6 6
     # - Apache License, version 2.0
    
    7 7
     # - BSD 3-clause New License
    
    8 8
     # - BSD License
    
    9
    +# - CDDL 1.1
    
    10
    +# - CDDL+GPL License
    
    11
    +# - CDDL/GPLv2+CE
    
    9 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    10 13
     # - Common Development and Distribution License
    
    11
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    12
    -# - Eclipse Public License (EPL), Version 1.0
    
    14
    +# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    13 16
     # - Eclipse Public License 1.0
    
    14
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    15 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    16
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    20
    +# - GPL2 w/ CPE
    
    17 21
     # - General Public License (GPL)
    
    18 22
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    19 23
     # - Lesser General Public License (LGPL)
    
    ... ... @@ -30,5 +34,6 @@
    30 34
     # Please fill the missing licenses for dependencies :
    
    31 35
     #
    
    32 36
     #
    
    33
    -#Mon Feb 04 13:56:01 CET 2019
    
    34
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    37
    +#Wed Apr 10 14:49:43 CEST 2019
    
    38
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    39
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • services/src/license/THIRD-PARTY.properties
    ... ... @@ -6,14 +6,18 @@
    6 6
     # - Apache License, version 2.0
    
    7 7
     # - BSD 3-clause New License
    
    8 8
     # - BSD License
    
    9
    +# - CDDL 1.1
    
    10
    +# - CDDL+GPL License
    
    11
    +# - CDDL/GPLv2+CE
    
    9 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    10 13
     # - Common Development and Distribution License
    
    11
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    12
    -# - Eclipse Public License (EPL), Version 1.0
    
    14
    +# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    13 16
     # - Eclipse Public License 1.0
    
    14
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    15 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    16
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    20
    +# - GPL2 w/ CPE
    
    17 21
     # - General Public License (GPL)
    
    18 22
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    19 23
     # - Lesser General Public License (LGPL)
    
    ... ... @@ -30,5 +34,6 @@
    30 34
     # Please fill the missing licenses for dependencies :
    
    31 35
     #
    
    32 36
     #
    
    33
    -#Mon Feb 04 13:56:01 CET 2019
    
    34
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    37
    +#Wed Apr 10 14:49:38 CEST 2019
    
    38
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    39
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • services/src/main/resources/observe-reports.properties
    ... ... @@ -167,7 +167,7 @@ report.dcpUsage.request.3=2,0|row|\
    167 167
       Where \
    
    168 168
           m.id In :tripId \
    
    169 169
           and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \
    
    170
    -      and dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3'
    
    170
    +      and (dcp.objectOperation.id = 'fr.ird.referential.ps.observation.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.referential.ps.common.VesselActivitySeine#1239832675369#0.12552908048322586')
    
    171 171
     report.dcpUsage.request.3.repeat=typeObjetId|column
    
    172 172
     # mis a l'eau
    
    173 173
     report.dcpUsage.request.4=3,0|row|\
    

  • test/src/license/THIRD-PARTY.properties
    1
    +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
    
    2
    +#-------------------------------------------------------------------------------
    
    3
    +# Already used licenses in project :
    
    4
    +# - Apache 2.0
    
    5
    +# - BSD License
    
    6
    +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    7
    +# - Eclipse Public License 1.0
    
    8
    +# - Indiana University Extreme! Lab Software License, version 1.1.1
    
    9
    +# - Lesser General Public License (LGPL) v 3.0
    
    10
    +# - Lesser General Public License (LPGL)
    
    11
    +# - Lesser General Public License (LPGL) v 2.1
    
    12
    +# - MIT License
    
    13
    +# - New BSD License
    
    14
    +# - The Apache Software License, Version 2.0
    
    15
    +# - The MIT License
    
    16
    +#-------------------------------------------------------------------------------
    
    17
    +# Please fill the missing licenses for dependencies :
    
    18
    +#
    
    19
    +#
    
    20
    +#Wed Apr 10 14:48:37 CEST 2019
    
    21
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0

  • validation/src/license/THIRD-PARTY.properties
    ... ... @@ -6,14 +6,18 @@
    6 6
     # - Apache License, version 2.0
    
    7 7
     # - BSD 3-clause New License
    
    8 8
     # - BSD License
    
    9
    +# - CDDL 1.1
    
    10
    +# - CDDL+GPL License
    
    11
    +# - CDDL/GPLv2+CE
    
    9 12
     # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
    
    10 13
     # - Common Development and Distribution License
    
    11
    -# - Eclipse Distribution License (EDL), Version 1.0
    
    12
    -# - Eclipse Public License (EPL), Version 1.0
    
    14
    +# - Dual license consisting of the CDDL v1.1 and GPL v2
    
    15
    +# - Eclipse Distribution License v. 1.0
    
    13 16
     # - Eclipse Public License 1.0
    
    14
    -# - Eclipse Public License, Version 1.0
    
    17
    +# - Eclipse Public License v1.0
    
    15 18
     # - GNU General Public License, Version 2 with the Classpath Exception
    
    16
    -# - GNU Lesser General Public License, Version 2.1
    
    19
    +# - GNU Library General Public License v2.1 or later
    
    20
    +# - GPL2 w/ CPE
    
    17 21
     # - General Public License (GPL)
    
    18 22
     # - Indiana University Extreme! Lab Software License, version 1.1.1
    
    19 23
     # - Lesser General Public License (LGPL)
    
    ... ... @@ -30,5 +34,6 @@
    30 34
     # Please fill the missing licenses for dependencies :
    
    31 35
     #
    
    32 36
     #
    
    33
    -#Mon Feb 04 13:56:12 CET 2019
    
    34
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    37
    +#Wed Apr 10 14:49:51 CEST 2019
    
    38
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    
    39
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0