branch develop-4.x updated (a70fedb -> ef59adc)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git from a70fedb [jgitflow-maven-plugin]updating poms for 4.1-SNAPSHOT development new 0848947 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new aca08a6 Add missing life header new 7d0b2bf [jgitflow-maven-plugin]updating poms for branch'release/4.0.6' with non-snapshot versions new 1e6e94c [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master-4.x' new 81d152d [jgitflow-maven-plugin]merging 'master-4.x' into 'develop-4.x' new ef59adc [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit ef59adc3a1f7e9c86fb6f665c2995bd79c975915 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:13 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 81d152d0f3386cbfa18eab1ec082b67489362cd1 Merge: 0848947 1e6e94c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:10 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.x' into 'develop-4.x' commit 0848947e192ec605cd89f535eb692a95108e4d9f Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:09 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1e6e94ca5a242c91e843e1a7df93792613e754bf Merge: e5c1ba8 7d0b2bf Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:05 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master-4.x' commit 7d0b2bfd71bb896aa6ba5159b600e4642a3c2761 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:46:50 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.6' with non-snapshot versions commit aca08a697182b8130a4b10965c036f4bd0cd9ce4 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:46:37 2016 +0100 Add missing life header Summary of changes: .../decorator/GearCaracteristicDecorator.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit aca08a697182b8130a4b10965c036f4bd0cd9ce4 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:46:37 2016 +0100 Add missing life header --- .../decorator/GearCaracteristicDecorator.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/observe-business/src/main/java/fr/ird/observe/decorator/GearCaracteristicDecorator.java b/observe-business/src/main/java/fr/ird/observe/decorator/GearCaracteristicDecorator.java index d8cbe71..c8cc7ad 100644 --- a/observe-business/src/main/java/fr/ird/observe/decorator/GearCaracteristicDecorator.java +++ b/observe-business/src/main/java/fr/ird/observe/decorator/GearCaracteristicDecorator.java @@ -1,5 +1,27 @@ package fr.ird.observe.decorator; +/* + * #%L + * ObServe :: Business + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.entities.referentiel.GearCaracteristic; /** -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 7d0b2bfd71bb896aa6ba5159b600e4642a3c2761 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:46:50 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.0.6' with non-snapshot versions --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index 82cb3fc..ec5e45d 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 38b0611..20f6af8 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 6930a63..5a82ee6 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 5b027c1..37ec646 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 0833315..dbe4214 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.6</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 1e6e94ca5a242c91e843e1a7df93792613e754bf Merge: e5c1ba8 7d0b2bf Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:05 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.0.6' into 'master-4.x' observe-business/pom.xml | 2 +- .../main/java/fr/ird/observe/DecoratorService.java | 5 ++- .../main/java/fr/ird/observe/IObserveConfig.java | 7 +++ .../fr/ird/observe/ObserveApplicationContext.java | 4 -- .../java/fr/ird/observe/db/impl/H2DataSource.java | 16 +++++++ .../decorator/GearCaracteristicDecorator.java | 25 +++++++---- .../i18n/observe-business_en_GB.properties | 1 + .../i18n/observe-business_es_ES.properties | 1 + .../i18n/observe-business_fr_FR.properties | 1 + observe-entities/pom.xml | 2 +- .../observe/entities/referentiel/ProgramImpl.java | 2 +- observe-entities/src/main/xmi/observe-common.zargo | Bin 35711 -> 35656 bytes observe-swing/pom.xml | 2 +- observe-swing/src/main/assembly/dist/go.bat | 2 +- observe-swing/src/main/assembly/dist/go.sh | 4 +- .../main/java/fr/ird/observe/ObserveConfig.java | 7 +++ .../main/java/fr/ird/observe/ObserveContext.java | 47 ++++++++++++++++++++- .../main/java/fr/ird/observe/ObserveRunner.java | 25 ++++++++--- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../ui/content/impl/seine/FloatingObjectUI.css | 2 +- .../observe/ui/content/impl/seine/SetSeineUI.css | 2 +- .../content/table/impl/seine/AbstractSampleUI.css | 2 +- .../content/table/impl/seine/NonTargetSampleUI.css | 2 +- .../ui/content/table/impl/seine/TargetSampleUI.css | 2 +- .../ird/observe/ui/storage/StorageUIHandler.java | 10 ----- .../fr/ird/observe/ui/storage/StorageUIModel.java | 6 +-- observe-validation/pom.xml | 2 +- .../field/AbstractEspeceFieldValidator.java | 2 +- pom.xml | 13 +++--- src/site/site_fr.xml | 16 +++++-- 30 files changed, 155 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 0848947e192ec605cd89f535eb692a95108e4d9f Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:09 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index fa7e682..ec5e45d 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 10ecfca..20f6af8 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index a5560b1..5a82ee6 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 58cca5b..37ec646 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.6</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index f1ab6cf..dbe4214 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.1-SNAPSHOT</version> + <version>4.0.6</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 81d152d0f3386cbfa18eab1ec082b67489362cd1 Merge: 0848947 1e6e94c Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:10 2016 +0100 [jgitflow-maven-plugin]merging 'master-4.x' into 'develop-4.x' .../decorator/GearCaracteristicDecorator.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit ef59adc3a1f7e9c86fb6f665c2995bd79c975915 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 13 18:50:13 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- observe-business/pom.xml | 2 +- observe-entities/pom.xml | 2 +- observe-swing/pom.xml | 2 +- observe-validation/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/observe-business/pom.xml b/observe-business/pom.xml index ec5e45d..fa7e682 100644 --- a/observe-business/pom.xml +++ b/observe-business/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 20f6af8..10ecfca 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 5a82ee6..a5560b1 100644 --- a/observe-swing/pom.xml +++ b/observe-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 37ec646..58cca5b 100644 --- a/observe-validation/pom.xml +++ b/observe-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6</version> + <version>4.1-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index dbe4214..f1ab6cf 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0.6</version> + <version>4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm