branch develop updated (0d1bcfa -> f3882e2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 0d1bcfa [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development new d0f8f52 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 64cdd52 add missing license headers new 9cbec54 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions new 9973bd8 Merge branch 'release/4.0-RC3' new 6a676be Merge branch 'master' into develop new f3882e2 [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 f3882e294c8ab5b40a36ada8706705c65c938548 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:11 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6a676be5a6a8d7c79629fc2f4a7fd7d81fe1ee86 Merge: d0f8f52 9973bd8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 Merge branch 'master' into develop commit d0f8f52ad7e85898d18e03a3b9a7e98b0391ad88 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9973bd87311cb2ca44d612e76df914f8a6943595 Merge: 2b2c42d 9cbec54 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:05 2015 +0000 Merge branch 'release/4.0-RC3' commit 9cbec54074430b9ba05fbaf34dfbf02754ff892f Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:40:30 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions commit 64cdd5213b0fd272e4eb919eaa126919b3893cb5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:36:11 2015 +0000 add missing license headers Summary of changes: .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++++++++++++++++++ .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 21 +++++++++++++++++++++ 6 files changed, 127 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 64cdd5213b0fd272e4eb919eaa126919b3893cb5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:36:11 2015 +0000 add missing license headers --- .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++++++++++++++++++ .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 21 +++++++++++++++++++++ 6 files changed, 127 insertions(+) diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java index 7aef878..80dd421 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java @@ -1,5 +1,27 @@ package fr.ird.observe.entities.migration.versions; +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 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.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; diff --git a/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql index cc832ae..dfedff2 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/add-foreign-key-indexes-PG.sql @@ -1,3 +1,24 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 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% +--- CREATE INDEX idx_observe_common_gear_gearcaracteristic_gear ON OBSERVE_COMMON.gear_gearcaracteristic(gear); CREATE INDEX idx_observe_common_ocean_species_species ON OBSERVE_COMMON.ocean_species(species); CREATE INDEX idx_observe_common_species_specieslist_specieslist ON OBSERVE_COMMON.species_specieslist(speciesList); diff --git a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql index c952588..0aaa32f 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 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% +--- UPDATE OBSERVE_COMMON.VESSEL SET LABEL2= 'Palengrier inconnu', TOPIAVERSION = TOPIAVERSION + 1 WHERE TOPIAID ='fr.ird.observe.entities.referentiel.Vessel#1239832686129#0.1'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql index c952588..0aaa32f 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 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% +--- UPDATE OBSERVE_COMMON.VESSEL SET LABEL2= 'Palengrier inconnu', TOPIAVERSION = TOPIAVERSION + 1 WHERE TOPIAID ='fr.ird.observe.entities.referentiel.Vessel#1239832686129#0.1'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql index ee284e0..f39c6a5 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 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% +--- UPDATE observe_seine.gearusefeatures SET usedintrip = true, topiaversion = topiaversion + 1 WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file diff --git a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql index d8bbf3b..1f3d7eb 100644 --- a/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql +++ b/observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql @@ -1 +1,22 @@ +--- +-- #%L +-- ObServe :: Entities +-- %% +-- Copyright (C) 2008 - 2015 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% +--- UPDATE observe_seine.gearusefeatures SET usedintrip = true , topiaversion = topiaversion + 1 WHERE gear = 'fr.ird.observe.entities.referentiel.Gear#1239832686125#0.20'; \ No newline at end of file -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9cbec54074430b9ba05fbaf34dfbf02754ff892f Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:40:30 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' 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 0b55a2f..708e48d 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 3b67f1b..de2c136 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index ab87ab1..3e77715 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 2f595ee..023d4ef 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 35c48b2..06a79cc 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 9973bd87311cb2ca44d612e76df914f8a6943595 Merge: 2b2c42d 9cbec54 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:05 2015 +0000 Merge branch 'release/4.0-RC3' observe-business/pom.xml | 2 +- .../src/main/java/fr/ird/observe/DataService.java | 28 ++ .../main/java/fr/ird/observe/DecoratorService.java | 2 + .../fr/ird/observe/ObserveApplicationContext.java | 9 + .../java/fr/ird/observe/db/ReplicationService.java | 4 +- .../test/resources/db/4.0-RC3/referentiel.sql.gz | Bin 0 -> 138124 bytes observe-entities/pom.xml | 2 +- .../java/fr/ird/observe/entities/Activity.java | 2 + .../src/main/java/fr/ird/observe/entities/Set.java | 3 + .../entities/longline/ActivityLonglineImpl.java | 17 ++ .../observe/entities/longline/SetLonglineImpl.java | 26 +- .../observe/entities/longline/TripLonglines.java | 2 +- .../migration/AbstractDataSourceMigration.java | 5 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 282 +++++++++++++++++++++ .../ird/observe/entities/seine/SetSeineImpl.java | 8 +- .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 65 +++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 22 ++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 22 ++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 22 ++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 22 ++ .../src/main/xmi/observe-common.properties | 4 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- observe-swing/pom.xml | 2 +- .../src/main/filters/observe-ui.properties | 1 + .../ird/observe/ui/content/ContentUIHandler.java | 28 ++ .../ui/content/impl/longline/SetLonglineUI.css | 8 +- .../impl/longline/SetLonglineUIHandler.java | 42 +++ .../content/impl/longline/SetLonglineUIModel.java | 8 +- .../observe/ui/content/impl/seine/SetSeineUI.jaxx | 72 +++--- .../open/impl/longline/ActivityLonglineUI.css | 2 +- .../impl/longline/ActivityLonglineUIHandler.java | 22 ++ .../open/impl/seine/ActivitySeineUIHandler.java | 15 ++ .../ui/content/table/ContentTableUIHandler.java | 23 +- .../impl/longline/CatchLonglineUIHandler.java | 4 +- .../table/impl/longline/EncounterUIHandler.java | 2 +- .../content/table/impl/longline/TdrUIHandler.java | 2 +- .../impl/seine/GearUseFeaturesSeineTableModel.java | 37 ++- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 20 ++ .../impl/seine/ObjectObservedSpeciesUIHandler.java | 2 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 4 +- .../table/impl/seine/TargetCatchUIHandler.java | 3 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 10 + .../loadors/ActivityLonglineNodeChildLoador.java | 1 + .../tree/loadors/ActivitySeineNodeChildLoador.java | 1 + .../EditableTableWithCacheTableModelSupport.java | 4 +- .../resources/i18n/observe-swing_en_GB.properties | 11 + .../resources/i18n/observe-swing_es_ES.properties | 11 + .../resources/i18n/observe-swing_fr_FR.properties | 149 ++++++----- observe-validation/pom.xml | 2 +- .../i18n/observe-validation_fr_FR.properties | 12 +- pom.xml | 4 +- 53 files changed, 896 insertions(+), 161 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit d0f8f52ad7e85898d18e03a3b9a7e98b0391ad88 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 [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 4fa3767..708e48d 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 9f42a77..de2c136 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 16a4b23..3e77715 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 538aca6..023d4ef 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index f7a2064..06a79cc 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6a676be5a6a8d7c79629fc2f4a7fd7d81fe1ee86 Merge: d0f8f52 9973bd8 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:10 2015 +0000 Merge branch 'master' into develop .../DataSourceMigrationForVersion_4_0_RC3.java | 22 ++++++++++++++++++++++ .../db/4.0-RC3/add-foreign-key-indexes-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 21 +++++++++++++++++++++ .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 21 +++++++++++++++++++++ 6 files changed, 127 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit f3882e294c8ab5b40a36ada8706705c65c938548 Author: Maven Release <maven-release@codelutin.com> Date: Fri Apr 17 10:45:11 2015 +0000 [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 708e48d..4fa3767 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <artifactId>observe-business</artifactId> diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index de2c136..9f42a77 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <artifactId>observe-entities</artifactId> diff --git a/observe-swing/pom.xml b/observe-swing/pom.xml index 3e77715..16a4b23 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <artifactId>observe-swing</artifactId> diff --git a/observe-validation/pom.xml b/observe-validation/pom.xml index 023d4ef..538aca6 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <artifactId>observe-validation</artifactId> diff --git a/pom.xml b/pom.xml index 06a79cc..f7a2064 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>4.0-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> <description>Projet ObServe</description> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm