Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
666a6250
by Tony CHEMIT at 2017-08-17T17:02:52+02:00
-
07b55275
by Tony CHEMIT at 2017-08-17T17:03:03+02:00
-
d8fd85fa
by Tony CHEMIT at 2017-08-18T13:57:40+02:00
4 changed files:
- client-configuration/src/license/THIRD-PARTY.properties
- client/pom.xml
- pom.xml
- server-configuration/src/license/THIRD-PARTY.properties
Changes:
| 1 | 1 |
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
|
| 2 | 2 |
#-------------------------------------------------------------------------------
|
| 3 | 3 |
# Already used licenses in project :
|
| 4 |
-# - AL 2.0
|
|
| 5 | 4 |
# - Apache 2.0
|
| 6 | 5 |
# - Apache License 2.0
|
| 7 |
-# - Apache License, version 2.0
|
|
| 8 | 6 |
# - BSD License
|
| 9 | 7 |
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
|
| 10 |
-# - Common Development and Distribution License
|
|
| 11 |
-# - Eclipse Distribution License (EDL), Version 1.0
|
|
| 12 |
-# - Eclipse Public License (EPL), Version 1.0
|
|
| 13 |
-# - Eclipse Public License, Version 1.0
|
|
| 14 |
-# - GNU General Public License, Version 2 with the Classpath Exception
|
|
| 15 |
-# - GNU Lesser General Public License, Version 2.1
|
|
| 16 | 8 |
# - General Public License (GPL)
|
| 17 |
-# - Indiana University Extreme! Lab Software License, vesion 1.1.1
|
|
| 9 |
+# - Indiana University Extreme! Lab Software License, version 1.1.1
|
|
| 18 | 10 |
# - Lesser General Public License (LGPL)
|
| 19 | 11 |
# - Lesser General Public License (LGPL) v 3.0
|
| 20 | 12 |
# - Lesser General Public License (LPGL)
|
| 21 | 13 |
# - Lesser General Public License (LPGL) v 2.1
|
| 22 | 14 |
# - MIT License
|
| 23 | 15 |
# - MPL 1.1
|
| 24 |
-# - Public Domain
|
|
| 25 | 16 |
# - The Apache Software License, Version 2.0
|
| 17 |
+# - The MIT License
|
|
| 26 | 18 |
# - The New BSD License
|
| 27 |
-# - The PostgreSQL License
|
|
| 28 | 19 |
# - WTFPL
|
| 29 | 20 |
#-------------------------------------------------------------------------------
|
| 30 | 21 |
# Please fill the missing licenses for dependencies :
|
| 31 | 22 |
#
|
| 32 | 23 |
#
|
| 33 |
-#Fri Nov 25 18:31:24 CET 2016
|
|
| 24 |
+#Thu Aug 17 16:45:44 CEST 2017
|
|
| 34 | 25 |
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
|
| 35 |
-dom4j--dom4j--1.6.1=BSD License
|
| ... | ... | @@ -50,8 +50,6 @@ |
| 50 | 50 |
<applicationName>observe</applicationName>
|
| 51 | 51 |
|
| 52 | 52 |
<i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName>
|
| 53 |
- <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile>
|
|
| 54 |
- <i18n.bundleCsvSeparator>|</i18n.bundleCsvSeparator>
|
|
| 55 | 53 |
|
| 56 | 54 |
<!-- generate license bundled files -->
|
| 57 | 55 |
<license.generateBundle>true</license.generateBundle>
|
| ... | ... | @@ -341,6 +339,12 @@ |
| 341 | 339 |
<version>${project.version}</version>
|
| 342 | 340 |
<scope>runtime</scope>
|
| 343 | 341 |
</dependency>
|
| 342 |
+ <dependency>
|
|
| 343 |
+ <groupId>${project.groupId}</groupId>
|
|
| 344 |
+ <artifactId>persistence</artifactId>
|
|
| 345 |
+ <version>${project.version}</version>
|
|
| 346 |
+ <scope>runtime</scope>
|
|
| 347 |
+ </dependency>
|
|
| 344 | 348 |
<!-- Pour avoir les traductions de la configuration dans un seul bundle ... !-->
|
| 345 | 349 |
<dependency>
|
| 346 | 350 |
<groupId>${project.groupId}</groupId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>io.ultreia.maven</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>17</version>
|
|
| 29 |
+ <version>20</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -138,7 +138,7 @@ |
| 138 | 138 |
</scm>
|
| 139 | 139 |
<issueManagement>
|
| 140 | 140 |
<system>gitlab</system>
|
| 141 |
- <url>https://gitlab.com/ultreia.io/ird-observe</url>
|
|
| 141 |
+ <url>https://gitlab.com/${organizationId}/${projectId}</url>
|
|
| 142 | 142 |
</issueManagement>
|
| 143 | 143 |
<distributionManagement>
|
| 144 | 144 |
<site>
|
| ... | ... | @@ -169,7 +169,7 @@ |
| 169 | 169 |
<processorPluginVersion>1.3</processorPluginVersion>
|
| 170 | 170 |
|
| 171 | 171 |
<jaxxVersion>3.0-alpha-10</jaxxVersion>
|
| 172 |
- <nuitonI18nVersion>4.0-alpha-3</nuitonI18nVersion>
|
|
| 172 |
+ <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion>
|
|
| 173 | 173 |
<nuitonConfigVersion>3.2</nuitonConfigVersion>
|
| 174 | 174 |
<topiaVersion>3.2.1</topiaVersion>
|
| 175 | 175 |
<nuitonValidatorVersion>3.1</nuitonValidatorVersion>
|
| ... | ... | @@ -178,7 +178,7 @@ |
| 178 | 178 |
<nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion>
|
| 179 | 179 |
<httpVersion>1.0.3</httpVersion>
|
| 180 | 180 |
<xworkVersion>2.3.33</xworkVersion>
|
| 181 |
- <flexmarkVersion>0.22.18</flexmarkVersion>
|
|
| 181 |
+ <flexmarkVersion>0.26.4</flexmarkVersion>
|
|
| 182 | 182 |
<hibernateVersion>5.1.9.Final</hibernateVersion>
|
| 183 | 183 |
<sl4jVersion>1.7.25</sl4jVersion>
|
| 184 | 184 |
<swingXVersion>1.6.5-1</swingXVersion>
|
| ... | ... | @@ -186,7 +186,7 @@ |
| 186 | 186 |
<webmotionVersion>2.5.3</webmotionVersion>
|
| 187 | 187 |
<httpComponentsVersion>4.5.3</httpComponentsVersion>
|
| 188 | 188 |
<geoToolsVersion>17.2</geoToolsVersion>
|
| 189 |
- <guavaVersion>22.0</guavaVersion>
|
|
| 189 |
+ <guavaVersion>23.0</guavaVersion>
|
|
| 190 | 190 |
|
| 191 | 191 |
<!-- license header configuration -->
|
| 192 | 192 |
<license.licenseName>gpl_v3</license.licenseName>
|
| ... | ... | @@ -199,6 +199,7 @@ |
| 199 | 199 |
<i18n.checkBundle>true</i18n.checkBundle>
|
| 200 | 200 |
<i18n.showEmpty>true</i18n.showEmpty>
|
| 201 | 201 |
<i18n.failsIfDuplicatedKeys>true</i18n.failsIfDuplicatedKeys>
|
| 202 |
+ <i18n.removeDuplicatedKeys>true</i18n.removeDuplicatedKeys>
|
|
| 202 | 203 |
|
| 203 | 204 |
<!--config configuration-->
|
| 204 | 205 |
<config.useNuitonI18n>true</config.useNuitonI18n>
|
| ... | ... | @@ -213,6 +214,7 @@ |
| 213 | 214 |
<gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor>
|
| 214 | 215 |
<gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail>
|
| 215 | 216 |
<gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers>
|
| 217 |
+ <gitlab.fromMilestone>5.0</gitlab.fromMilestone>
|
|
| 216 | 218 |
|
| 217 | 219 |
<!-- deploy nothing -->
|
| 218 | 220 |
<maven.deploy.skip>true</maven.deploy.skip>
|
| ... | ... | @@ -720,7 +722,7 @@ |
| 720 | 722 |
<dependency>
|
| 721 | 723 |
<groupId>javax.servlet</groupId>
|
| 722 | 724 |
<artifactId>javax.servlet-api</artifactId>
|
| 723 |
- <version>4.0.0-b07</version>
|
|
| 725 |
+ <version>4.0.0</version>
|
|
| 724 | 726 |
<scope>provided</scope>
|
| 725 | 727 |
</dependency>
|
| 726 | 728 |
|
| 1 | 1 |
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
|
| 2 | 2 |
#-------------------------------------------------------------------------------
|
| 3 | 3 |
# Already used licenses in project :
|
| 4 |
-# - AL 2.0
|
|
| 5 | 4 |
# - Apache 2.0
|
| 6 | 5 |
# - Apache License 2.0
|
| 7 |
-# - Apache License, version 2.0
|
|
| 8 | 6 |
# - BSD License
|
| 9 | 7 |
# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
|
| 10 |
-# - Common Development and Distribution License
|
|
| 11 |
-# - Eclipse Distribution License (EDL), Version 1.0
|
|
| 12 |
-# - Eclipse Public License (EPL), Version 1.0
|
|
| 13 |
-# - Eclipse Public License, Version 1.0
|
|
| 14 |
-# - GNU General Public License, Version 2 with the Classpath Exception
|
|
| 15 |
-# - GNU Lesser General Public License, Version 2.1
|
|
| 16 | 8 |
# - General Public License (GPL)
|
| 17 |
-# - Indiana University Extreme! Lab Software License, vesion 1.1.1
|
|
| 9 |
+# - Indiana University Extreme! Lab Software License, version 1.1.1
|
|
| 18 | 10 |
# - Lesser General Public License (LGPL)
|
| 19 | 11 |
# - Lesser General Public License (LGPL) v 3.0
|
| 20 | 12 |
# - Lesser General Public License (LPGL)
|
| ... | ... | @@ -22,15 +14,13 @@ |
| 22 | 14 |
# - MIT License
|
| 23 | 15 |
# - MPL 1.1
|
| 24 | 16 |
# - New BSD License
|
| 25 |
-# - Public Domain
|
|
| 26 | 17 |
# - The Apache Software License, Version 2.0
|
| 18 |
+# - The MIT License
|
|
| 27 | 19 |
# - The New BSD License
|
| 28 |
-# - The PostgreSQL License
|
|
| 29 | 20 |
# - WTFPL
|
| 30 | 21 |
#-------------------------------------------------------------------------------
|
| 31 | 22 |
# Please fill the missing licenses for dependencies :
|
| 32 | 23 |
#
|
| 33 | 24 |
#
|
| 34 |
-#Fri Nov 25 18:31:14 CET 2016
|
|
| 25 |
+#Thu Aug 17 16:45:41 CEST 2017
|
|
| 35 | 26 |
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
|
| 36 |
-dom4j--dom4j--1.6.1=BSD License
|