Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: dec3b2a3 by tchemit at 2019-02-05T16:17:58Z Update to use last hibernate - - - - - 10 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client-core/src/license/THIRD-PARTY.properties - client-runner/src/license/THIRD-PARTY.properties - persistence/src/license/THIRD-PARTY.properties - pom.xml - 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 Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== @@ -4,16 +4,21 @@ # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 General Public License, version 2 (GPL2), 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) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,6 +35,5 @@ # Please fill the missing licenses for dependencies : # # -#Fri May 11 14:26:25 CEST 2018 +#Tue Feb 05 15:34:55 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License ===================================== client-core/src/license/THIRD-PARTY.properties ===================================== @@ -1,37 +1,45 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 2-Clause License +# - BSD 3-clause New License # - BSD License # - BSD License for HSQL +# - CDDL 1.1 +# - CDDL/GPLv2+CE +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License # - EPSG database distribution license -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 class path exception +# - 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 Lesser Public License +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - JDL (Java Distribution License) -# - LGPL 2.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License # - OGC copyright -# - Public Domain # - Similar to Apache License but with the acknowledgment clause removed +# - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License # - The MIT License(MIT) # - The New BSD License # - The PostgreSQL License @@ -40,7 +48,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Sep 01 13:13:00 CEST 2016 +#Tue Feb 05 15:35:14 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== client-runner/src/license/THIRD-PARTY.properties ===================================== @@ -1,23 +1,28 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 2-Clause License +# - BSD 3-clause New License # - BSD License # - BSD License for HSQL +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - Common Development and Distribution License # - EPSG database distribution license -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 class path exception +# - 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 Lesser Public License +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license # - JDL (Java Distribution License) @@ -25,13 +30,15 @@ # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - MIT License +# - MIT license # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License # - OGC copyright -# - Public Domain # - Similar to Apache License but with the acknowledgment clause removed +# - The Apache License, Version 2.0 # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License # - The MIT License(MIT) # - The New BSD License # - The PostgreSQL License @@ -40,7 +47,6 @@ # Please fill the missing licenses for dependencies : # # -#Thu Sep 01 13:13:00 CEST 2016 +#Tue Feb 05 15:35:42 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License javax.media--jai_core--1.1.3=JDL (Java Distribution License) ===================================== persistence/src/license/THIRD-PARTY.properties ===================================== @@ -1,33 +1,41 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 -# - Apache Software License, version 1.1 +# - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Common Public License Version 1.0 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - GPL2 w/ CPE +# - General Public License (GPL) +# - 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) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License -# - Public Domain # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License +# - The PostgreSQL License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Aug 26 01:19:49 CEST 2014 +#Tue Feb 05 15:31:54 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2019.8.4</version> + <version>2019.8.7</version> </parent> <groupId>fr.ird.observe</groupId> @@ -155,18 +155,18 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>3.7.14</observeToolkitVersion> + <observeToolkitVersion>3.7.15</observeToolkitVersion> <!--<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> - <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>--> + <!--can't use 1.4.197 (date has changed + blob also--> <lib.version.h2>1.4.196</lib.version.h2> <lib.version.java4all.eugene>3.0-alpha-26</lib.version.java4all.eugene> <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> - <lib.version.java4all.topia>1.1.11</lib.version.java4all.topia> + <lib.version.java4all.topia>1.1.12</lib.version.java4all.topia> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> @@ -260,6 +260,22 @@ <version>1.08</version> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${lib.version.nuiton.topia}</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-ehcache</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-c3p0</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </dependencyManagement> ===================================== server-core/src/license/THIRD-PARTY.properties ===================================== @@ -1,47 +1,49 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache 2 +# - Apache 2.0 # - Apache License # - Apache License 2.0 # - Apache License, version 2.0 -# - Apache Software License - Version 2.0 +# - BSD 3-clause New License # - BSD License # - BSD licence -# - BSD style # - Bouncy Castle Licence # - CDDL + GPLv2 with classpath exception +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 -# - Eclipse Public License - Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 Lesser Public License +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - 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) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License -# - Public Domain # - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License # - The New BSD License +# - The PostgreSQL License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:23:15 CEST 2015 +#Tue Feb 05 15:34:51 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== server-runner/src/license/THIRD-PARTY.properties ===================================== @@ -1,47 +1,47 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache 2 +# - Apache 2.0 # - Apache License # - Apache License 2.0 # - Apache License, version 2.0 -# - Apache Software License - Version 2.0 +# - BSD 3-clause New License # - BSD License # - BSD licence -# - BSD style # - Bouncy Castle Licence -# - CDDL + GPLv2 with classpath exception +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 -# - Eclipse Public License - Version 1.0 -# - Eclipse Public License 1.0 +# - 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 Lesser Public License +# - GNU Library General Public License v2.1 or later +# - GPL2 w/ CPE # - 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) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License -# - Public Domain # - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License # - The New BSD License +# - The PostgreSQL License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:23:15 CEST 2015 +#Tue Feb 05 15:35:38 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License org.antlr--antlr-runtime--3.3=The Apache Software License, Version 2.0 ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== @@ -4,16 +4,21 @@ # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 General Public License, version 2 (GPL2), 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) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,6 +35,5 @@ # Please fill the missing licenses for dependencies : # # -#Fri May 11 14:26:07 CEST 2018 +#Tue Feb 05 15:34:44 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License ===================================== services-local/src/license/THIRD-PARTY.properties ===================================== @@ -1,34 +1,40 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 +# - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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) -# - 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) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 +# - MPL 2.0 or EPL 1.0 # - New BSD License -# - Public Domain # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The MIT License +# - The PostgreSQL License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Sep 07 10:23:00 CEST 2015 +#Tue Feb 05 15:32:12 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License ===================================== services/src/license/THIRD-PARTY.properties ===================================== @@ -4,16 +4,21 @@ # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause New License # - BSD License +# - CDDL 1.1 +# - CDDL/GPLv2+CE # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Distribution License - v 1.0 +# - 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 General Public License, version 2 (GPL2), 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) # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) @@ -30,6 +35,5 @@ # Please fill the missing licenses for dependencies : # # -#Fri May 11 14:22:56 CEST 2018 +#Tue Feb 05 15:32:08 CET 2019 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dec3b2a39abb6e392b7cea485205... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/dec3b2a39abb6e392b7cea485205... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT