Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
cad84436
by Tony CHEMIT at 2018-04-14T22:45:35Z
6 changed files:
- pom.xml
- t3-domain/pom.xml
- t3-domain/src/main/java/fr/ird/t3/T3Config.java
- t3-installer/pom.xml
- t3-installer/src/main/java/fr/ird/t3/console/T3Console.java
- t3-web/src/license/THIRD-PARTY.properties
Changes:
| ... | ... | @@ -17,13 +17,14 @@ |
| 17 | 17 |
along with this program. If not, see <http://www.gnu.org/licenses />.
|
| 18 | 18 |
#L%
|
| 19 | 19 |
-->
|
| 20 |
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 20 |
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
| 21 |
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 21 | 22 |
<modelVersion>4.0.0</modelVersion>
|
| 22 | 23 |
|
| 23 | 24 |
<parent>
|
| 24 | 25 |
<groupId>io.ultreia.maven</groupId>
|
| 25 | 26 |
<artifactId>pom</artifactId>
|
| 26 |
- <version>2018.25</version>
|
|
| 27 |
+ <version>2018.29</version>
|
|
| 27 | 28 |
</parent>
|
| 28 | 29 |
|
| 29 | 30 |
<groupId>fr.ird.t3</groupId>
|
| ... | ... | @@ -283,13 +284,13 @@ |
| 283 | 284 |
<configuration>
|
| 284 | 285 |
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
| 285 | 286 |
<tasks>
|
| 286 |
- <echo message="Copy model to site" />
|
|
| 287 |
+ <echo message="Copy model to site"/>
|
|
| 287 | 288 |
<copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model">
|
| 288 | 289 |
<fileset dir="${basedir}/doc/modelisation/t3">
|
| 289 |
- <include name="**/*.png" />
|
|
| 290 |
+ <include name="**/*.png"/>
|
|
| 290 | 291 |
</fileset>
|
| 291 | 292 |
<fileset dir="${basedir}/t3-domain/src/main/xmi">
|
| 292 |
- <include name="t3-persistence.zargo" />
|
|
| 293 |
+ <include name="t3-persistence.zargo"/>
|
|
| 293 | 294 |
</fileset>
|
| 294 | 295 |
</copy>
|
| 295 | 296 |
</tasks>
|
| ... | ... | @@ -366,7 +367,7 @@ |
| 366 | 367 |
|
| 367 | 368 |
<plugin>
|
| 368 | 369 |
<groupId>io.ultreia.java4all.config</groupId>
|
| 369 |
- <artifactId>nuiton-config-maven-plugin</artifactId>
|
|
| 370 |
+ <artifactId>config-maven-plugin</artifactId>
|
|
| 370 | 371 |
<version>${lib.version.nuiton.config}</version>
|
| 371 | 372 |
<inherited>false</inherited>
|
| 372 | 373 |
<reportSets>
|
| ... | ... | @@ -476,8 +477,8 @@ |
| 476 | 477 |
<configuration>
|
| 477 | 478 |
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
| 478 | 479 |
<tasks>
|
| 479 |
- <echo message="Delete test data cache at ${test.cache.dir}" />
|
|
| 480 |
- <delete dir="${test.cache.dir}" />
|
|
| 480 |
+ <echo message="Delete test data cache at ${test.cache.dir}"/>
|
|
| 481 |
+ <delete dir="${test.cache.dir}"/>
|
|
| 481 | 482 |
</tasks>
|
| 482 | 483 |
</configuration>
|
| 483 | 484 |
<goals>
|
| ... | ... | @@ -506,8 +507,8 @@ |
| 506 | 507 |
<configuration>
|
| 507 | 508 |
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
| 508 | 509 |
<tasks>
|
| 509 |
- <echo message="Delete installer data cache at ${installer.cache.dir}" />
|
|
| 510 |
- <delete dir="${installer.cache.dir}" />
|
|
| 510 |
+ <echo message="Delete installer data cache at ${installer.cache.dir}"/>
|
|
| 511 |
+ <delete dir="${installer.cache.dir}"/>
|
|
| 511 | 512 |
</tasks>
|
| 512 | 513 |
</configuration>
|
| 513 | 514 |
<goals>
|
| ... | ... | @@ -521,12 +522,12 @@ |
| 521 | 522 |
</profile>
|
| 522 | 523 |
|
| 523 | 524 |
<profile>
|
| 524 |
- <id>load-test-data-found</id>
|
|
| 525 |
- <activation>
|
|
| 526 |
- <file>
|
|
| 527 |
- <exists>../.mvn/cache/test</exists>
|
|
| 528 |
- </file>
|
|
| 529 |
- </activation>
|
|
| 525 |
+ <id>load-test-data-found</id>
|
|
| 526 |
+ <activation>
|
|
| 527 |
+ <file>
|
|
| 528 |
+ <exists>../.mvn/cache/test</exists>
|
|
| 529 |
+ </file>
|
|
| 530 |
+ </activation>
|
|
| 530 | 531 |
<properties>
|
| 531 | 532 |
<test.cache.skip>true</test.cache.skip>
|
| 532 | 533 |
</properties>
|
| ... | ... | @@ -587,5 +588,6 @@ |
| 587 | 588 |
</plugins>
|
| 588 | 589 |
</build>
|
| 589 | 590 |
</profile>
|
| 591 |
+ |
|
| 590 | 592 |
</profiles>
|
| 591 | 593 |
</project>
|
| ... | ... | @@ -70,7 +70,7 @@ |
| 70 | 70 |
|
| 71 | 71 |
<dependency>
|
| 72 | 72 |
<groupId>io.ultreia.java4all.config</groupId>
|
| 73 |
- <artifactId>nuiton-config</artifactId>
|
|
| 73 |
+ <artifactId>config-api</artifactId>
|
|
| 74 | 74 |
</dependency>
|
| 75 | 75 |
|
| 76 | 76 |
<dependency>
|
| ... | ... | @@ -23,12 +23,12 @@ package fr.ird.t3; |
| 23 | 23 |
import com.google.common.base.Charsets;
|
| 24 | 24 |
import com.google.common.io.CharSource;
|
| 25 | 25 |
import com.google.common.io.Resources;
|
| 26 |
+import io.ultreia.java4all.config.ApplicationConfig;
|
|
| 27 |
+import io.ultreia.java4all.config.ArgumentsParserException;
|
|
| 26 | 28 |
import org.apache.commons.logging.Log;
|
| 27 | 29 |
import org.apache.commons.logging.LogFactory;
|
| 28 | 30 |
import org.apache.log4j.LogManager;
|
| 29 | 31 |
import org.apache.log4j.PropertyConfigurator;
|
| 30 |
-import org.nuiton.config.ApplicationConfig;
|
|
| 31 |
-import org.nuiton.config.ArgumentsParserException;
|
|
| 32 | 32 |
import org.nuiton.util.FileUtil;
|
| 33 | 33 |
|
| 34 | 34 |
import java.io.BufferedReader;
|
| ... | ... | @@ -54,7 +54,7 @@ |
| 54 | 54 |
|
| 55 | 55 |
<dependency>
|
| 56 | 56 |
<groupId>io.ultreia.java4all.config</groupId>
|
| 57 |
- <artifactId>nuiton-config</artifactId>
|
|
| 57 |
+ <artifactId>config-api</artifactId>
|
|
| 58 | 58 |
</dependency>
|
| 59 | 59 |
|
| 60 | 60 |
<dependency>
|
| ... | ... | @@ -23,7 +23,7 @@ package fr.ird.t3.console; |
| 23 | 23 |
|
| 24 | 24 |
import fr.ird.t3.T3Config;
|
| 25 | 25 |
import fr.ird.t3.installer.T3InstallerConfig;
|
| 26 |
-import org.nuiton.config.ApplicationConfig;
|
|
| 26 |
+import io.ultreia.java4all.config.ApplicationConfig;
|
|
| 27 | 27 |
|
| 28 | 28 |
import java.io.File;
|
| 29 | 29 |
import java.util.Arrays;
|
| ... | ... | @@ -31,7 +31,6 @@ |
| 31 | 31 |
# Please fill the missing licenses for dependencies :
|
| 32 | 32 |
#
|
| 33 | 33 |
#
|
| 34 |
-#Sun Feb 18 02:37:45 CET 2018
|
|
| 34 |
+#Sun Apr 15 00:37:39 CEST 2018
|
|
| 35 | 35 |
commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
|
| 36 | 36 |
dom4j--dom4j--1.6.1=BSD License
|
| 37 |
-oro--oro--2.0.8=The Apache Software License, Version 2.0
|