Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
e3518d64
by Tony Chemit at 2022-10-03T13:08:14+02:00
-
621d5c71
by Tony Chemit at 2022-10-03T13:08:14+02:00
-
85a1e43b
by Tony Chemit at 2022-10-03T13:08:14+02:00
-
73def8de
by Tony Chemit at 2022-10-03T13:08:32+02:00
-
a1862b5a
by Tony Chemit at 2022-10-03T13:08:32+02:00
12 changed files:
- client/runner/pom.xml
- core/api/validation/pom.xml
- core/persistence/java/pom.xml
- core/persistence/resources/pom.xml
- core/services/pom.xml
- model/pom.xml
- observe/pom.xml
- pom.xml
- server/runner/pom.xml
- src/site/site_fr.xml
- toolkit/api/pom.xml
- toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/ValidationTagValues.java
Changes:
| ... | ... | @@ -348,7 +348,7 @@ |
| 348 | 348 | <phase>generate-resources</phase>
|
| 349 | 349 | <configuration>
|
| 350 | 350 | <target>
|
| 351 | - <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
|
|
| 351 | + <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
|
|
| 352 | 352 | </target>
|
| 353 | 353 | </configuration>
|
| 354 | 354 | </execution>
|
| ... | ... | @@ -362,7 +362,7 @@ |
| 362 | 362 | <target>
|
| 363 | 363 | <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/">
|
| 364 | 364 | <fileset dir="${config.targetDirectory}">
|
| 365 | - <include name="${applicationName}.*" />
|
|
| 365 | + <include name="${applicationName}.*"/>
|
|
| 366 | 366 | </fileset>
|
| 367 | 367 | </copy>
|
| 368 | 368 | </target>
|
| ... | ... | @@ -376,7 +376,7 @@ |
| 376 | 376 | <phase>integration-test</phase>
|
| 377 | 377 | <configuration>
|
| 378 | 378 | <target>
|
| 379 | - <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar" />
|
|
| 379 | + <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar"/>
|
|
| 380 | 380 | </target>
|
| 381 | 381 | </configuration>
|
| 382 | 382 | </execution>
|
| ... | ... | @@ -410,7 +410,7 @@ |
| 410 | 410 | <phase>integration-test</phase>
|
| 411 | 411 | <configuration>
|
| 412 | 412 | <target>
|
| 413 | - <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe" />
|
|
| 413 | + <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe"/>
|
|
| 414 | 414 | </target>
|
| 415 | 415 | </configuration>
|
| 416 | 416 | </execution>
|
| ... | ... | @@ -204,6 +204,17 @@ |
| 204 | 204 | <artifactId>log4j-slf4j2-impl</artifactId>
|
| 205 | 205 | <version>${lib.version.log4j2}</version>
|
| 206 | 206 | </dependency>
|
| 207 | + <dependency>
|
|
| 208 | + <groupId>net.sourceforge.saxon</groupId>
|
|
| 209 | + <artifactId>saxon</artifactId>
|
|
| 210 | + <version>${lib.version.saxon}</version>
|
|
| 211 | + </dependency>
|
|
| 212 | + <dependency>
|
|
| 213 | + <groupId>net.sourceforge.saxon</groupId>
|
|
| 214 | + <artifactId>saxon</artifactId>
|
|
| 215 | + <version>${lib.version.saxon}</version>
|
|
| 216 | + <classifier>dom</classifier>
|
|
| 217 | + </dependency>
|
|
| 207 | 218 | </dependencies>
|
| 208 | 219 | </plugin>
|
| 209 | 220 | </plugins>
|
| ... | ... | @@ -144,6 +144,11 @@ |
| 144 | 144 | <artifactId>byte-buddy</artifactId>
|
| 145 | 145 | <scope>runtime</scope>
|
| 146 | 146 | </dependency>
|
| 147 | + <dependency>
|
|
| 148 | + <groupId>javax.xml.bind</groupId>
|
|
| 149 | + <artifactId>jaxb-api</artifactId>
|
|
| 150 | + <scope>runtime</scope>
|
|
| 151 | + </dependency>
|
|
| 147 | 152 | <dependency>
|
| 148 | 153 | <groupId>org.glassfish.jaxb</groupId>
|
| 149 | 154 | <artifactId>jaxb-runtime</artifactId>
|
| ... | ... | @@ -131,6 +131,16 @@ |
| 131 | 131 | <artifactId>postgresql</artifactId>
|
| 132 | 132 | <version>${lib.version.postgresql}</version>
|
| 133 | 133 | </dependency>
|
| 134 | + <dependency>
|
|
| 135 | + <groupId>javax.xml.bind</groupId>
|
|
| 136 | + <artifactId>jaxb-api</artifactId>
|
|
| 137 | + <version>${lib.version.jaxb-api}</version>
|
|
| 138 | + </dependency>
|
|
| 139 | + <dependency>
|
|
| 140 | + <groupId>org.glassfish.jaxb</groupId>
|
|
| 141 | + <artifactId>jaxb-runtime</artifactId>
|
|
| 142 | + <version>${lib.version.jaxb-runtime}</version>
|
|
| 143 | + </dependency>
|
|
| 134 | 144 | </dependencies>
|
| 135 | 145 | </plugin>
|
| 136 | 146 | </plugins>
|
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | <module>client</module>
|
| 37 | 37 | </modules>
|
| 38 | 38 | <properties>
|
| 39 | - <serviceClassifier />
|
|
| 39 | + <serviceClassifier/>
|
|
| 40 | 40 | </properties>
|
| 41 | 41 | <profiles>
|
| 42 | 42 | <profile>
|
| ... | ... | @@ -84,11 +84,11 @@ |
| 84 | 84 | <target>
|
| 85 | 85 | <copy failonerror="true" filtering="true" overwrite="true" todir="${project.build.outputDirectory}/models">
|
| 86 | 86 | <filterset>
|
| 87 | - <filter token="persistence.model.version" value="${persistence.model.version}" />
|
|
| 88 | - <filter token="model.name" value="${model.name}" />
|
|
| 87 | + <filter token="persistence.model.version" value="${persistence.model.version}"/>
|
|
| 88 | + <filter token="model.name" value="${model.name}"/>
|
|
| 89 | 89 | </filterset>
|
| 90 | 90 | <fileset dir="${basedir}/src/main/models">
|
| 91 | - <include name="**/*" />
|
|
| 91 | + <include name="**/*"/>
|
|
| 92 | 92 | </fileset>
|
| 93 | 93 | </copy>
|
| 94 | 94 | </target>
|
| ... | ... | @@ -104,12 +104,12 @@ |
| 104 | 104 | <target>
|
| 105 | 105 | <delete includeEmptyDirs="true">
|
| 106 | 106 | <fileset dir="${project.build.outputDirectory}/models/${model.name}">
|
| 107 | - <include name="${model.dto.classifier}/*/*" />
|
|
| 108 | - <include name="${model.dto.classifier}/*" />
|
|
| 109 | - <include name="${model.dto.classifier}" />
|
|
| 110 | - <include name="${model.persistence.classifier}/*/*" />
|
|
| 111 | - <include name="${model.persistence.classifier}/*" />
|
|
| 112 | - <include name="${model.persistence.classifier}" />
|
|
| 107 | + <include name="${model.dto.classifier}/*/*"/>
|
|
| 108 | + <include name="${model.dto.classifier}/*"/>
|
|
| 109 | + <include name="${model.dto.classifier}"/>
|
|
| 110 | + <include name="${model.persistence.classifier}/*/*"/>
|
|
| 111 | + <include name="${model.persistence.classifier}/*"/>
|
|
| 112 | + <include name="${model.persistence.classifier}"/>
|
|
| 113 | 113 | </fileset>
|
| 114 | 114 | </delete>
|
| 115 | 115 | </target>
|
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 | <description>ObServe Release</description>
|
| 32 | 32 | <properties>
|
| 33 | 33 | <deploy>false</deploy>
|
| 34 | - <deployFileSuffix />
|
|
| 34 | + <deployFileSuffix/>
|
|
| 35 | 35 | </properties>
|
| 36 | 36 | <build>
|
| 37 | 37 | <plugins>
|
| ... | ... | @@ -184,7 +184,7 @@ |
| 184 | 184 | <!-- <deployFileSuffix />-->
|
| 185 | 185 | </properties>
|
| 186 | 186 | <build>
|
| 187 | - <plugins />
|
|
| 187 | + <plugins/>
|
|
| 188 | 188 | </build>
|
| 189 | 189 | </profile>
|
| 190 | 190 | </profiles>
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <parent>
|
| 24 | 24 | <groupId>io.ultreia.maven</groupId>
|
| 25 | 25 | <artifactId>pom</artifactId>
|
| 26 | - <version>2022.87</version>
|
|
| 26 | + <version>2022.90</version>
|
|
| 27 | 27 | </parent>
|
| 28 | 28 | <groupId>fr.ird.observe</groupId>
|
| 29 | 29 | <artifactId>ird-observe</artifactId>
|
| ... | ... | @@ -127,8 +127,6 @@ |
| 127 | 127 | <!-- FIXME <lib.version.jaxb-runtime>4.0.0</lib.version.jaxb-runtime>-->
|
| 128 | 128 | <lib.version.jts>1.16.1</lib.version.jts>
|
| 129 | 129 | <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>-->
|
| 130 | - <!-- FIXME Reuse the last log4j for eugene-->
|
|
| 131 | - <lib.version.java4all.eugene>3.0-alpha-42</lib.version.java4all.eugene>
|
|
| 132 | 130 | <!-- license header configuration -->
|
| 133 | 131 | <license.licenseName>gpl_v3</license.licenseName>
|
| 134 | 132 | <license.organizationName>IRD, Ultreia.io</license.organizationName>
|
| ... | ... | @@ -168,6 +166,17 @@ |
| 168 | 166 | </properties>
|
| 169 | 167 | <dependencyManagement>
|
| 170 | 168 | <dependencies>
|
| 169 | + <dependency>
|
|
| 170 | + <groupId>net.sourceforge.saxon</groupId>
|
|
| 171 | + <artifactId>saxon</artifactId>
|
|
| 172 | + <version>${lib.version.saxon}</version>
|
|
| 173 | + </dependency>
|
|
| 174 | + <dependency>
|
|
| 175 | + <groupId>net.sourceforge.saxon</groupId>
|
|
| 176 | + <artifactId>saxon</artifactId>
|
|
| 177 | + <version>${lib.version.saxon}</version>
|
|
| 178 | + <classifier>dom</classifier>
|
|
| 179 | + </dependency>
|
|
| 171 | 180 | <dependency>
|
| 172 | 181 | <groupId>com.esotericsoftware.yamlbeans</groupId>
|
| 173 | 182 | <artifactId>yamlbeans</artifactId>
|
| ... | ... | @@ -1185,11 +1194,11 @@ |
| 1185 | 1194 | <phase>pre-site</phase>
|
| 1186 | 1195 | <configuration>
|
| 1187 | 1196 | <target>
|
| 1188 | - <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown" />
|
|
| 1189 | - <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
|
|
| 1190 | - <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
|
|
| 1191 | - <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" />
|
|
| 1192 | - <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" />
|
|
| 1197 | + <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown"/>
|
|
| 1198 | + <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
|
|
| 1199 | + <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
|
|
| 1200 | + <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/>
|
|
| 1201 | + <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/>
|
|
| 1193 | 1202 | </target>
|
| 1194 | 1203 | </configuration>
|
| 1195 | 1204 | </execution>
|
| ... | ... | @@ -246,7 +246,7 @@ |
| 246 | 246 | <phase>generate-resources</phase>
|
| 247 | 247 | <configuration>
|
| 248 | 248 | <target>
|
| 249 | - <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" />
|
|
| 249 | + <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/>
|
|
| 250 | 250 | </target>
|
| 251 | 251 | </configuration>
|
| 252 | 252 | </execution>
|
| ... | ... | @@ -260,7 +260,7 @@ |
| 260 | 260 | <target>
|
| 261 | 261 | <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/">
|
| 262 | 262 | <fileset dir="${config.targetDirectory}">
|
| 263 | - <include name="${applicationName}.*" />
|
|
| 263 | + <include name="${applicationName}.*"/>
|
|
| 264 | 264 | </fileset>
|
| 265 | 265 | </copy>
|
| 266 | 266 | </target>
|
| ... | ... | @@ -27,7 +27,7 @@ |
| 27 | 27 | <skin>
|
| 28 | 28 | <groupId>org.apache.maven.skins</groupId>
|
| 29 | 29 | <artifactId>maven-fluido-skin</artifactId>
|
| 30 | - <version>1.11.0</version>
|
|
| 30 | + <version>1.11.1</version>
|
|
| 31 | 31 | </skin>
|
| 32 | 32 | |
| 33 | 33 | <custom>
|
| ... | ... | @@ -260,7 +260,7 @@ |
| 260 | 260 | <!--suppress MavenModelInspection -->
|
| 261 | 261 | <skip>${maven.test.skip}</skip>
|
| 262 | 262 | <target>
|
| 263 | - <mkdir dir="${basedir}/target/surefire-workdir" />
|
|
| 263 | + <mkdir dir="${basedir}/target/surefire-workdir"/>
|
|
| 264 | 264 | </target>
|
| 265 | 265 | </configuration>
|
| 266 | 266 | </execution>
|
| ... | ... | @@ -23,7 +23,6 @@ package fr.ird.observe.toolkit.templates.validation; |
| 23 | 23 | */
|
| 24 | 24 | |
| 25 | 25 | import com.google.auto.service.AutoService;
|
| 26 | -import fr.ird.observe.toolkit.templates.ToolkitTagValues;
|
|
| 27 | 26 | import org.codehaus.plexus.component.annotations.Component;
|
| 28 | 27 | import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata;
|
| 29 | 28 | import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil;
|