Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
ab09e865
by Tony CHEMIT at 2018-04-15T12:44:23Z
3 changed files:
Changes:
| ... | ... | @@ -18,7 +18,7 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat |
| 18 | 18 |
.create-docker: &create-docker
|
| 19 | 19 |
environment:
|
| 20 | 20 |
name: docker
|
| 21 |
- image: registry.gitlab.com/ultreiaio/docker/docker:latest
|
|
| 21 |
+ image: registry.gitlab.com/ultreiaio-infra/docker/docker:latest
|
|
| 22 | 22 |
services:
|
| 23 | 23 |
- docker:dind
|
| 24 | 24 |
script:
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>io.ultreia.maven</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2018.29</version>
|
|
| 27 |
+ <version>2018.31</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<groupId>fr.ird.t3</groupId>
|
| ... | ... | @@ -270,6 +270,17 @@ |
| 270 | 270 |
</executions>
|
| 271 | 271 |
</plugin>
|
| 272 | 272 |
|
| 273 |
+ <plugin>
|
|
| 274 |
+ <groupId>org.codehaus.mojo</groupId>
|
|
| 275 |
+ <artifactId>wagon-maven-plugin</artifactId>
|
|
| 276 |
+ <configuration>
|
|
| 277 |
+ <serverId>doc.ultreia.io</serverId>
|
|
| 278 |
+ <url>scpexe://ultreia.io/var/www/t3/private</url>
|
|
| 279 |
+ <skipIfExists>true</skipIfExists>
|
|
| 280 |
+ </configuration>
|
|
| 281 |
+ </plugin>
|
|
| 282 |
+ |
|
| 283 |
+ |
|
| 273 | 284 |
</plugins>
|
| 274 | 285 |
</pluginManagement>
|
| 275 | 286 |
<plugins>
|
| ... | ... | @@ -368,7 +379,7 @@ |
| 368 | 379 |
<plugin>
|
| 369 | 380 |
<groupId>io.ultreia.java4all.config</groupId>
|
| 370 | 381 |
<artifactId>config-maven-plugin</artifactId>
|
| 371 |
- <version>${lib.version.nuiton.config}</version>
|
|
| 382 |
+ <version>${lib.version.java4all.config}</version>
|
|
| 372 | 383 |
<inherited>false</inherited>
|
| 373 | 384 |
<reportSets>
|
| 374 | 385 |
<reportSet>
|
| ... | ... | @@ -522,18 +533,6 @@ |
| 522 | 533 |
</profile>
|
| 523 | 534 |
|
| 524 | 535 |
<profile>
|
| 525 |
- <id>load-test-data-found</id>
|
|
| 526 |
- <activation>
|
|
| 527 |
- <file>
|
|
| 528 |
- <exists>../.mvn/cache/test</exists>
|
|
| 529 |
- </file>
|
|
| 530 |
- </activation>
|
|
| 531 |
- <properties>
|
|
| 532 |
- <test.cache.skip>true</test.cache.skip>
|
|
| 533 |
- </properties>
|
|
| 534 |
- </profile>
|
|
| 535 |
- |
|
| 536 |
- <profile>
|
|
| 537 | 536 |
<id>load-test-data</id>
|
| 538 | 537 |
<activation>
|
| 539 | 538 |
<file>
|
| ... | ... | @@ -575,11 +574,8 @@ |
| 575 | 574 |
<goal>download-single</goal>
|
| 576 | 575 |
</goals>
|
| 577 | 576 |
<configuration>
|
| 578 |
- <serverId>doc.ultreia.io</serverId>
|
|
| 579 |
- <url>scpexe://ultreia.io/var/www/t3/private</url>
|
|
| 580 | 577 |
<fromFile>t3-data-${t3-data.version}-h2.zip</fromFile>
|
| 581 | 578 |
<toDir>${test.cache.dir}</toDir>
|
| 582 |
- <skip>${test.cache.skip}</skip>
|
|
| 583 | 579 |
</configuration>
|
| 584 | 580 |
</execution>
|
| 585 | 581 |
</executions>
|
| ... | ... | @@ -161,10 +161,7 @@ |
| 161 | 161 |
<groupId>org.codehaus.mojo</groupId>
|
| 162 | 162 |
<artifactId>wagon-maven-plugin</artifactId>
|
| 163 | 163 |
<configuration>
|
| 164 |
- <serverId>doc.ultreia.io</serverId>
|
|
| 165 |
- <url>scpexe://ultreia.io/var/www/t3/private</url>
|
|
| 166 | 164 |
<toDir>${installer.cache.dir}</toDir>
|
| 167 |
- <skip>${installer.cache.skip}</skip>
|
|
| 168 | 165 |
</configuration>
|
| 169 | 166 |
<executions>
|
| 170 | 167 |
<execution>
|
| ... | ... | @@ -236,16 +233,5 @@ |
| 236 | 233 |
</build>
|
| 237 | 234 |
</profile>
|
| 238 | 235 |
|
| 239 |
- <profile>
|
|
| 240 |
- <id>load-installer-data-found</id>
|
|
| 241 |
- <activation>
|
|
| 242 |
- <file>
|
|
| 243 |
- <exists>../.mvn/cache/installer</exists>
|
|
| 244 |
- </file>
|
|
| 245 |
- </activation>
|
|
| 246 |
- <properties>
|
|
| 247 |
- <installer.cache.skip>true</installer.cache.skip>
|
|
| 248 |
- </properties>
|
|
| 249 |
- </profile>
|
|
| 250 | 236 |
</profiles>
|
| 251 | 237 |
</project>
|