Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 666a6250 by Tony CHEMIT at 2017-08-17T17:02:52+02:00 update third-parties - - - - - 07b55275 by Tony CHEMIT at 2017-08-17T17:03:03+02:00 optimize dependencies - - - - - d8fd85fa by Tony CHEMIT at 2017-08-18T13:57:40+02:00 up some libraries, ready to release - - - - - 4 changed files: - client-configuration/src/license/THIRD-PARTY.properties - client/pom.xml - pom.xml - server-configuration/src/license/THIRD-PARTY.properties Changes: ===================================== client-configuration/src/license/THIRD-PARTY.properties ===================================== --- a/client-configuration/src/license/THIRD-PARTY.properties +++ b/client-configuration/src/license/THIRD-PARTY.properties @@ -1,35 +1,25 @@ # 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 License # - 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 -# - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - 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 -# - Public Domain # - The Apache Software License, Version 2.0 +# - The MIT License # - The New BSD License -# - The PostgreSQL License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 25 18:31:24 CET 2016 +#Thu Aug 17 16:45:44 CEST 2017 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -50,8 +50,6 @@ <applicationName>observe</applicationName> <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> - <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile> - <i18n.bundleCsvSeparator>|</i18n.bundleCsvSeparator> <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> @@ -341,6 +339,12 @@ <version>${project.version}</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>persistence</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> <!-- Pour avoir les traductions de la configuration dans un seul bundle ... !--> <dependency> <groupId>${project.groupId}</groupId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>17</version> + <version>20</version> </parent> <groupId>fr.ird.observe</groupId> @@ -138,7 +138,7 @@ </scm> <issueManagement> <system>gitlab</system> - <url>https://gitlab.com/ultreia.io/ird-observe</url> + <url>https://gitlab.com/${organizationId}/${projectId}</url> </issueManagement> <distributionManagement> <site> @@ -169,7 +169,7 @@ <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-10</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-3</nuitonI18nVersion> + <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -178,7 +178,7 @@ <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <httpVersion>1.0.3</httpVersion> <xworkVersion>2.3.33</xworkVersion> - <flexmarkVersion>0.22.18</flexmarkVersion> + <flexmarkVersion>0.26.4</flexmarkVersion> <hibernateVersion>5.1.9.Final</hibernateVersion> <sl4jVersion>1.7.25</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> @@ -186,7 +186,7 @@ <webmotionVersion>2.5.3</webmotionVersion> <httpComponentsVersion>4.5.3</httpComponentsVersion> <geoToolsVersion>17.2</geoToolsVersion> - <guavaVersion>22.0</guavaVersion> + <guavaVersion>23.0</guavaVersion> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> @@ -199,6 +199,7 @@ <i18n.checkBundle>true</i18n.checkBundle> <i18n.showEmpty>true</i18n.showEmpty> <i18n.failsIfDuplicatedKeys>true</i18n.failsIfDuplicatedKeys> + <i18n.removeDuplicatedKeys>true</i18n.removeDuplicatedKeys> <!--config configuration--> <config.useNuitonI18n>true</config.useNuitonI18n> @@ -213,6 +214,7 @@ <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> + <gitlab.fromMilestone>5.0</gitlab.fromMilestone> <!-- deploy nothing --> <maven.deploy.skip>true</maven.deploy.skip> @@ -720,7 +722,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0-b07</version> + <version>4.0.0</version> <scope>provided</scope> </dependency> ===================================== server-configuration/src/license/THIRD-PARTY.properties ===================================== --- a/server-configuration/src/license/THIRD-PARTY.properties +++ b/server-configuration/src/license/THIRD-PARTY.properties @@ -1,20 +1,12 @@ # 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 License # - 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 -# - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, Version 2.1 # - 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) @@ -22,15 +14,13 @@ # - MIT License # - MPL 1.1 # - New BSD License -# - Public Domain # - The Apache Software License, Version 2.0 +# - The MIT License # - The New BSD License -# - The PostgreSQL License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Nov 25 18:31:14 CET 2016 +#Thu Aug 17 16:45:41 CEST 2017 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/compare/08505b7ca91cbf74a9de7f199a1... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/08505b7ca91cbf74a9de7f199a1... You're receiving this email because of your account on gitlab.com.