Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: ab09e865 by Tony CHEMIT at 2018-04-15T12:44:23Z use last pom + improve configuration - - - - - 3 changed files: - .gitlab-ci.yml - pom.xml - t3-installer/pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,7 +18,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat .create-docker: &create-docker environment: name: docker - image: registry.gitlab.com/ultreiaio/docker/docker:latest + image: registry.gitlab.com/ultreiaio-infra/docker/docker:latest services: - docker:dind script: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.29</version> + <version>2018.31</version> </parent> <groupId>fr.ird.t3</groupId> @@ -270,6 +270,17 @@ </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/www/t3/private</url> + <skipIfExists>true</skipIfExists> + </configuration> + </plugin> + + </plugins> </pluginManagement> <plugins> @@ -368,7 +379,7 @@ <plugin> <groupId>io.ultreia.java4all.config</groupId> <artifactId>config-maven-plugin</artifactId> - <version>${lib.version.nuiton.config}</version> + <version>${lib.version.java4all.config}</version> <inherited>false</inherited> <reportSets> <reportSet> @@ -522,18 +533,6 @@ </profile> <profile> - <id>load-test-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/test</exists> - </file> - </activation> - <properties> - <test.cache.skip>true</test.cache.skip> - </properties> - </profile> - - <profile> <id>load-test-data</id> <activation> <file> @@ -575,11 +574,8 @@ <goal>download-single</goal> </goals> <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/www/t3/private</url> <fromFile>t3-data-${t3-data.version}-h2.zip</fromFile> <toDir>${test.cache.dir}</toDir> - <skip>${test.cache.skip}</skip> </configuration> </execution> </executions> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -161,10 +161,7 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/www/t3/private</url> <toDir>${installer.cache.dir}</toDir> - <skip>${installer.cache.skip}</skip> </configuration> <executions> <execution> @@ -236,16 +233,5 @@ </build> </profile> - <profile> - <id>load-installer-data-found</id> - <activation> - <file> - <exists>../.mvn/cache/installer</exists> - </file> - </activation> - <properties> - <installer.cache.skip>true</installer.cache.skip> - </properties> - </profile> </profiles> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ab09e8651be5ba75499ce81335e3328aa... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/ab09e8651be5ba75499ce81335e3328aa... You're receiving this email because of your account on gitlab.com.