| ... |
... |
@@ -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.28</version>
|
|
27
|
28
|
</parent>
|
|
28
|
29
|
|
|
29
|
30
|
<groupId>fr.ird.t3</groupId>
|
| ... |
... |
@@ -95,6 +96,8 @@ |
|
95
|
96
|
|
|
96
|
97
|
<properties>
|
|
97
|
98
|
|
|
|
99
|
+ <lib.version.nuiton.config>1.0.0-SNAPSHOT</lib.version.nuiton.config>
|
|
|
100
|
+
|
|
98
|
101
|
<organizationId>ultreiaio</organizationId>
|
|
99
|
102
|
<projectId>ird-t3</projectId>
|
|
100
|
103
|
<stageId>frirdt3</stageId>
|
| ... |
... |
@@ -283,13 +286,13 @@ |
|
283
|
286
|
<configuration>
|
|
284
|
287
|
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
|
285
|
288
|
<tasks>
|
|
286
|
|
- <echo message="Copy model to site" />
|
|
|
289
|
+ <echo message="Copy model to site"/>
|
|
287
|
290
|
<copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model">
|
|
288
|
291
|
<fileset dir="${basedir}/doc/modelisation/t3">
|
|
289
|
|
- <include name="**/*.png" />
|
|
|
292
|
+ <include name="**/*.png"/>
|
|
290
|
293
|
</fileset>
|
|
291
|
294
|
<fileset dir="${basedir}/t3-domain/src/main/xmi">
|
|
292
|
|
- <include name="t3-persistence.zargo" />
|
|
|
295
|
+ <include name="t3-persistence.zargo"/>
|
|
293
|
296
|
</fileset>
|
|
294
|
297
|
</copy>
|
|
295
|
298
|
</tasks>
|
| ... |
... |
@@ -366,7 +369,7 @@ |
|
366
|
369
|
|
|
367
|
370
|
<plugin>
|
|
368
|
371
|
<groupId>io.ultreia.java4all.config</groupId>
|
|
369
|
|
- <artifactId>nuiton-config-maven-plugin</artifactId>
|
|
|
372
|
+ <artifactId>config-maven-plugin</artifactId>
|
|
370
|
373
|
<version>${lib.version.nuiton.config}</version>
|
|
371
|
374
|
<inherited>false</inherited>
|
|
372
|
375
|
<reportSets>
|
| ... |
... |
@@ -476,8 +479,8 @@ |
|
476
|
479
|
<configuration>
|
|
477
|
480
|
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
|
478
|
481
|
<tasks>
|
|
479
|
|
- <echo message="Delete test data cache at ${test.cache.dir}" />
|
|
480
|
|
- <delete dir="${test.cache.dir}" />
|
|
|
482
|
+ <echo message="Delete test data cache at ${test.cache.dir}"/>
|
|
|
483
|
+ <delete dir="${test.cache.dir}"/>
|
|
481
|
484
|
</tasks>
|
|
482
|
485
|
</configuration>
|
|
483
|
486
|
<goals>
|
| ... |
... |
@@ -506,8 +509,8 @@ |
|
506
|
509
|
<configuration>
|
|
507
|
510
|
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
|
508
|
511
|
<tasks>
|
|
509
|
|
- <echo message="Delete installer data cache at ${installer.cache.dir}" />
|
|
510
|
|
- <delete dir="${installer.cache.dir}" />
|
|
|
512
|
+ <echo message="Delete installer data cache at ${installer.cache.dir}"/>
|
|
|
513
|
+ <delete dir="${installer.cache.dir}"/>
|
|
511
|
514
|
</tasks>
|
|
512
|
515
|
</configuration>
|
|
513
|
516
|
<goals>
|
| ... |
... |
@@ -521,12 +524,12 @@ |
|
521
|
524
|
</profile>
|
|
522
|
525
|
|
|
523
|
526
|
<profile>
|
|
524
|
|
- <id>load-test-data-found</id>
|
|
525
|
|
- <activation>
|
|
526
|
|
- <file>
|
|
527
|
|
- <exists>../.mvn/cache/test</exists>
|
|
528
|
|
- </file>
|
|
529
|
|
- </activation>
|
|
|
527
|
+ <id>load-test-data-found</id>
|
|
|
528
|
+ <activation>
|
|
|
529
|
+ <file>
|
|
|
530
|
+ <exists>../.mvn/cache/test</exists>
|
|
|
531
|
+ </file>
|
|
|
532
|
+ </activation>
|
|
530
|
533
|
<properties>
|
|
531
|
534
|
<test.cache.skip>true</test.cache.skip>
|
|
532
|
535
|
</properties>
|
| ... |
... |
@@ -587,5 +590,36 @@ |
|
587
|
590
|
</plugins>
|
|
588
|
591
|
</build>
|
|
589
|
592
|
</profile>
|
|
|
593
|
+
|
|
|
594
|
+
|
|
|
595
|
+ <!--FIXME Readd after first release of java4all.config-->
|
|
|
596
|
+ <profile>
|
|
|
597
|
+ <id>generate-config-profile</id>
|
|
|
598
|
+ <activation>
|
|
|
599
|
+ <file>
|
|
|
600
|
+ <exists>${basedir}/src/main/config</exists>
|
|
|
601
|
+ </file>
|
|
|
602
|
+ </activation>
|
|
|
603
|
+ <build>
|
|
|
604
|
+ <plugins>
|
|
|
605
|
+ <plugin>
|
|
|
606
|
+ <groupId>io.ultreia.java4all.config</groupId>
|
|
|
607
|
+ <artifactId>config-maven-plugin</artifactId>
|
|
|
608
|
+ <version>1.0.0-SNAPSHOT</version>
|
|
|
609
|
+ <executions>
|
|
|
610
|
+ <execution>
|
|
|
611
|
+ <phase>generate-sources</phase>
|
|
|
612
|
+ <id>default-generate</id>
|
|
|
613
|
+ <goals>
|
|
|
614
|
+ <goal>generate</goal>
|
|
|
615
|
+ </goals>
|
|
|
616
|
+ </execution>
|
|
|
617
|
+ </executions>
|
|
|
618
|
+ </plugin>
|
|
|
619
|
+
|
|
|
620
|
+ </plugins>
|
|
|
621
|
+ </build>
|
|
|
622
|
+ </profile>
|
|
|
623
|
+
|
|
590
|
624
|
</profiles>
|
|
591
|
625
|
</project>
|