[Observe-commits] [Git][ultreiaio/ird-observe][develop] 5 commits: update pom

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e3518d64 by Tony Chemit at 2022-10-03T13:08:14+02:00 update pom - - - - - 621d5c71 by Tony Chemit at 2022-10-03T13:08:14+02:00 tidy pom - - - - - 85a1e43b by Tony Chemit at 2022-10-03T13:08:14+02:00 remove unused import - - - - - 73def8de by Tony Chemit at 2022-10-03T13:08:32+02:00 add saxon in dependency management use last eugene version - - - - - a1862b5a by Tony Chemit at 2022-10-03T13:08:32+02:00 update maven-fluido-skin - - - - - 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: ===================================== client/runner/pom.xml ===================================== @@ -348,7 +348,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> </target> </configuration> </execution> @@ -362,7 +362,7 @@ <target> <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/"> <fileset dir="${config.targetDirectory}"> - <include name="${applicationName}.*" /> + <include name="${applicationName}.*"/> </fileset> </copy> </target> @@ -376,7 +376,7 @@ <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar" /> + <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.jar" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.jar"/> </target> </configuration> </execution> @@ -410,7 +410,7 @@ <phase>integration-test</phase> <configuration> <target> - <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe" /> + <copy failonerror="true" file="${project.build.directory}/${project.build.finalName}.exe" overwrite="true" tofile="${project.build.directory}/${applicationJarName}.exe"/> </target> </configuration> </execution> ===================================== core/api/validation/pom.xml ===================================== @@ -204,6 +204,17 @@ <artifactId>log4j-slf4j2-impl</artifactId> <version>${lib.version.log4j2}</version> </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + <classifier>dom</classifier> + </dependency> </dependencies> </plugin> </plugins> ===================================== core/persistence/java/pom.xml ===================================== @@ -144,6 +144,11 @@ <artifactId>byte-buddy</artifactId> <scope>runtime</scope> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>runtime</scope> + </dependency> <dependency> <groupId>org.glassfish.jaxb</groupId> <artifactId>jaxb-runtime</artifactId> ===================================== core/persistence/resources/pom.xml ===================================== @@ -131,6 +131,16 @@ <artifactId>postgresql</artifactId> <version>${lib.version.postgresql}</version> </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <version>${lib.version.jaxb-api}</version> + </dependency> + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>jaxb-runtime</artifactId> + <version>${lib.version.jaxb-runtime}</version> + </dependency> </dependencies> </plugin> </plugins> ===================================== core/services/pom.xml ===================================== @@ -36,7 +36,7 @@ <module>client</module> </modules> <properties> - <serviceClassifier /> + <serviceClassifier/> </properties> <profiles> <profile> ===================================== model/pom.xml ===================================== @@ -84,11 +84,11 @@ <target> <copy failonerror="true" filtering="true" overwrite="true" todir="${project.build.outputDirectory}/models"> <filterset> - <filter token="persistence.model.version" value="${persistence.model.version}" /> - <filter token="model.name" value="${model.name}" /> + <filter token="persistence.model.version" value="${persistence.model.version}"/> + <filter token="model.name" value="${model.name}"/> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="**/*" /> + <include name="**/*"/> </fileset> </copy> </target> @@ -104,12 +104,12 @@ <target> <delete includeEmptyDirs="true"> <fileset dir="${project.build.outputDirectory}/models/${model.name}"> - <include name="${model.dto.classifier}/*/*" /> - <include name="${model.dto.classifier}/*" /> - <include name="${model.dto.classifier}" /> - <include name="${model.persistence.classifier}/*/*" /> - <include name="${model.persistence.classifier}/*" /> - <include name="${model.persistence.classifier}" /> + <include name="${model.dto.classifier}/*/*"/> + <include name="${model.dto.classifier}/*"/> + <include name="${model.dto.classifier}"/> + <include name="${model.persistence.classifier}/*/*"/> + <include name="${model.persistence.classifier}/*"/> + <include name="${model.persistence.classifier}"/> </fileset> </delete> </target> ===================================== observe/pom.xml ===================================== @@ -31,7 +31,7 @@ <description>ObServe Release</description> <properties> <deploy>false</deploy> - <deployFileSuffix /> + <deployFileSuffix/> </properties> <build> <plugins> @@ -184,7 +184,7 @@ <!-- <deployFileSuffix />--> </properties> <build> - <plugins /> + <plugins/> </build> </profile> </profiles> ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2022.87</version> + <version>2022.90</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -127,8 +127,6 @@ <!-- FIXME <lib.version.jaxb-runtime>4.0.0</lib.version.jaxb-runtime>--> <lib.version.jts>1.16.1</lib.version.jts> <!-- FIXME <lib.version.jts>1.18.2</lib.version.jts>--> - <!-- FIXME Reuse the last log4j for eugene--> - <lib.version.java4all.eugene>3.0-alpha-42</lib.version.java4all.eugene> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Ultreia.io</license.organizationName> @@ -168,6 +166,17 @@ </properties> <dependencyManagement> <dependencies> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + </dependency> + <dependency> + <groupId>net.sourceforge.saxon</groupId> + <artifactId>saxon</artifactId> + <version>${lib.version.saxon}</version> + <classifier>dom</classifier> + </dependency> <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> @@ -1185,11 +1194,11 @@ <phase>pre-site</phase> <configuration> <target> - <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown" /> - <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" /> - <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" /> - <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/" /> - <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/" /> + <copy failonerror="true" file="CHANGELOG.md" overwrite="true" todir="${project.basedir}/src/site/markdown"/> + <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/> + <copy failonerror="true" file="${project.basedir}/client/runner/src/main/assembly/dist/config/observe-client.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/> + <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.md" overwrite="true" todir="${project.basedir}/src/site/markdown/"/> + <copy failonerror="true" file="${project.basedir}/server/runner/src/main/assembly/dist/config/observe-server.conf" overwrite="true" todir="${project.basedir}/src/site/resources/"/> </target> </configuration> </execution> ===================================== server/runner/pom.xml ===================================== @@ -246,7 +246,7 @@ <phase>generate-resources</phase> <configuration> <target> - <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + <copy failonerror="true" file="../../CHANGELOG.md" overwrite="true" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md"/> </target> </configuration> </execution> @@ -260,7 +260,7 @@ <target> <copy failonerror="true" overwrite="true" todir="${project.build.outputDirectory}/META-INF/configuration/"> <fileset dir="${config.targetDirectory}"> - <include name="${applicationName}.*" /> + <include name="${applicationName}.*"/> </fileset> </copy> </target> ===================================== src/site/site_fr.xml ===================================== @@ -27,7 +27,7 @@ <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.11.0</version> + <version>1.11.1</version> </skin> <custom> ===================================== toolkit/api/pom.xml ===================================== @@ -260,7 +260,7 @@ <!--suppress MavenModelInspection --> <skip>${maven.test.skip}</skip> <target> - <mkdir dir="${basedir}/target/surefire-workdir" /> + <mkdir dir="${basedir}/target/surefire-workdir"/> </target> </configuration> </execution> ===================================== toolkit/templates/src/main/java/fr/ird/observe/toolkit/templates/validation/ValidationTagValues.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.toolkit.templates.validation; */ import com.google.auto.service.AutoService; -import fr.ird.observe.toolkit.templates.ToolkitTagValues; import org.codehaus.plexus.component.annotations.Component; import org.nuiton.eugene.models.extension.tagvalue.TagValueMetadata; import org.nuiton.eugene.models.extension.tagvalue.TagValueUtil; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21870a47960bc61532c590ff8... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/21870a47960bc61532c590ff8... You're receiving this email because of your account on gitlab.com.