Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
b4af779f
by Tony CHEMIT at 2018-12-04T16:09:50Z
16 changed files:
- client-configuration/pom.xml
- client-core/pom.xml
- client-runner/pom.xml
- dto/pom.xml
- observe-i18n/pom.xml
- observe/pom.xml
- persistence/pom.xml
- pom.xml
- server-configuration/pom.xml
- server-core/pom.xml
- server-runner/pom.xml
- services-client/pom.xml
- services-local/pom.xml
- services/pom.xml
- test/pom.xml
- validation/pom.xml
Changes:
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>client-configuration</artifactId>
|
| ... | ... | @@ -20,14 +20,13 @@ |
| 20 | 20 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 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 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 25 |
|
| 27 | 26 |
<parent>
|
| 28 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 28 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 30 |
</parent>
|
| 32 | 31 |
|
| 33 | 32 |
<artifactId>client-core</artifactId>
|
| ... | ... | @@ -20,14 +20,13 @@ |
| 20 | 20 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 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 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 25 |
|
| 27 | 26 |
<parent>
|
| 28 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 28 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 30 |
</parent>
|
| 32 | 31 |
|
| 33 | 32 |
<artifactId>client-runner</artifactId>
|
| ... | ... | @@ -203,7 +202,7 @@ |
| 203 | 202 |
<phase>generate-resources</phase>
|
| 204 | 203 |
<configuration>
|
| 205 | 204 |
<target>
|
| 206 |
- <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
|
|
| 205 |
+ <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
|
|
| 207 | 206 |
</target>
|
| 208 | 207 |
</configuration>
|
| 209 | 208 |
<goals>
|
| ... | ... | @@ -244,8 +243,8 @@ |
| 244 | 243 |
<phase>integration-test</phase>
|
| 245 | 244 |
<configuration>
|
| 246 | 245 |
<target>
|
| 247 |
- <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar"/>
|
|
| 248 |
- <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe"/>
|
|
| 246 |
+ <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/${applicationJarName}.jar" />
|
|
| 247 |
+ <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/${applicationJarName}.exe" />
|
|
| 249 | 248 |
</target>
|
| 250 | 249 |
</configuration>
|
| 251 | 250 |
<goals>
|
| ... | ... | @@ -21,14 +21,13 @@ |
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 | 23 |
|
| 24 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 25 |
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 24 |
+<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">
|
|
| 26 | 25 |
<modelVersion>4.0.0</modelVersion>
|
| 27 | 26 |
|
| 28 | 27 |
<parent>
|
| 29 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 30 | 29 |
<artifactId>ird-observe</artifactId>
|
| 31 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 30 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 32 | 31 |
</parent>
|
| 33 | 32 |
|
| 34 | 33 |
<artifactId>dto</artifactId>
|
| ... | ... | @@ -254,10 +253,10 @@ |
| 254 | 253 |
<target>
|
| 255 | 254 |
<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models">
|
| 256 | 255 |
<filterset>
|
| 257 |
- <filter value="${observe.model.version}" token="observe.model.version"/>
|
|
| 256 |
+ <filter value="${observe.model.version}" token="observe.model.version" />
|
|
| 258 | 257 |
</filterset>
|
| 259 | 258 |
<fileset dir="${basedir}/src/main/models">
|
| 260 |
- <include name="*.model"/>
|
|
| 259 |
+ <include name="*.model" />
|
|
| 261 | 260 |
</fileset>
|
| 262 | 261 |
</copy>
|
| 263 | 262 |
</target>
|
| ... | ... | @@ -20,14 +20,13 @@ |
| 20 | 20 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 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 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 25 |
|
| 27 | 26 |
<parent>
|
| 28 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 28 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 30 |
</parent>
|
| 32 | 31 |
|
| 33 | 32 |
<artifactId>observe-i18n</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>observe</artifactId>
|
| ... | ... | @@ -20,14 +20,13 @@ |
| 20 | 20 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 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 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 25 |
|
| 27 | 26 |
<parent>
|
| 28 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 28 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 30 |
</parent>
|
| 32 | 31 |
|
| 33 | 32 |
<artifactId>persistence</artifactId>
|
| ... | ... | @@ -267,10 +266,10 @@ |
| 267 | 266 |
<target>
|
| 268 | 267 |
<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models">
|
| 269 | 268 |
<filterset>
|
| 270 |
- <filter value="${observe.model.version}" token="observe.model.version"/>
|
|
| 269 |
+ <filter value="${observe.model.version}" token="observe.model.version" />
|
|
| 271 | 270 |
</filterset>
|
| 272 | 271 |
<fileset dir="${basedir}/src/main/models">
|
| 273 |
- <include name="*.model"/>
|
|
| 272 |
+ <include name="*.model" />
|
|
| 274 | 273 |
</fileset>
|
| 275 | 274 |
</copy>
|
| 276 | 275 |
</target>
|
| ... | ... | @@ -20,8 +20,7 @@ |
| 20 | 20 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 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 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 25 |
|
| 27 | 26 |
<parent>
|
| ... | ... | @@ -32,7 +31,7 @@ |
| 32 | 31 |
|
| 33 | 32 |
<groupId>fr.ird.observe</groupId>
|
| 34 | 33 |
<artifactId>ird-observe</artifactId>
|
| 35 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 34 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 36 | 35 |
<packaging>pom</packaging>
|
| 37 | 36 |
|
| 38 | 37 |
<name>ObServe :: Pom</name>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>server-configuration</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 30 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>server-core</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 30 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>server-runner</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 30 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-client</artifactId>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 |
<parent>
|
| 28 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 29 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 30 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 31 |
</parent>
|
| 32 | 32 |
|
| 33 | 33 |
<artifactId>services-local</artifactId>
|
| ... | ... | @@ -21,14 +21,13 @@ |
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 | 23 |
|
| 24 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 25 |
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
|
| 24 |
+<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">
|
|
| 26 | 25 |
<modelVersion>4.0.0</modelVersion>
|
| 27 | 26 |
|
| 28 | 27 |
<parent>
|
| 29 | 28 |
<groupId>fr.ird.observe</groupId>
|
| 30 | 29 |
<artifactId>ird-observe</artifactId>
|
| 31 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 30 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 32 | 31 |
</parent>
|
| 33 | 32 |
|
| 34 | 33 |
<artifactId>services</artifactId>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 28 | 28 |
<artifactId>ird-observe</artifactId>
|
| 29 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<artifactId>test</artifactId>
|
| ... | ... | @@ -20,14 +20,13 @@ |
| 20 | 20 |
<http://www.gnu.org/licenses/gpl-3.0.html>.
|
| 21 | 21 |
#L%
|
| 22 | 22 |
-->
|
| 23 |
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
|
|
| 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 |
<modelVersion>4.0.0</modelVersion>
|
| 26 | 25 |
|
| 27 | 26 |
<parent>
|
| 28 | 27 |
<groupId>fr.ird.observe</groupId>
|
| 29 | 28 |
<artifactId>ird-observe</artifactId>
|
| 30 |
- <version>8.0-alpha-4-SNAPSHOT</version>
|
|
| 29 |
+ <version>8.0-alpha-5-SNAPSHOT</version>
|
|
| 31 | 30 |
</parent>
|
| 32 | 31 |
|
| 33 | 32 |
<artifactId>validation</artifactId>
|