mailman.cloud.codelutin.com
Sign In Sign Up
Manage this list Sign In Sign Up

Keyboard Shortcuts

Thread View

  • j: Next unread message
  • k: Previous unread message
  • j a: Jump to all threads
  • j l: Jump to MailingList overview

Observe-commits

Thread Start a new thread
Download
Threads by month
  • ----- 2026 -----
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2025 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2024 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2023 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2022 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2021 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2020 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2019 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2018 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2017 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2016 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2015 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2014 -----
  • December
  • November
  • October
  • September
  • August
  • July
  • June
  • May
  • April
  • March
  • February
  • January
  • ----- 2013 -----
  • December
  • November
  • October
  • September
observe-commits@list.forge.codelutin.com

  • 7199 discussions
[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT 09 Mar '17

09 Mar '17
Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe
1 0
0 0
[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-1
by Tony CHEMIT 09 Mar '17

09 Mar '17
Tony CHEMIT deleted tag observe-6.0-RC-1 at ultreia.io / ird-observe
1 0
0 0
[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT 09 Mar '17

09 Mar '17
Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe
1 0
0 0
[Git][ultreia.io/ird-observe] Deleted tag observe-6.0-RC-3
by Tony CHEMIT 09 Mar '17

09 Mar '17
Tony CHEMIT deleted tag observe-6.0-RC-3 at ultreia.io / ird-observe
1 0
0 0
[Git][ultreia.io/ird-observe] Deleted tag ird-observe-6.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17
Tony CHEMIT deleted tag ird-observe-6.0-RC-1 at ultreia.io / ird-observe
1 0
0 0
[Git][ultreia.io/ird-observe][develop] 3 commits: update changelog
by Tony CHEMIT 08 Mar '17

08 Mar '17
Tony CHEMIT pushed to branch develop at ultreia.io / ird-observe Commits: 0568e640 by Tony CHEMIT at 2017-03-08T20:43:11+01:00 update changelog - - - - - 2656e427 by Tony CHEMIT at 2017-03-08T20:43:26+01:00 improve release script - - - - - 890f2bde by Tony CHEMIT at 2017-03-08T20:45:41+01:00 remove conf - - - - - 3 changed files: - CHANGELOG.md - bin/stage_create.sh - pom.xml Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,60 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-08 17:52. + * Last generated at 2017-03-08 20:41. + +## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) + +Status: **_Staging_** + +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdo…) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdo…) + +### Issues + * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l&#39;ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 547]](https://gitlab.com/ultreia.io/ird-observe/issues/547) **[PS] Les écrans captures enregistrent parfois des captures sans code espèce associé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 646]](https://gitlab.com/ultreia.io/ird-observe/issues/646) **La fonctionnalité «Accéder à la marée» (ou route ou activité) ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 647]](https://gitlab.com/ultreia.io/ird-observe/issues/647) **La session ouverte n&#39;est pas sauvegardée dans la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 648]](https://gitlab.com/ultreia.io/ird-observe/issues/648) **L&#39;action «Annuler» sur l&#39;édition d&#39;un référentiel affiche un formulaire vide et non pas le formulaire du réferentiel en cours d&#39;édition** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 649]](https://gitlab.com/ultreia.io/ird-observe/issues/649) **Mauvaise resitution de l&#39;information «observé» ou «calculé» sur l&#39;écran des échantillons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 696]](https://gitlab.com/ultreia.io/ird-observe/issues/696) **La boîte Informations sur la source n&#39;affiche plus l&#39;URL de la base** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 708]](https://gitlab.com/ultreia.io/ird-observe/issues/708) **le calendrier reste en anglais** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 67]](https://gitlab.com/ultreia.io/ird-observe/issues/67) **Réglage par défaut des proportions des volets de la fenêtre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 81]](https://gitlab.com/ultreia.io/ird-observe/issues/81) **Action/calculer les données : sélection de la marée par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 299]](https://gitlab.com/ultreia.io/ird-observe/issues/299) **[LL] Formulaire Captures : Tableaux tailles et poids - ajouter des fonctions clic droit** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 306]](https://gitlab.com/ultreia.io/ird-observe/issues/306) **[LL] Ajout d&#39;un champs sur l&#39;écran Composition &gt; Onglet Avançons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 352]](https://gitlab.com/ultreia.io/ird-observe/issues/352) **Permettre la MAJ du référentiel à partir d&#39;un sql.gz** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 353]](https://gitlab.com/ultreia.io/ird-observe/issues/353) **[PS] Supprimer le champ floattingobject.supportvesselname** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 354]](https://gitlab.com/ultreia.io/ird-observe/issues/354) **[PS] Ajouter un champ &quot;Numéro de cuve&quot;, sur le formulaire des captures accessoires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 357]](https://gitlab.com/ultreia.io/ird-observe/issues/357) **[PS] Améliorer le contrôle des tailles/poids min/max d&#39;espèces (doubler le warning d&#39;une erreur)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 412]](https://gitlab.com/ultreia.io/ird-observe/issues/412) **[ObServeLL] Classement des listes déroulantes section/panier/avançon du formulaire capture** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 442]](https://gitlab.com/ultreia.io/ird-observe/issues/442) **Dans les listes d&#39;espèces, ne plus montrer l&#39;ancien code** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 443]](https://gitlab.com/ultreia.io/ird-observe/issues/443) **[PS] Unicité des enregistrements des rejets de thons à modifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 515]](https://gitlab.com/ultreia.io/ird-observe/issues/515) **[LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 516]](https://gitlab.com/ultreia.io/ird-observe/issues/516) **[WIDGET POSITIONS] absence de message d&#39;erreur quand horodatage erronné (certains cas)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 520]](https://gitlab.com/ultreia.io/ird-observe/issues/520) **[LL] Nombre de coupures inconnu : cas problématique** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 523]](https://gitlab.com/ultreia.io/ird-observe/issues/523) **[LL] numérotation des captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 531]](https://gitlab.com/ultreia.io/ird-observe/issues/531) **Rajouter un champ Armateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 535]](https://gitlab.com/ultreia.io/ird-observe/issues/535) **Lors d&#39;un import sql.gz vers la base centrale, possibilité d&#39;ajouter dans la base centrale les références manquantes** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 551]](https://gitlab.com/ultreia.io/ird-observe/issues/551) **[REFERENTIEL] Relations taille-poids - Ajout d&#39;un champ texte &#39;source&#39;** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 557]](https://gitlab.com/ultreia.io/ird-observe/issues/557) **Retirer le champ relatif à l&#39;utilisation du sonar pendant la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 558]](https://gitlab.com/ultreia.io/ird-observe/issues/558) **[PS] Ajout d&#39;un champ sur les captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 559]](https://gitlab.com/ultreia.io/ird-observe/issues/559) **[PS] Limiter l&#39;usage du formulaire DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 560]](https://gitlab.com/ultreia.io/ird-observe/issues/560) **[PS] Gestion plus intelligente des champs Devenir et Raison du rejet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 569]](https://gitlab.com/ultreia.io/ird-observe/issues/569) **[PS] Renommer 2 champs dans nontargetlength** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 570]](https://gitlab.com/ultreia.io/ird-observe/issues/570) **[PS] Saisie des échantillons de cible : modification de la gestion des types de taille** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 571]](https://gitlab.com/ultreia.io/ird-observe/issues/571) **[REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 575]](https://gitlab.com/ultreia.io/ird-observe/issues/575) **[TABLEAUX DE SYNTHESE] Nouvelle requête sur les équipements bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 581]](https://gitlab.com/ultreia.io/ird-observe/issues/581) **Gestion plus perfectionnée des calculs taille-poids** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 584]](https://gitlab.com/ultreia.io/ird-observe/issues/584) **Améliorer la gestion du focus et ajouter des racourcis clavier** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 587]](https://gitlab.com/ultreia.io/ird-observe/issues/587) **[REFERENTIEL] Ajouter des colonnes dans Vessel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 631]](https://gitlab.com/ultreia.io/ird-observe/issues/631) **Ajout de champs liés au marquage d&#39;individus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 632]](https://gitlab.com/ultreia.io/ird-observe/issues/632) **Ajout du champ Sexe sur les échantillons de cible** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 637]](https://gitlab.com/ultreia.io/ird-observe/issues/637) **[PS] Sur les échantillons de non cible, ajouter un champ Devenir** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 653]](https://gitlab.com/ultreia.io/ird-observe/issues/653) **Ajout d&#39;un clic droit/ajouter sur le tableau LL de définition des templates de section** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 695]](https://gitlab.com/ultreia.io/ird-observe/issues/695) **Ajout d&#39;une information visuelle sur les écrans de gestion avancée du référentiel et des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) &#10;&#10;*(from redmine: created on 2017-02-04)* ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -37,20 +37,14 @@ if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git checkout ${MASTER} -echo "Generate site: ($LOG_DIR/release-site.log)" -mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Deploy demo: ($LOG_DIR/release-demo.log)" -mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" +rm -rf target/gitlab_cache + +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git stash -git checkout ${DEVELOP} \ No newline at end of file +git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -158,8 +158,6 @@ <organizationId>ultreia.io</organizationId> <projectId>ird-observe</projectId> - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-5</jaxxVersion> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/725a12538cefa4dd44db85ec5…
1 0
0 0
[Git][ultreia.io/ird-observe] Deleted branch release/6.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17
Tony CHEMIT deleted branch release/6.0-RC-1 at ultreia.io / ird-observe
1 0
0 0
[Git][ultreia.io/ird-observe][master] 12 commits: [jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development
by Tony CHEMIT 08 Mar '17

08 Mar '17
Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: 4443e6d5 by Tony CHEMIT at 2017-03-08T18:01:18+01:00 [jgitflow-maven-plugin]updating poms for 3.0-RC-2-SNAPSHOT development - - - - - 09ecd5dd by Tony CHEMIT at 2017-03-08T18:09:49+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 290ef09a by Tony CHEMIT at 2017-03-08T18:09:50+01:00 [jgitflow-maven-plugin]merging &#39;master&#39; into &#39;develop&#39; - - - - - c98241e0 by Tony CHEMIT at 2017-03-08T18:09:51+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 27a26a87 by Tony CHEMIT at 2017-03-08T18:16:32+01:00 improve release scripts - - - - - d09ccb1e by Tony CHEMIT at 2017-03-08T18:23:16+01:00 prepare release 6.0-RC-1 + fix release - - - - - 683c6d4a by Tony CHEMIT at 2017-03-08T18:23:50+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 0bb38127 by Tony CHEMIT at 2017-03-08T18:27:03+01:00 prepare release 6.0-RC-1 + fix release - - - - - 963a8c2d by Tony CHEMIT at 2017-03-08T18:27:35+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 53885ecc by Tony CHEMIT at 2017-03-08T18:29:39+01:00 prepare release 6.0-RC-1 + fix release - - - - - d35566b2 by Tony CHEMIT at 2017-03-08T18:30:17+01:00 [jgitflow-maven-plugin]updating poms for branch&#39;release/6.0-RC-1&#39; with non-snapshot versions - - - - - 00104105 by Tony CHEMIT at 2017-03-08T18:36:55+01:00 [jgitflow-maven-plugin]merging &#39;release/6.0-RC-1&#39; into &#39;master&#39; - - - - - 26 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - bin/stage_create.sh - common/pom.xml - observe/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 @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> @@ -35,7 +35,6 @@ <description>ObServe Application Swing</description> <properties> - <maven.deploy.skip>true</maven.deploy.skip> <!-- jaxx configuration --> <jaxx.validatorFactoryFQN> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> @@ -179,36 +179,4 @@ </build> - <profiles> - <profile> - <id>deploy-demo</id> - <properties> - <classifier>${project.version}</classifier> - </properties> - <build> - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>wagon-maven-plugin</artifactId> - <executions> - <execution> - <id>deploy-demo</id> - <phase>verify</phase> - <goals> - <goal>upload-single</goal> - </goals> - <configuration> - <serverId>doc.ultreia.io</serverId> - <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> - <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> - <toFile>observe-${classifier}.war</toFile> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> </project> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> @@ -39,18 +39,8 @@ <properties> <applicationName>observeweb</applicationName> - <i18n.bundleOutputName>${applicationName}-i18n</i18n.bundleOutputName> - <!-- deploy configuration --> - <deployFiles>${project.build.directory}/${project.build.finalName}.war</deployFiles> - - <!-- add war to release file --> - <redmine.releaseFiles>${project.build.directory}/${project.build.finalName}.war</redmine.releaseFiles> - - <!-- allow to deploy artifacts --> - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <dependencies> @@ -296,5 +286,37 @@ </build> + <profiles> + <profile> + <id>deploy-demo</id> + <properties> + <classifier>${project.version}</classifier> + </properties> + <build> + <defaultGoal>verify</defaultGoal> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <id>deploy-demo</id> + <phase>verify</phase> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/lib/tomcat8/webapps</url> + <fromFile>${project.build.directory}/${project.build.finalName}.war</fromFile> + <toFile>observe-${classifier}.war</toFile> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project> ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -29,10 +29,10 @@ if [ ! "$?" == "0" ]; then exit 1 fi echo "Get staging id..." -STAGE_ID=$(mvn nexus-staging:rc-list | grep ${STAGE} | cut -d' ' -f2) +STAGE_ID=$(mvn nexus-staging:rc-list -N | grep ${STAGE} | cut -d' ' -f2) echo "Closing stage: $STAGE_ID ($LOG_DIR/release-close.log)" -mvn nexus-staging:close -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log +mvn nexus-staging:close -N -DstagingRepositoryId=${STAGE_ID} --log-file ${LOG_DIR}/release-close.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> @@ -216,6 +216,9 @@ <!--Modèle version--> <observe.model.version>6.0</observe.model.version> + <!-- deploy nothing --> + <maven.deploy.skip>true</maven.deploy.skip> + </properties> <dependencyManagement> @@ -1007,7 +1010,7 @@ <fileset dir="doc/modelisation"> <include name="**/*.pdf" /> </fileset> - <fileset dir="entities/src/main/xmi"> + <fileset dir="persistence/src/main/xmi"> <include name="**/*.zargo" /> </fileset> </copy> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> @@ -124,10 +124,6 @@ </dependencies> - <properties> - <!-- aloow to deploy artifacts --> - <maven.deploy.skip>false</maven.deploy.skip> - </properties> <build> <plugins> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>3.0-RC-1</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/2ac0abaf8113e65dcf72d3b54…
1 0
0 0
[Git][ultreia.io/ird-observe][release/6.0-RC-1] [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions
by Tony CHEMIT 08 Mar '17

08 Mar '17
Tony CHEMIT pushed to branch release/6.0-RC-1 at ultreia.io / ird-observe Commits: d35566b2 by Tony CHEMIT at 2017-03-08T18:30:17+01:00 [jgitflow-maven-plugin]updating poms for branch&#39;release/6.0-RC-1&#39; with non-snapshot versions - - - - - 25 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/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 @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing-validators</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-configuration-rest/pom.xml ===================================== --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-rest</artifactId> ===================================== services-configuration-topia/pom.xml ===================================== --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration-topia</artifactId> ===================================== services-configuration/pom.xml ===================================== --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-configuration</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validation</artifactId> ===================================== services-validators/pom.xml ===================================== --- a/services-validators/pom.xml +++ b/services-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services-validators</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-1-SNAPSHOT</version> + <version>6.0-RC-1</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/commit/d35566b26551ad9f938938ce16…
1 0
0 0
[Git][ultreia.io/ird-observe] Pushed new tag ird-observe-6.0-RC-1
by Tony CHEMIT 08 Mar '17

08 Mar '17
Tony CHEMIT pushed new tag ird-observe-6.0-RC-1 at ultreia.io / ird-observe
1 0
0 0
  • ← Newer
  • 1
  • ...
  • 503
  • 504
  • 505
  • 506
  • 507
  • 508
  • 509
  • ...
  • 720
  • Older →

HyperKitty Powered by HyperKitty version 1.3.12.