Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b0db79e8 by Tony CHEMIT at 2018-04-14T22:15:00Z use new java4all config lib - - - - - 4 changed files: - pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-installer/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -17,13 +17,14 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.25</version> + <version>2018.28</version> </parent> <groupId>fr.ird.t3</groupId> @@ -95,6 +96,8 @@ <properties> + <lib.version.nuiton.config>1.0.0-SNAPSHOT</lib.version.nuiton.config> + <organizationId>ultreiaio</organizationId> <projectId>ird-t3</projectId> <stageId>frirdt3</stageId> @@ -283,13 +286,13 @@ <configuration> <!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... --> <tasks> - <echo message="Copy model to site" /> + <echo message="Copy model to site"/> <copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model"> <fileset dir="${basedir}/doc/modelisation/t3"> - <include name="**/*.png" /> + <include name="**/*.png"/> </fileset> <fileset dir="${basedir}/t3-domain/src/main/xmi"> - <include name="t3-persistence.zargo" /> + <include name="t3-persistence.zargo"/> </fileset> </copy> </tasks> @@ -366,7 +369,7 @@ <plugin> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config-maven-plugin</artifactId> + <artifactId>config-maven-plugin</artifactId> <version>${lib.version.nuiton.config}</version> <inherited>false</inherited> <reportSets> @@ -476,8 +479,8 @@ <configuration> <!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... --> <tasks> - <echo message="Delete test data cache at ${test.cache.dir}" /> - <delete dir="${test.cache.dir}" /> + <echo message="Delete test data cache at ${test.cache.dir}"/> + <delete dir="${test.cache.dir}"/> </tasks> </configuration> <goals> @@ -506,8 +509,8 @@ <configuration> <!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... --> <tasks> - <echo message="Delete installer data cache at ${installer.cache.dir}" /> - <delete dir="${installer.cache.dir}" /> + <echo message="Delete installer data cache at ${installer.cache.dir}"/> + <delete dir="${installer.cache.dir}"/> </tasks> </configuration> <goals> @@ -521,12 +524,12 @@ </profile> <profile> - <id>load-test-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/test</exists> - </file> - </activation> + <id>load-test-data-found</id> + <activation> + <file> + <exists>../.mvn/cache/test</exists> + </file> + </activation> <properties> <test.cache.skip>true</test.cache.skip> </properties> @@ -587,5 +590,36 @@ </plugins> </build> </profile> + + + <!--FIXME Readd after first release of java4all.config--> + <profile> + <id>generate-config-profile</id> + <activation> + <file> + <exists>${basedir}/src/main/config</exists> + </file> + </activation> + <build> + <plugins> + <plugin> + <groupId>io.ultreia.java4all.config</groupId> + <artifactId>config-maven-plugin</artifactId> + <version>1.0.0-SNAPSHOT</version> + <executions> + <execution> + <phase>generate-sources</phase> + <id>default-generate</id> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> </project> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -70,7 +70,8 @@ <dependency> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>config-api</artifactId> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> ===================================== t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Config.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -23,12 +23,12 @@ package fr.ird.t3; import com.google.common.base.Charsets; import com.google.common.io.CharSource; import com.google.common.io.Resources; +import io.ultreia.java4all.config.ApplicationConfig; +import io.ultreia.java4all.config.ArgumentsParserException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.log4j.LogManager; import org.apache.log4j.PropertyConfigurator; -import org.nuiton.config.ApplicationConfig; -import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; import java.io.BufferedReader; ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -54,7 +54,8 @@ <dependency> <groupId>io.ultreia.java4all.config</groupId> - <artifactId>nuiton-config</artifactId> + <artifactId>config-api</artifactId> + <version>1.0.0-SNAPSHOT</version> </dependency> <dependency> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b0db79e89e4cd4211ac8c96a50224a164... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/b0db79e89e4cd4211ac8c96a50224a164... You're receiving this email because of your account on gitlab.com.