Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
f9304adc
by 166231 at 2017-04-10T14:24:20+00:00
12 changed files:
- pom.xml
- t3-actions/pom.xml
- t3-domain/pom.xml
- t3-input-avdthv33/pom.xml
- t3-input-avdthv35/pom.xml
- t3-input-avdthv36/pom.xml
- t3-installer/pom.xml
- t3-msaccess-importer/pom.xml
- t3-output-balbayav32/pom.xml
- t3-test/pom.xml
- t3-web/pom.xml
- t3/pom.xml
Changes:
| ... | ... | @@ -17,8 +17,7 @@ |
| 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"
|
|
| 21 |
- 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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 22 | 21 |
<modelVersion>4.0.0</modelVersion>
|
| 23 | 22 |
|
| 24 | 23 |
<parent>
|
| ... | ... | @@ -29,7 +28,7 @@ |
| 29 | 28 |
|
| 30 | 29 |
<groupId>fr.ird.t3</groupId>
|
| 31 | 30 |
<artifactId>pom</artifactId>
|
| 32 |
- <version>2.0-SNAPSHOT</version>
|
|
| 31 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 33 | 32 |
<packaging>pom</packaging>
|
| 34 | 33 |
|
| 35 | 34 |
<name>T3</name>
|
| ... | ... | @@ -474,14 +473,13 @@ |
| 474 | 473 |
<configuration>
|
| 475 | 474 |
<!-- TODO chemit 2011-02-24 Change to 'target' when using ant-run 1.6 in mavenpom4labs... -->
|
| 476 | 475 |
<tasks>
|
| 477 |
- <echo message="Copy model to site"/>
|
|
| 478 |
- <copy verbose="true" failonerror="false" overwrite="true"
|
|
| 479 |
- todir="${project.reporting.outputDirectory}/model">
|
|
| 476 |
+ <echo message="Copy model to site" />
|
|
| 477 |
+ <copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model">
|
|
| 480 | 478 |
<fileset dir="${basedir}/doc/modelisation/t3">
|
| 481 |
- <include name="**/*.png"/>
|
|
| 479 |
+ <include name="**/*.png" />
|
|
| 482 | 480 |
</fileset>
|
| 483 | 481 |
<fileset dir="${basedir}/t3-domain/src/main/xmi">
|
| 484 |
- <include name="t3-persistence.zargo"/>
|
|
| 482 |
+ <include name="t3-persistence.zargo" />
|
|
| 485 | 483 |
</fileset>
|
| 486 | 484 |
</copy>
|
| 487 | 485 |
</tasks>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-actions</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-domain</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-input-avdthv33</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-input-avdthv35</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-input-avdthv36</artifactId>
|
| ... | ... | @@ -20,15 +20,14 @@ |
| 20 | 20 |
along with this program. If not, see <http://www.gnu.org/licenses />.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
|
| 24 |
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 23 |
+<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">
|
|
| 25 | 24 |
|
| 26 | 25 |
<modelVersion>4.0.0</modelVersion>
|
| 27 | 26 |
|
| 28 | 27 |
<parent>
|
| 29 | 28 |
<groupId>fr.ird.t3</groupId>
|
| 30 | 29 |
<artifactId>pom</artifactId>
|
| 31 |
- <version>2.0-SNAPSHOT</version>
|
|
| 30 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 32 | 31 |
</parent>
|
| 33 | 32 |
|
| 34 | 33 |
<artifactId>t3-installer</artifactId>
|
| ... | ... | @@ -293,12 +292,9 @@ |
| 293 | 292 |
<phase>prepare-package</phase>
|
| 294 | 293 |
<configuration>
|
| 295 | 294 |
<tasks>
|
| 296 |
- <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-ddl.zip"
|
|
| 297 |
- dest="${explodedDataDirection}"/>
|
|
| 298 |
- <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-referential.zip"
|
|
| 299 |
- dest="${explodedDataDirection}"/>
|
|
| 300 |
- <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-zones.zip"
|
|
| 301 |
- dest="${explodedDataDirection}"/>
|
|
| 295 |
+ <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-ddl.zip" dest="${explodedDataDirection}" />
|
|
| 296 |
+ <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-referential.zip" dest="${explodedDataDirection}" />
|
|
| 297 |
+ <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-zones.zip" dest="${explodedDataDirection}" />
|
|
| 302 | 298 |
</tasks>
|
| 303 | 299 |
</configuration>
|
| 304 | 300 |
<goals>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-msaccess-importer</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-output-balbayav32</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-test</artifactId>
|
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 |
<parent>
|
| 25 | 25 |
<groupId>fr.ird.t3</groupId>
|
| 26 | 26 |
<artifactId>pom</artifactId>
|
| 27 |
- <version>2.0-SNAPSHOT</version>
|
|
| 27 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 28 | 28 |
</parent>
|
| 29 | 29 |
|
| 30 | 30 |
<artifactId>t3-web</artifactId>
|
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 |
GNU General Public License for more details.
|
| 17 | 17 |
|
| 18 | 18 |
You should have received a copy of the GNU Affero General Public License
|
| 19 |
- along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
| 19 |
+ along with this program. If not, see <http://www.gnu.org/licenses />.
|
|
| 20 | 20 |
#L%
|
| 21 | 21 |
-->
|
| 22 | 22 |
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.t3</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2.0-SNAPSHOT</version>
|
|
| 29 |
+ <version>2.1-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>t3</artifactId>
|