Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: df615478 by Tony CHEMIT at 2017-03-08T14:38:45+01:00 update project to fit to new gitlab instance - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-configuration-rest/pom.xml - services-configuration-topia/pom.xml - services-configuration/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services-validators/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties ===================================== --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -34,6 +34,7 @@ observe.config.h2.can.migrate.description=Autoriser la mise à jour des bases lo observe.config.h2.login.description=L'identifiant H2 observe.config.h2.password.description=Le mot de passe H2 observe.config.h2.serverPort.description=Port du serveur H2 +observe.config.httpTimeout.description=Maximum delay in millisecondes to http connections observe.config.importDirectory.description=Répertoire où chercher les imports observe.config.logConfigurationFile.description=Fichier de configuration des logs observe.config.map.background.description=Couleur du fond de carte @@ -61,10 +62,12 @@ observe.config.obstuna.password.description=Le mot de passe pour se connecter à observe.config.obstuna.url.description=L’URL de connexion à la base Obstuna observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) +observe.config.remoteDataSourceConfigurations.description=connexions à des sources distantes observe.config.server.dataBaseName.description=Le nom optionnel de la base cible sur le serveur observe.config.server.login.description=Identifiant de l'utilisateur observe.config.server.password.description=Le mot de passe de l'utilisateur observe.config.server.url.description=L’URL du serveur +observe.config.serverDataSourceConfigurations.description=connexions à des serveursdistantes observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -3,7 +3,7 @@ #%L ObServe :: Application Swing %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> @@ -35,6 +35,7 @@ <description>ObServe Application Swing</description> <properties> + <maven.deploy.skip>true</maven.deploy.skip> <!-- jaxx configuration --> <jaxx.validatorFactoryFQN> @@ -47,7 +48,7 @@ <!-- main class in JAR --> <maven.jar.main.class>fr.ird.observe.application.swing.RunObserve</maven.jar.main.class> - <applicationName>${projectId}</applicationName> + <applicationName>observe</applicationName> <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> <i18n.bundleCsvFile>${applicationName}-i18n.csv</i18n.bundleCsvFile> @@ -58,21 +59,262 @@ <license.bundleThirdPartyPath>META-INF/${applicationName}-THIRD-PARTY.txt</license.bundleThirdPartyPath> <license.bundleLicensePath>META-INF/${applicationName}-LICENSE.txt</license.bundleLicensePath> - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> - - <redmine.releaseFiles> - ${project.build.directory}/${project.build.finalName}.zip - </redmine.releaseFiles> - - <!-- by default, we are in dev mode --> - <devMode>true</devMode> - <!-- to run via maven mvn exec:java --> <exec.mainClass>${maven.jar.main.class}</exec.mainClass> + <geoToolsVersion>16.0</geoToolsVersion> + </properties> + <repositories> + <repository> + <id>central</id> + <url>http://repo1.maven.org/maven2/</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + <repository> + <id>geotools-repository</id> + <url>http://download.osgeo.org/webdav/geotools</url> + <releases> + <enabled>true</enabled> + <checksumPolicy>fail</checksumPolicy> + </releases> + </repository> + </repositories> + + <dependencyManagement> + <dependencies> + <!-- Map --> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-shapefile</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-swing</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-api</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-main</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-render</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>it.geosolutions.jaiext</groupId> + <artifactId>jaiext</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandmerge</groupId> + <artifactId>jt-bandmerge</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandcombine</groupId> + <artifactId>jt-bandcombine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.bandselect</groupId> + <artifactId>jt-bandselect</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.imageio-ext</groupId> + <artifactId>imageio-ext-tiff</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.affine</groupId> + <artifactId>jt-affine</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.crop</groupId> + <artifactId>jt-crop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorconvert</groupId> + <artifactId>jt-colorconvert</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.mosaic</groupId> + <artifactId>jt-mosaic</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.zonal</groupId> + <artifactId>jt-zonal</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.binarize</groupId> + <artifactId>jt-binarize</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.stats</groupId> + <artifactId>jt-stats</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.nullop</groupId> + <artifactId>jt-nullop</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.piecewise</groupId> + <artifactId>jt-piecewise</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.classifier</groupId> + <artifactId>jt-classifier</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rlookup</groupId> + <artifactId>jt-rlookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.algebra</groupId> + <artifactId>jt-algebra</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.border</groupId> + <artifactId>jt-border</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.lookup</groupId> + <artifactId>jt-lookup</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.warp</groupId> + <artifactId>jt-warp</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.rescale</groupId> + <artifactId>jt-rescale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.format</groupId> + <artifactId>jt-format</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.errordiffusion</groupId> + <artifactId>jt-errordiffusion</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.orderdither</groupId> + <artifactId>jt-orderdither</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.colorindexer</groupId> + <artifactId>jt-colorindexer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.imagefunction</groupId> + <artifactId>jt-imagefunction</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.vectorbin</groupId> + <artifactId>jt-vectorbin</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.buffer</groupId> + <artifactId>jt-buffer</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.translate</groupId> + <artifactId>jt-translate</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.scale</groupId> + <artifactId>jt-scale</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.iterators</groupId> + <artifactId>jt-iterators</artifactId> + </exclusion> + <exclusion> + <groupId>it.geosolutions.jaiext.utilities</groupId> + <artifactId>jt-utilities</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-zonalstats</artifactId> + </exclusion> + <exclusion> + <groupId>org.jaitools</groupId> + <artifactId>jt-utils</artifactId> + </exclusion> + + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_imageio</artifactId> + </exclusion> + <exclusion> + <groupId>javax.media</groupId> + <artifactId>jai_core</artifactId> + </exclusion> + + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-referencing</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>jgridshift</groupId> + <artifactId>jgridshift</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-opengis</artifactId> + <version>${geoToolsVersion}</version> + <exclusions> + <exclusion> + <groupId>java3d</groupId> + <artifactId>vecmath</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.geotools</groupId> + <artifactId>gt-epsg-hsql</artifactId> + <version>${geoToolsVersion}</version> + </dependency> + </dependencies> + + </dependencyManagement> <dependencies> <!-- sibling dependencies --> @@ -219,6 +461,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> <!-- Nuiton --> <dependency> @@ -334,6 +580,15 @@ <artifactId>xwork-core</artifactId> </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark</artifactId> + </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + </dependency> + <!-- Logging --> <dependency> <groupId>org.slf4j</groupId> @@ -436,6 +691,7 @@ <enumerationSets> <enumerationSet> <name>label</name> + <!--suppress MavenModelInspection --> <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern> <enums> <enum>fr.ird.observe.common.constants.GearType</enum> @@ -460,6 +716,7 @@ </enumerationSet> <enumerationSet> <name>description</name> + <!--suppress MavenModelInspection --> <pattern>observe.enum.@CLASS_NAME@.@NAME@.description</pattern> <enums> <enum>fr.ird.observe.application.swing.configuration.constants.CreationMode</enum> @@ -543,6 +800,7 @@ </goals> <phase>prepare-package</phase> <configuration> + <!--suppress MavenModelInspection --> <skip>${performRelease}</skip> <overWriteReleases>false</overWriteReleases> <overWriteSnapshots>true</overWriteSnapshots> @@ -686,20 +944,22 @@ <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> <executions> <execution> + <id>Copy change log</id> + <phase>generate-resources</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="../CHANGELOG.md" tofile="${project.build.outputDirectory}/META-INF/${applicationName}-CHANGELOG.md" /> + </target> + </configuration> <goals> - <goal>create</goal> + <goal>run</goal> </goals> - <phase>validate</phase> </execution> </executions> - <configuration> - <doCheck>false</doCheck> - <doUpdate>false</doUpdate> - </configuration> </plugin> <plugin> @@ -837,7 +1097,6 @@ <plugin> <groupId>com.akathist.maven.plugins.launch4j</groupId> <artifactId>launch4j-maven-plugin</artifactId> - <version>1.7.11</version> <executions> <execution> <id>launch4j</id> @@ -855,10 +1114,12 @@ <minVersion>1.8.0</minVersion> </jre> <versionInfo> + <!--suppress MavenModelInspection --> <fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion> <txtFileVersion>${project.version}</txtFileVersion> <fileDescription>${project.parent.description}</fileDescription> <productName>${project.parent.name}</productName> + <!--suppress MavenModelInspection --> <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> @@ -884,7 +1145,7 @@ <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> </descriptors> - <attach>false</attach> + <attach>true</attach> <finalName>${project.build.finalName}</finalName> <appendAssemblyId>false</appendAssemblyId> <outputDirectory>${project.build.directory}</outputDirectory> @@ -897,77 +1158,5 @@ </build> </profile> - <profile> - <id>changelog-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>generate-resources</defaultGoal> - - <resources> - <resource> - <directory>${project.build.directory}/generated-sources/license</directory> - <includes> - <include>*.txt</include> - </includes> - </resource> - </resources> - <plugins> - - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - - <execution> - <id>get-changelog</id> - <phase>generate-resources</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${project.build.directory}/changelog</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${project.parent.groupId}</groupId> - <artifactId>${project.parent.artifactId}</artifactId> - <version>${project.version}</version> - <classifier>changelog</classifier> - <type>pom</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - - </executions> - </plugin> - - <plugin> - - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>Copy changelog</id> - <phase>process-resources</phase> - <configuration> - <target> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/CHANGELOG.txt" /> - <copy failonerror="true" overwrite="true" file="${project.build.directory}/changelog/${project.parent.artifactId}-${project.version}-changelog.pom" tofile="${project.build.directory}/generated-sources/license/META-INF/${applicationName}-CHANGELOG.txt" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -83,6 +83,9 @@ observe.action.goto.next.stage=Suivant observe.action.goto.next.stage.tip=Accéder à l'étape suivante observe.action.goto.previous.stage=Précédent observe.action.goto.previous.stage.tip=Accéder à l'étape précédente +observe.action.goto.referentiel.common.tip=Référentiel commun +observe.action.goto.referentiel.longline.tip=Référentiel palangre +observe.action.goto.referentiel.seine.tip=Référentiel senne observe.action.goto.referentiel.short=Référentiel observe.action.goto.referentiel.tip=Accéder au référentiel observe.action.info.storage=Informations sur la source de données @@ -99,8 +102,9 @@ observe.action.modify=Modifier observe.action.new.entry=Nouveau observe.action.new.entry.tip=Créer une nouvelle entrée observe.action.open.screen=Ouverture de l'écran <%1$s> -observe.action.quitHelp.tip=Quitter l'écran d'aide +observe.action.quit=Quitter observe.action.quit.tip=Quitter le gestionnaire +observe.action.quitHelp.tip=Quitter l'écran d'aide observe.action.reload.application=Redémarrer l'application observe.action.reload.storage=Recharger la source de données observe.action.reload.storage.tip=Ferme et rouvre la source de données @@ -302,6 +306,7 @@ observe.actions.validate.message.operation.needFix=Vos données ne sont valides observe.actions.validate.message.prepare.validators=Détection des validateurs observe.actions.validate.message.save.report=Le rapport de validation a été sauvegardé dans le fichier %1$s observe.actions.validate.message.use.storage=La validation sera effectuée sur %1$s +observe.actions.validate.message.validate.trip=Validation de la marée « %s » observe.actions.validate.report.contextName=Contexte de validation utilisé \: %1$s observe.actions.validate.report.entities.with.messages=Nombre d'entités avec des messages \: %1$s observe.actions.validate.report.entity=Entité %1$s '%2$s' Nombre de messages %3$s (sur %4$s scope(s)). ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ #%L ObServe %% - Copyright (C) 2008 - 2017 IRD, Code Lutin, Tony Chemit + Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -24,19 +24,19 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.nuiton</groupId> - <artifactId>codelutinpom</artifactId> - <version>10.5</version> + <groupId>io.ultreia.maven</groupId> + <artifactId>pom</artifactId> + <version>2</version> </parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> - <url>http://observe.codelutin.com</url> + <url>http://observe.ultreia.io</url> <inceptionYear>2008</inceptionYear> <organization> <name>IRD</name> @@ -55,6 +55,8 @@ <id>tchemit</id> <name>Tony Chemit</name> <email>dev@tchemit.fr</email> + <organization>Ultreia.io</organization> + <organizationUrl>http://ultreia.io</organizationUrl> <roles> <role>lead</role> <role>developer</role> @@ -140,44 +142,50 @@ </developerConnection> </scm--> <scm> - <url>https://gitlab.nuiton.org/codelutin/observe</url> - <connection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</connection> - <developerConnection>scm:git:git@gitlab.nuiton.org:codelutin/observe.git</developerConnection> + <url>https://gitlab.com/ultreia.io/ird-observe</url> + <connection>scm:git:git@gitlab.com:ultreia.io/ird-observe.git</connection> + <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> </scm> + <distributionManagement> + <site> + <id>doc.ultreia.io</id> + </site> + </distributionManagement> + <properties> - <projectId>observe</projectId> - <ciViewId>ObServe</ciViewId> + <organizationId>ultreia.io</organizationId> + <projectId>ird-observe</projectId> - <javaVersion>1.8</javaVersion> - <signatureArtifactId>java18</signatureArtifactId> - <signatureVersion>1.0</signatureVersion> + <gitlabPluginVersion>1.0.4</gitlabPluginVersion> <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - + <jaxxVersion>3.0-alpha-4</jaxxVersion> + <nuitonI18nVersion>3.6.3</nuitonI18nVersion> + <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> - <jaxxVersion>3.0-alpha-3</jaxxVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> - <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> - <nuitonConfigVersion>3.1.1</nuitonConfigVersion> + <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> + <nuitonConverterVersion>1.0</nuitonConverterVersion> + <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> <xworkVersion>2.3.31</xworkVersion> <hibernateVersion>5.1.3.Final</hibernateVersion> - <sl4jVersion>1.7.22</sl4jVersion> + <sl4jVersion>1.7.23</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> - <geoToolsVersion>16.1</geoToolsVersion> <webmotionVersion>2.5.1</webmotionVersion> - <httpComponentsVersion>4.5.2</httpComponentsVersion> + <httpComponentsVersion>4.5.3</httpComponentsVersion> + + <licensePluginVersion>1.9</licensePluginVersion> <mavenVersion>3.3.9</mavenVersion> <!-- license header configuration --> <license.licenseName>gpl_v3</license.licenseName> - <license.organizationName>IRD, Code Lutin, Tony Chemit</license.organizationName> + <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> @@ -191,7 +199,15 @@ <!-- Site configuration --> <locales>fr</locales> - <siteSourcesType>rst</siteSourcesType> + <generateSitemap>true</generateSitemap> + <relativizeDecorationLinks>false</relativizeDecorationLinks> + <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/observe</helper.distributionSiteUrlPrefix> + + <!--Gitlab configuration--> + <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> + <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> + <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail> + <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> @@ -202,35 +218,6 @@ </properties> - <repositories> - <repository> - <id>observe-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/observe</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </repository> - </repositories> - <pluginRepositories> - <pluginRepository> - <id>observe-public-group</id> - <url>https://nexus.nuiton.org/nexus/content/groups/observe</url> - <snapshots> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>true</enabled> - <checksumPolicy>fail</checksumPolicy> - </releases> - </pluginRepository> - </pluginRepositories> - <dependencyManagement> <dependencies> @@ -274,7 +261,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>20.0</version> + <version>21.0</version> </dependency> <dependency> <groupId>com.google.code.gson</groupId> @@ -290,7 +277,7 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpcore</artifactId> - <version>4.4.5</version> + <version>4.4.6</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -327,13 +314,19 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-version</artifactId> - <version>1.0-rc-2</version> + <version>${nuitonVersionVersion}</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-converter</artifactId> - <version>1.0</version> + <version>${nuitonConverterVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-csv</artifactId> + <version>3.0-rc-6</version> <scope>compile</scope> </dependency> <dependency> @@ -362,8 +355,8 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> <version>${nuitonValidatorVersion}</version> - <scope>test</scope> <classifier>tests</classifier> + <scope>test</scope> <exclusions> <exclusion> <groupId>javassist</groupId> @@ -558,7 +551,7 @@ <dependency> <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> - <version>9.4.1212.jre7</version> + <version>42.0.0.jre7</version> </dependency> <!-- hibernate --> @@ -571,7 +564,7 @@ <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> - <version>2.5.1</version> + <version>2.6.0</version> </dependency> <dependency> @@ -586,232 +579,6 @@ </exclusions> </dependency> - <!-- Map --> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-shapefile</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-swing</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-api</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-main</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-render</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>it.geosolutions.jaiext</groupId> - <artifactId>jaiext</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandmerge</groupId> - <artifactId>jt-bandmerge</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandcombine</groupId> - <artifactId>jt-bandcombine</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.bandselect</groupId> - <artifactId>jt-bandselect</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.imageio-ext</groupId> - <artifactId>imageio-ext-tiff</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.affine</groupId> - <artifactId>jt-affine</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.crop</groupId> - <artifactId>jt-crop</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.colorconvert</groupId> - <artifactId>jt-colorconvert</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.mosaic</groupId> - <artifactId>jt-mosaic</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.zonal</groupId> - <artifactId>jt-zonal</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.binarize</groupId> - <artifactId>jt-binarize</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.stats</groupId> - <artifactId>jt-stats</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.nullop</groupId> - <artifactId>jt-nullop</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.piecewise</groupId> - <artifactId>jt-piecewise</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.classifier</groupId> - <artifactId>jt-classifier</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.rlookup</groupId> - <artifactId>jt-rlookup</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.algebra</groupId> - <artifactId>jt-algebra</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.border</groupId> - <artifactId>jt-border</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.lookup</groupId> - <artifactId>jt-lookup</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.warp</groupId> - <artifactId>jt-warp</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.rescale</groupId> - <artifactId>jt-rescale</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.format</groupId> - <artifactId>jt-format</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.errordiffusion</groupId> - <artifactId>jt-errordiffusion</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.orderdither</groupId> - <artifactId>jt-orderdither</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.colorindexer</groupId> - <artifactId>jt-colorindexer</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.imagefunction</groupId> - <artifactId>jt-imagefunction</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.vectorbin</groupId> - <artifactId>jt-vectorbin</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.buffer</groupId> - <artifactId>jt-buffer</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.translate</groupId> - <artifactId>jt-translate</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.scale</groupId> - <artifactId>jt-scale</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.iterators</groupId> - <artifactId>jt-iterators</artifactId> - </exclusion> - <exclusion> - <groupId>it.geosolutions.jaiext.utilities</groupId> - <artifactId>jt-utilities</artifactId> - </exclusion> - <exclusion> - <groupId>org.jaitools</groupId> - <artifactId>jt-zonalstats</artifactId> - </exclusion> - <exclusion> - <groupId>org.jaitools</groupId> - <artifactId>jt-utils</artifactId> - </exclusion> - - <exclusion> - <groupId>javax.media</groupId> - <artifactId>jai_imageio</artifactId> - </exclusion> - <exclusion> - <groupId>javax.media</groupId> - <artifactId>jai_core</artifactId> - </exclusion> - - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-referencing</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>jgridshift</groupId> - <artifactId>jgridshift</artifactId> - </exclusion> - </exclusions> - </dependency> - - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-opengis</artifactId> - <version>${geoToolsVersion}</version> - <exclusions> - <exclusion> - <groupId>java3d</groupId> - <artifactId>vecmath</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.geotools</groupId> - <artifactId>gt-epsg-hsql</artifactId> - <version>${geoToolsVersion}</version> - </dependency> - <dependency> <groupId>com.vividsolutions</groupId> <artifactId>jts</artifactId> @@ -849,7 +616,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>javax.servlet-api</artifactId> - <version>4.0.0-b01</version> + <version>4.0.0-b02</version> <scope>provided</scope> </dependency> @@ -960,6 +727,17 @@ </dependency> <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark</artifactId> + <version>0.15.4</version> + </dependency> + <dependency> + <groupId>com.vladsch.flexmark</groupId> + <artifactId>flexmark-util</artifactId> + <version>0.15.4</version> + </dependency> + + <dependency> <groupId>org.javassist</groupId> <artifactId>javassist</artifactId> <version>3.22.0-CR1</version> @@ -972,45 +750,65 @@ <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <executions> + <execution> + <inherited>false</inherited> + <goals> + <goal>create</goal> + </goals> + <phase>validate</phase> + </execution> + </executions> + <configuration> + <doCheck>false</doCheck> + <doUpdate>false</doUpdate> + </configuration> + </plugin> + + </plugins> + <pluginManagement> <plugins> - + <!-- plugin site --> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-scm-publish-plugin</artifactId> - <version>1.1</version> - <configuration> - <pubScmUrl>${project.scm.developerConnection}</pubScmUrl> - <scmBranch>pages</scmBranch> - <content>${project.build.directory}/staging</content> - </configuration> - <executions> - <execution> - <id>scm-publish</id> - <phase>site-deploy</phase><!-- deploy site with maven-scm-publish-plugin --> - <goals> - <goal>publish-scm</goal> - </goals> - </execution> - </executions> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + <version>${jaxxVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <version>${nuitonConverterVersion}</version> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + <version>${nuitonVersionVersion}</version> + </dependency> + </dependencies> </plugin> - <!-- plugin site --> <plugin> - <artifactId>maven-site-plugin</artifactId> + <groupId>org.codehaus.gmavenplus</groupId> + <artifactId>gmavenplus-plugin</artifactId> <dependencies> <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrstPluginVersion}</version> + <groupId>org.reflections</groupId> + <artifactId>reflections</artifactId> + <version>${reflectionsVersion}</version> </dependency> </dependencies> - <configuration> - <skipDeploy>true</skipDeploy> - </configuration> </plugin> + <!-- Plugins version from nuiton --> <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> @@ -1042,22 +840,30 @@ </plugin> <plugin> - <groupId>org.codehaus.gmavenplus</groupId> - <artifactId>gmavenplus-plugin</artifactId> - <version>1.5</version> - <dependencies> - <dependency> - <groupId>org.reflections</groupId> - <artifactId>reflections</artifactId> - <version>${reflectionsVersion}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>2.4.7</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>${helperPluginVersion}</version> + </plugin> + + <plugin> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <configuration> + <releaseArtifacts> + <releaseArtifact> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <name>Application</name> + <type>zip</type> + </releaseArtifact> + <releaseArtifact> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <name>Serveur</name> + <type>war</type> + </releaseArtifact> + </releaseArtifacts> + </configuration> </plugin> </plugins> @@ -1079,20 +885,20 @@ <profiles> <profile> - <id>no-devmode</id> + <id>release-profile</id> <activation> <property> <name>performRelease</name> <value>true</value> </property> </activation> - <properties> - <devMode>false</devMode> - </properties> + <modules> + <module>observe</module> + </modules> </profile> <profile> - <id>central-safe</id> + <id>reporting</id> <activation> <property> <name>performRelease</name> @@ -1100,118 +906,86 @@ </property> </activation> - <properties> - - <!-- deploy releases on other-releases repository --> - <release.repository>${other.release.repository}</release.repository> - - </properties> - - <build> - <defaultGoal>validate</defaultGoal> + <reporting> <plugins> + <plugin> <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>check-central-safe</id> - <inherited>true</inherited> - <goals> - <goal>check-auto-container</goal> - </goals> - <configuration> - <runOnce>false</runOnce> - <addMavenCentral>true</addMavenCentral> - <failIfNotSafe>true</failIfNotSafe> - </configuration> - </execution> - </executions> + <artifactId>nuiton-config-maven-plugin</artifactId> + <version>${nuitonConfigVersion}</version> + <inherited>false</inherited> + <reportSets> + <reportSet> + <reports> + <report>aggregate-report</report> + </reports> + </reportSet> + </reportSets> + <configuration> + <i18nBundleName>observe-i18n</i18nBundleName> + </configuration> </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>changelog-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <properties> - - <redmine.xmlPath>${project.build.directory}/changes/changes.xml</redmine.xmlPath> - </properties> - <build> - <defaultGoal>process-classes</defaultGoal> - <plugins> - - <!-- Generate changelog.txt and attach it to project --> <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>jredmine-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-changes</id> - <goals> - <goal>generate-changes</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <generateOnce>true</generateOnce> - <actionMapping>fix:1, add:2, update:4</actionMapping> - </configuration> - </execution> - <execution> - <id>generate-changelog</id> - <inherited>false</inherited> - <goals> - <goal>generate-changelog</goal> - </goals> - <phase>process-classes</phase> - <configuration> - <attach>true</attach> - </configuration> - </execution> - </executions> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>${projectInfoReportsPluginVersion}</version> + <reportSets> + <reportSet> + <reports> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-info</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>plugin-management</report> + <report>plugins</report> + <report>dependency-management</report> + <report>summary</report> + </reports> + </reportSet> + </reportSets> </plugin> - </plugins> - </build> - </profile> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>${changesPluginVersion}</version> + <configuration> + <issueLinkTemplatePerSystem> + <gitlab>https://gitlab.com/ultreia.io/${projectId}/issues/%ISSUE%</gitlab> + </issueLinkTemplatePerSystem> + <xmlPath>${project.build.directory}/generated-site/changes.xml</xmlPath> + </configuration> + </plugin> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>${changelogPluginVersion}</version> + </plugin> - <reporting> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${licensePluginVersion}</version> + </plugin> - <plugins> - <!--plugin> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-config-maven-plugin</artifactId> - <version>${nuitonConfigVersion}</version> - <inherited>false</inherited> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>${versionsPluginVersion}</version> <reportSets> <reportSet> <reports> - <report>aggregate-report</report> + <report>dependency-updates-report</report> + <report>plugin-updates-report</report> + <report>property-updates-report</report> </reports> </reportSet> </reportSets> - <configuration> - <i18nBundleName>${projectId}-i18n</i18nBundleName> - </configuration> - </plugin--> + </plugin> </plugins> </reporting> @@ -1221,7 +995,6 @@ <plugins> <plugin> - <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> <executions> @@ -1234,25 +1007,10 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="persistence/src/main/xmi"> + <fileset dir="entities/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> - <copy todir="${project.reporting.outputDirectory}/validation/service" failonerror="true" overwrite="true"> - <fileset dir="services-validation/src/main/resources"> - <include name="**/*-validation.xml" /> - </fileset> - </copy> - <copy todir="${project.reporting.outputDirectory}/validation/ui" failonerror="true" overwrite="true"> - <fileset dir="application-swing-validation/src/main/resources"> - <include name="**/*-validation.xml" /> - </fileset> - </copy> - <copy todir="${project.reporting.outputDirectory}/validation" failonerror="true" overwrite="true"> - <fileset dir="application-swing-configuration/src/main/resources"> - <include name="validators.xml" /> - </fileset> - </copy> </target> </configuration> <goals> @@ -1262,6 +1020,35 @@ </executions> </plugin> + <plugin> + <groupId>io.ultreia.maven</groupId> + <artifactId>gitlab-maven-plugin</artifactId> + <inherited>false</inherited> + <executions> + <execution> + <inherited>false</inherited> + <goals> + <goal>generate-changes</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>compute-distribution-site-url</id> + <goals> + <goal>compute-distribution-site-url</goal> + </goals> + <phase>pre-site</phase> + </execution> + </executions> + </plugin> + </plugins> </build> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> + <artifactId>pom</artifactId> <version>6.0-SNAPSHOT</version> </parent> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/df615478b61c60cefaeccb26f11...