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

Commits:

16 changed files:

Changes:

  • client-configuration/src/license/THIRD-PARTY.properties
    ... ... @@ -14,9 +14,7 @@
    14 14 
     # - Eclipse Distribution License v. 1.0
    15 15 
     # - Eclipse Public License 1.0
    16 16 
     # - Eclipse Public License v1.0
    17 
    -# - Eclipse Public License, Version 1.0
    18 17 
     # - GNU General Public License, Version 2 with the Classpath Exception
    19 
    -# - GNU Lesser General Public License, Version 2.1
    20 18 
     # - GNU Library General Public License v2.1 or later
    21 19 
     # - GPL2 w/ CPE
    22 20 
     # - General Public License (GPL)
    ... ... @@ -35,5 +33,6 @@
    35 33 
     # Please fill the missing licenses for dependencies :
    36 34 
     #
    37 35 
     #
    38 
    -#Tue Feb 05 15:34:55 CET 2019
    39 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    36 
    +#Wed Apr 10 17:16:56 CEST 2019
    37 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    38 
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • client-core/src/license/THIRD-PARTY.properties
    ... ... @@ -17,10 +17,8 @@
    17 17 
     # - Eclipse Distribution License v. 1.0
    18 18 
     # - Eclipse Public License 1.0
    19 19 
     # - Eclipse Public License v1.0
    20 
    -# - Eclipse Public License, Version 1.0
    21 20 
     # - Eclipse Publish License, Version 1.0
    22 21 
     # - GNU General Public License, Version 2 with the Classpath Exception
    23 
    -# - GNU Lesser General Public License, Version 2.1
    24 22 
     # - GNU Library General Public License v2.1 or later
    25 23 
     # - GPL2 w/ CPE
    26 24 
     # - General Public License (GPL)
    ... ... @@ -48,6 +46,7 @@
    48 46 
     # Please fill the missing licenses for dependencies :
    49 47 
     #
    50 48 
     #
    51 
    -#Tue Feb 05 15:35:14 CET 2019
    52 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    49 
    +#Wed Apr 10 17:17:14 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)

  • client-runner/src/license/THIRD-PARTY.properties
    ... ... @@ -16,11 +16,8 @@
    16 16 
     # - Eclipse Distribution License v. 1.0
    17 17 
     # - Eclipse Public License 1.0
    18 18 
     # - Eclipse Public License v1.0
    19 
    -# - Eclipse Public License, Version 1.0
    20 19 
     # - Eclipse Publish License, Version 1.0
    21 20 
     # - GNU General Public License, Version 2 with the Classpath Exception
    22 
    -# - GNU Lesser General Public License
    23 
    -# - GNU Lesser General Public License, Version 2.1
    24 21 
     # - GNU Library General Public License v2.1 or later
    25 22 
     # - GPL2 w/ CPE
    26 23 
     # - General Public License (GPL)
    ... ... @@ -47,6 +44,7 @@
    47 44 
     # Please fill the missing licenses for dependencies :
    48 45 
     #
    49 46 
     #
    50 
    -#Tue Feb 05 15:35:42 CET 2019
    51 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    47 
    +#Wed Apr 10 17:17:43 CEST 2019
    48 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    49 
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
    52 50 
     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 17:12:33 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 15:52:17 CEST 2019
    19 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0

  • persistence/src/license/THIRD-PARTY.properties
    ... ... @@ -14,9 +14,7 @@
    14 14 
     # - Eclipse Distribution License v. 1.0
    15 15 
     # - Eclipse Public License 1.0
    16 16 
     # - Eclipse Public License v1.0
    17 
    -# - Eclipse Public License, Version 1.0
    18 17 
     # - GNU General Public License, Version 2 with the Classpath Exception
    19 
    -# - GNU Lesser General Public License, Version 2.1
    20 18 
     # - GNU Library General Public License v2.1 or later
    21 19 
     # - GNU Library or Lesser General Public License
    22 20 
     # - GPL2 w/ CPE
    ... ... @@ -37,5 +35,6 @@
    37 35 
     # Please fill the missing licenses for dependencies :
    38 36 
     #
    39 37 
     #
    40 
    -#Tue Feb 05 15:31:54 CET 2019
    41 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    38 
    +#Wed Apr 10 17:13:35 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

  • 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>
    ... ... @@ -159,7 +159,6 @@
    159 159 
         <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>-->
    160 160 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    161 161 
         <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>-->
    162 
    -    <xworkVersion>2.3.35</xworkVersion>
    163 162
    164 163 
         <!--can't use 1.4.197 (date has changed + blob also-->
    165 164 
         <lib.version.h2>1.4.196</lib.version.h2>
    ... ... @@ -235,7 +234,7 @@
    235 234 
           <dependency>
    236 235 
             <groupId>org.apache.struts.xwork</groupId>
    237 236 
             <artifactId>xwork-core</artifactId>
    238 
    -        <version>${xworkVersion}</version>
    237 
    +        <version>${lib.xwork.version}</version>
    239 238 
             <exclusions>
    240 239 
               <exclusion>
    241 240 
                 <groupId>javassist</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 17:16:51 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
    ... ... @@ -19,9 +19,7 @@
    19 19 
     # - Eclipse Distribution License v. 1.0
    20 20 
     # - Eclipse Public License 1.0
    21 21 
     # - Eclipse Public License v1.0
    22 
    -# - Eclipse Public License, Version 1.0
    23 22 
     # - GNU General Public License, Version 2 with the Classpath Exception
    24 
    -# - GNU Lesser General Public License, Version 2.1
    25 23 
     # - GNU Library General Public License v2.1 or later
    26 24 
     # - GPL2 w/ CPE
    27 25 
     # - General Public License (GPL)
    ... ... @@ -44,6 +42,7 @@
    44 42 
     # Please fill the missing licenses for dependencies :
    45 43 
     #
    46 44 
     #
    47 
    -#Tue Feb 05 15:34:51 CET 2019
    48 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    45 
    +#Wed Apr 10 17:16:54 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
    49 48 
     org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0

  • server-runner/src/license/THIRD-PARTY.properties
    ... ... @@ -17,9 +17,7 @@
    17 17 
     # - Eclipse Distribution License - v 1.0
    18 18 
     # - Eclipse Distribution License v. 1.0
    19 19 
     # - Eclipse Public License v1.0
    20 
    -# - Eclipse Public License, Version 1.0
    21 20 
     # - GNU General Public License, Version 2 with the Classpath Exception
    22 
    -# - GNU Lesser General Public License, Version 2.1
    23 21 
     # - GNU Library General Public License v2.1 or later
    24 22 
     # - GPL2 w/ CPE
    25 23 
     # - General Public License (GPL)
    ... ... @@ -42,6 +40,7 @@
    42 40 
     # Please fill the missing licenses for dependencies :
    43 41 
     #
    44 42 
     #
    45 
    -#Tue Feb 05 15:35:38 CET 2019
    46 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    43 
    +#Wed Apr 10 17:17:40 CEST 2019
    44 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    45 
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0
    47 46 
     org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0

  • services-client/src/license/THIRD-PARTY.properties
    ... ... @@ -14,9 +14,7 @@
    14 14 
     # - Eclipse Distribution License v. 1.0
    15 15 
     # - Eclipse Public License 1.0
    16 16 
     # - Eclipse Public License v1.0
    17 
    -# - Eclipse Public License, Version 1.0
    18 17 
     # - GNU General Public License, Version 2 with the Classpath Exception
    19 
    -# - GNU Lesser General Public License, Version 2.1
    20 18 
     # - GNU Library General Public License v2.1 or later
    21 19 
     # - GPL2 w/ CPE
    22 20 
     # - General Public License (GPL)
    ... ... @@ -35,5 +33,6 @@
    35 33 
     # Please fill the missing licenses for dependencies :
    36 34 
     #
    37 35 
     #
    38 
    -#Tue Feb 05 15:34:44 CET 2019
    39 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    36 
    +#Wed Apr 10 17:16:48 CEST 2019
    37 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    38 
    +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0

  • services-local/src/license/THIRD-PARTY.properties
    ... ... @@ -14,9 +14,7 @@
    14 14 
     # - Eclipse Distribution License v. 1.0
    15 15 
     # - Eclipse Public License 1.0
    16 16 
     # - Eclipse Public License v1.0
    17 
    -# - Eclipse Public License, Version 1.0
    18 17 
     # - GNU General Public License, Version 2 with the Classpath Exception
    19 
    -# - GNU Lesser General Public License, Version 2.1
    20 18 
     # - GNU Library General Public License v2.1 or later
    21 19 
     # - GPL2 w/ CPE
    22 20 
     # - General Public License (GPL)
    ... ... @@ -36,5 +34,6 @@
    36 34 
     # Please fill the missing licenses for dependencies :
    37 35 
     #
    38 36 
     #
    39 
    -#Tue Feb 05 15:32:12 CET 2019
    40 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    37 
    +#Wed Apr 10 17:13:47 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
    ... ... @@ -14,9 +14,7 @@
    14 14 
     # - Eclipse Distribution License v. 1.0
    15 15 
     # - Eclipse Public License 1.0
    16 16 
     # - Eclipse Public License v1.0
    17 
    -# - Eclipse Public License, Version 1.0
    18 17 
     # - GNU General Public License, Version 2 with the Classpath Exception
    19 
    -# - GNU Lesser General Public License, Version 2.1
    20 18 
     # - GNU Library General Public License v2.1 or later
    21 19 
     # - GPL2 w/ CPE
    22 20 
     # - General Public License (GPL)
    ... ... @@ -35,5 +33,6 @@
    35 33 
     # Please fill the missing licenses for dependencies :
    36 34 
     #
    37 35 
     #
    38 
    -#Tue Feb 05 15:32:08 CET 2019
    39 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    36 
    +#Wed Apr 10 17:13:44 CEST 2019
    37 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0
    38 
    +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.observe.entities.referentiel.seine.ObjectOperation#0#3'
    170 
    +      and (dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' Or a.vesselActivitySeine.id = 'fr.ird.observe.entities.referentiel.seine.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 15:47:11 CEST 2019
    21 
    +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0

  • validation/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 15:55:38 CEST 2018
    25 
    -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
    24 
    +#Wed Apr 10 17:13:22 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

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