Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 73e6cd20 by tchemit at 2019-04-10T15:19:13Z Bug requête tableau synthèse DCP - Closes #1244 - - - - - da17f0c0 by tchemit at 2019-04-10T15:19:48Z update pom - - - - - 16 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client-core/src/license/THIRD-PARTY.properties - client-runner/src/license/THIRD-PARTY.properties - dto/src/license/THIRD-PARTY.properties - + observe-i18n/src/license/THIRD-PARTY.properties - persistence/src/license/THIRD-PARTY.properties - pom.xml - server-configuration/src/license/THIRD-PARTY.properties - server-core/src/license/THIRD-PARTY.properties - server-runner/src/license/THIRD-PARTY.properties - services-client/src/license/THIRD-PARTY.properties - services-local/src/license/THIRD-PARTY.properties - services/src/license/THIRD-PARTY.properties - services/src/main/resources/observe-reports.properties - + test/src/license/THIRD-PARTY.properties - validation/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:55 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:56 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== client-core/src/license/THIRD-PARTY.properties ===================================== @@ -17,10 +17,8 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -48,6 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:14 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:14 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== client-runner/src/license/THIRD-PARTY.properties ===================================== @@ -16,11 +16,8 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - Eclipse Publish License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -47,6 +44,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:42 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:43 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== dto/src/license/THIRD-PARTY.properties ===================================== @@ -1,12 +1,13 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2.0 # - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -15,9 +16,11 @@ # - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:22:53 CEST 2015 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:12:33 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== observe-i18n/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,19 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 15:52:17 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== persistence/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GNU Library or Lesser General Public License # - GPL2 w/ CPE @@ -37,5 +35,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:31:54 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:35 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.12</version> + <version>2019.8.13</version> </parent> <groupId>fr.ird.observe</groupId> @@ -159,7 +159,6 @@ <!--<lib.version.java4all.http>1.0.13</lib.version.java4all.http>--> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation> <!--<lib.version.java4all.config>1.0.3</lib.version.java4all.config>--> - <xworkVersion>2.3.35</xworkVersion> <!--can't use 1.4.197 (date has changed + blob also--> <lib.version.h2>1.4.196</lib.version.h2> @@ -235,7 +234,7 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${xworkVersion}</version> + <version>${lib.xwork.version}</version> <exclusions> <exclusion> <groupId>javassist</groupId> ===================================== server-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 16:06:54 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:51 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== server-core/src/license/THIRD-PARTY.properties ===================================== @@ -19,9 +19,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -44,6 +42,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:51 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:54 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== server-runner/src/license/THIRD-PARTY.properties ===================================== @@ -17,9 +17,7 @@ # - Eclipse Distribution License - v 1.0 # - Eclipse Distribution License v. 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -42,6 +40,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:35:38 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:17:40 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:34:44 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:16:48 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services-local/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -36,5 +34,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:32:12 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:47 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 ===================================== services/src/license/THIRD-PARTY.properties ===================================== @@ -14,9 +14,7 @@ # - Eclipse Distribution License v. 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License v1.0 -# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - GNU Library General Public License v2.1 or later # - GPL2 w/ CPE # - General Public License (GPL) @@ -35,5 +33,6 @@ # Please fill the missing licenses for dependencies : # # -#Tue Feb 05 15:32:08 CET 2019 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:44 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +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|\ Where \ m.id In :tripId \ and (dcp.computedWhenLeavingSimplifiedObjectType = :typeObjetId Or dcp.computedWhenArrivingSimplifiedObjectType = :typeObjetId) \ - and dcp.objectOperation.id = 'fr.ird.observe.entities.referentiel.seine.ObjectOperation#0#3' + 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') report.dcpUsage.request.3.repeat=typeObjetId|column # mis a l'eau report.dcpUsage.request.4=3,0|row|\ ===================================== test/src/license/THIRD-PARTY.properties ===================================== @@ -0,0 +1,21 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License 1.0 +# - Indiana University Extreme! Lab Software License, version 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - New BSD License +# - The Apache Software License, Version 2.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Wed Apr 10 15:47:11 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 ===================================== validation/src/license/THIRD-PARTY.properties ===================================== @@ -21,5 +21,6 @@ # Please fill the missing licenses for dependencies : # # -#Fri Oct 19 15:55:38 CEST 2018 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +#Wed Apr 10 17:13:22 CEST 2019 +commons-collections--commons-collections--20040616=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--20041207.202534=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f10649bb1d1d621003c877c1cba... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f10649bb1d1d621003c877c1cba... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT