- Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Correction des raccourcis claviers ajoutés en double sur la liste des connexions enregistrées
by Tony CHEMIT 06 Sep '17

06 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 96249ca4 by Tony CHEMIT at 2017-09-06T09:52:32+02:00 Correction des raccourcis claviers ajoutés en double sur la liste des connexions enregistrées - - - - - 3 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -54,7 +54,7 @@ public class UseRemoteConfigurationUIAction extends UIActionSupport { private StorageUI parentContainer; public UseRemoteConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, RemoteDataSourceConfiguration configuration, KeyStroke acceleratorKey) { - super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey); + super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey, false); this.configUI = configUI; this.configuration = configuration; } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java @@ -53,7 +53,7 @@ public class UseServerConfigurationUIAction extends UIActionSupport { private StorageUI parentContainer; public UseServerConfigurationUIAction(ObserveMainUI mainUI, ConfigUI configUI, String actionName, ServerDataSourceConfiguration configuration, KeyStroke acceleratorKey) { - super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey); + super(mainUI, actionName, configuration.getName(), null, "db-remote", acceleratorKey, false); this.configUI = configUI; this.configuration = configuration; } ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java @@ -136,19 +136,19 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI int index = 1; ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); for (RemoteDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getRemoteDataSourceConfigurationList()) { - addRemoteConfiguration(mainUI,configuration, index++); + addRemoteConfiguration(mainUI, configuration, index++); } index = 1; for (ServerDataSourceConfiguration configuration : ObserveSwingApplicationContext.get().getConfig().getServerDataSourceConfigurationList()) { - addServerConfiguration(mainUI,configuration, index++); + addServerConfiguration(mainUI, configuration, index++); } } public void addRemoteConfiguration(ObserveMainUI mainUI, RemoteDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - UIActionSupport action = new UseRemoteConfigurationUIAction(mainUI,ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + UseRemoteConfigurationUIAction action = new UseRemoteConfigurationUIAction(mainUI, ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); ui.getRemoteMenu().add(item); @@ -157,7 +157,7 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public void addServerConfiguration(ObserveMainUI mainUI, ServerDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - UIActionSupport action = new UseServerConfigurationUIAction(mainUI,ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + UseServerConfigurationUIAction action = new UseServerConfigurationUIAction(mainUI, ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); ui.getServerMenu().add(item); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/96249ca42a05dd2464451377fba… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/96249ca42a05dd2464451377fba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: e70ec164 by 166231 at 2017-09-05T22:15:16+00:00 Site checkin for project ObServe :: Pom - - - - - 19 changed files: - administration-web.html - aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install-serverPG.html - install.html - integration.html - issue-tracking.html - license.html - plugin-management.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e70ec16496a728f2771f30d3136… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e70ec16496a728f2771f30d3136… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77bdbeee by Tony CHEMIT at 2017-09-06T00:09:08+02:00 update changelog - - - - - 2 changed files: - CHANGELOG.md - CONTRIBUTING.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,15 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-09-06 00:07. + * Last generated at 2017-09-06 00:08. ## Version [7.0-RC-7](https://gitlab.com/ultreiaio/ird-observe/milestones/101) **Closed at *In progress*.** +### Download +* [Application (observe-7.0-RC-7.zip)](https://observe.ultreia.io/release/observe-7.0-RC-7.zip) +* [Serveur (observe-7.0-RC-7.war)](https://observe.ultreia.io/release/observe-7.0-RC-7.war) ### Issues * [[Anomalie 157]](https://gitlab.com/ultreiaio/ird-observe/issues/157) **Problèmes d'affichage UNICODE des erreurs de tentative de connection sous Windows** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) ===================================== CONTRIBUTING.md ===================================== --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,7 @@ bash ~/ultreiaio/create-milestone.sh ``` bash ~/ultreiaio/close-milestone.sh bash ~/ultreiaio/create-stage.sh -bash ~/ultreiaio/close-stage.sh +bash ~/ultreiaio/drop-stage.sh bash ~/ultreiaio/update-staging-changelog.sh bash ~/ultreiaio/create-milestone.sh ``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/77bdbeee3404e80cbfdd3ddd9d8… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/77bdbeee3404e80cbfdd3ddd9d8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog after stage of milestone 7.0-rc-7 [skip ci]
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c0e4e992 by Tony CHEMIT at 2017-09-06T00:07:05+02:00 Update changelog after stage of milestone 7.0-rc-7 [skip ci] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-09-05 22:21. + * Last generated at 2017-09-06 00:07. ## Version [7.0-RC-7](https://gitlab.com/ultreiaio/ird-observe/milestones/101) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c0e4e9928ef7ce9d79e486e2a99… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c0e4e9928ef7ce9d79e486e2a99… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-7
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT deleted branch release/7.0-RC-7 at ultreiaio / ird-observe --- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-7
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed new tag v7.0-RC-7 at ultreiaio / ird-observe --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0-RC-7 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/7.0-RC-7] [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-7' with…
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch release/7.0-RC-7 at ultreiaio / ird-observe Commits: ed6015eb by Tony CHEMIT at 2017-09-05T23:49:26+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-7' with non-snapshot versions[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</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>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</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>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-7</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ed6015eb22b13b12501702998ba… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ed6015eb22b13b12501702998ba… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master] 42 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-7-SNAPSHOT development[skip ci]
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch master at ultreiaio / ird-observe Commits: f6a02c54 by 166231 at 2017-08-19T11:52:10+00:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-7-SNAPSHOT development[skip ci] - - - - - 24801cee by 166231 at 2017-08-19T12:01:26+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 5394ba53 by 166231 at 2017-08-19T12:01:26+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - de93e318 by 166231 at 2017-08-19T12:01:27+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 81510ce5 by 166231 at 2017-08-19T12:04:32+00:00 Update changelog after stage of milestone 7.0-RC-6 [skip ci] - - - - - 3c96e740 by Tony CHEMIT at 2017-08-24T16:30:44+02:00 Improve i18n keys (See #855) - - - - - 602be994 by Tony CHEMIT at 2017-08-24T16:53:40+02:00 Improve i18n keys (See #855) : sanitize i18n keys - - - - - 6d8a5a83 by Tony CHEMIT at 2017-08-24T21:36:14+02:00 Impossible de recopier les valeurs des matérials via les actions en bas (See #856) - - - - - c95b2094 by Tony CHEMIT at 2017-08-24T21:37:58+02:00 Lors de la création d'un dcp, les matériaux ne sont pas validés si on y touche pas (See #857) - - - - - 41db386d by Tony CHEMIT at 2017-08-24T21:44:38+02:00 Improve i18n keys (See #855) : mise en place des nouveaux décorateurs - - - - - 1dd7775c by Tony CHEMIT at 2017-08-24T22:42:00+02:00 Impossible d'accéder au menu configuration lorsqu'une base est chargée (See #858) - - - - - d1285f4f by Tony CHEMIT at 2017-08-24T22:57:27+02:00 up toolkit - - - - - 4f3e50ee by Tony CHEMIT at 2017-08-25T02:20:56+02:00 Ajout du zoom +/- sur les cartes (See #859) - - - - - 2288c30b by Tony CHEMIT at 2017-08-25T17:33:56+02:00 revue des templates de tickets [skip ci] - - - - - a5b592a6 by Tony CHEMIT at 2017-08-25T17:40:31+02:00 Ajout d'un nouvel éditeur de température qui permet les conversions °C/°F (See #860) - - - - - 742c43b1 by Tony CHEMIT at 2017-08-25T17:50:15+02:00 revue des templates de tickets [skip ci] - - - - - d355814e by Tony CHEMIT at 2017-08-25T18:24:09+02:00 Improve i18n keys (See #855) : uniformisation des clefs pour les constantes - - - - - 5e416e5a by Tony CHEMIT at 2017-08-25T19:32:14+02:00 up jaxx - - - - - c242a069 by Tony CHEMIT at 2017-08-30T17:39:00+02:00 Hum je vais commenter ce commit..... mais plus tard..... stop... over.... - - - - - 626a3c3a by Tony CHEMIT at 2017-08-30T23:31:07+02:00 Storm numero deux : on reintroduit le module dto, et on génére tous les binders dans les modules des objets crées, pratique... - - - - - 296e36a8 by Tony CHEMIT at 2017-08-31T00:38:59+02:00 fix decorate issues + add test - - - - - 304313f0 by Tony CHEMIT at 2017-08-31T00:39:10+02:00 fix old binder generic order - - - - - 6c5dba8d by Tony CHEMIT at 2017-08-31T02:03:25+02:00 fix decorator (the test is here to prove it :) + still renaming some generic order - - - - - 4ab85dc2 by Tony CHEMIT at 2017-08-31T02:08:37+02:00 validators in validation module ? - - - - - 57f320a5 by Tony CHEMIT at 2017-08-31T02:26:55+02:00 up toolkit and optimize dependencies - - - - - ad003551 by Tony CHEMIT at 2017-08-31T13:24:04+02:00 fix typo - - - - - 86817ff9 by Tony CHEMIT at 2017-08-31T14:10:45+02:00 add a check to be sure ui are not initialized twice - - - - - 7965b5b8 by Tony CHEMIT at 2017-08-31T14:10:49+02:00 up toolkit - - - - - b8f1b435 by Tony CHEMIT at 2017-08-31T20:07:58+02:00 L'assistant de migration de la RC6 ne démarre pas (See #864) - - - - - c7a89f44 by Tony CHEMIT at 2017-08-31T20:21:07+02:00 move data dto to a real package like for referentials - - - - - d00daa68 by Tony CHEMIT at 2017-09-01T15:43:24+02:00 [PS][Echantillons][Faune accessoires] Report du type de mensuration standard (See #835) - - - - - cbee8b09 by Tony CHEMIT at 2017-09-01T15:45:10+02:00 Amélioration des logs (on essaye de ne plus afficher les détails techniques (topia par exemple) - - - - - 7719a794 by Tony CHEMIT at 2017-09-01T17:51:08+02:00 Rethink modules for services (remove services-runner + rename to local and client) - - - - - 553dc4da by Tony CHEMIT at 2017-09-04T00:27:33+02:00 introduce spi api - - - - - ec066c75 by Tony CHEMIT at 2017-09-04T00:42:45+02:00 optimize dependencies - - - - - 320f090d by Tony CHEMIT at 2017-09-05T19:37:20+02:00 Simplify jobs - - - - - 7e25c9db by Tony CHEMIT at 2017-09-05T20:21:17+02:00 use toolkit 1.3 with new very nice apis - - - - - 2b89c068 by Tony CHEMIT at 2017-09-05T23:43:00+02:00 move some tests + use new pom and new deploy layout - - - - - d3dbb631 by Tony CHEMIT at 2017-09-05T23:48:38+02:00 fix snapshot - - - - - b5f98dbe by Tony CHEMIT at 2017-09-05T23:49:08+02:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-7 branch with snapshot versions[skip ci] - - - - - ed6015eb by Tony CHEMIT at 2017-09-05T23:49:26+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-7' with non-snapshot versions[skip ci] - - - - - e6a6b953 by Tony CHEMIT at 2017-09-06T00:03:43+02:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-7' into 'master' - - - - - 30 changed files: - .gitlab-ci.yml - .gitlab/issue_templates/Bug-6.md → .gitlab/issue_templates/Contrat-AZTI-2017-Anomalie.md - + .gitlab/issue_templates/Contrat-AZTI-2017-Evolution.md - .gitlab/issue_templates/Bug.md → .gitlab/issue_templates/Contrat-CodeLutin-2016-Anomalie.md - + .gitlab/issue_templates/Contrat-SFA-2017-Anomalie.md - + .gitlab/issue_templates/Contrat-SFA-2017-Evolution.md - + .gitlab/issue_templates/Evolution future.md - − .gitlab/issue_templates/Feature-6.md - − .gitlab/issue_templates/Feature-IRD.md - − .gitlab/issue_templates/Feature.md - CHANGELOG.md - CONTRIBUTING.md - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties - client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties - client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties - client-configuration/src/main/resources/log4j.properties - client-configuration/src/main/resources/observe-log4j.properties - client/pom.xml - client/src/main/ftl/validationReport_en.ftl - client/src/main/ftl/validationReport_es.ftl - client/src/main/ftl/validationReport_fr.ftl - client/src/main/java/fr/ird/observe/client/FloatingObjectReferencesManager.java → client/src/main/java/fr/ird/observe/client/FloatingObjectPresetsManager.java - client/src/main/java/fr/ird/observe/client/ObserveRunner.java - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/backup/BackupsManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/971ada96943be4511a47b2fb3e… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/971ada96943be4511a47b2fb3e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 7.0-RC-7 branch with snapshot versions[skip ci]
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b5f98dbe by Tony CHEMIT at 2017-09-05T23:49:08+02:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-7 branch with snapshot versions[skip ci] - - - - - ed6015eb by Tony CHEMIT at 2017-09-05T23:49:26+02:00 [jgitflow-maven-plugin]updating poms for branch'release/7.0-RC-7' with non-snapshot versions[skip ci] - - - - - e6a6b953 by Tony CHEMIT at 2017-09-06T00:03:43+02:00 [jgitflow-maven-plugin]merging 'release/7.0-RC-7' into 'master' - - - - - 0b5b5ad6 by Tony CHEMIT at 2017-09-06T00:03:47+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - d6eb32b6 by Tony CHEMIT at 2017-09-06T00:03:48+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 1f9314cc by Tony CHEMIT at 2017-09-06T00:03:49+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/decfeadeac31d9d302e82fca9d… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/decfeadeac31d9d302e82fca9d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 7.0-RC-8-SNAPSHOT development[skip ci]
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: decfeade by Tony CHEMIT at 2017-09-05T23:49:10+02:00 [jgitflow-maven-plugin]updating poms for 7.0-RC-8-SNAPSHOT development[skip ci] - - - - - 13 changed files: - client-configuration/pom.xml - client/pom.xml - dto/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - server-configuration/pom.xml - server/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/pom.xml - validation/pom.xml Changes: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>client</artifactId> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -20,14 +20,13 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> @@ -222,10 +221,10 @@ <target> <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.directory}/models"> <filterset> - <filter value="${observe.model.version}" token="observe.model.version"/> + <filter value="${observe.model.version}" token="observe.model.version" /> </filterset> <fileset dir="${basedir}/src/main/models"> - <include name="*.model"/> + <include name="*.model" /> </fileset> </copy> </target> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server/pom.xml ===================================== --- a/server/pom.xml +++ b/server/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>server</artifactId> ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== --- a/services-local/pom.xml +++ b/services-local/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</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>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>7.0-RC-7-SNAPSHOT</version> + <version>7.0-RC-8-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/decfeadeac31d9d302e82fca9d6… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/decfeadeac31d9d302e82fca9d6… You're receiving this email because of your account on gitlab.com.

1 0