[tutti] branch develop updated (5b1da5a -> d1a041f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 5b1da5a fixes #5865: Updates jaxx to 2.13 new 2c510be [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 8c079a8 [jgitflow-maven-plugin]updating poms for branch '3.7.5' with snapshot versions new f2f2ab3 prepare release 3.7.5 new af09d6f [jgitflow-maven-plugin]updating poms for branch'release/3.7.5' with non-snapshot versions new 1bea001 Merge branch 'release/3.7.5' new ddc43e8 Merge branch 'master' into develop new d1a041f [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 d1a041f09272187b5a9731978409a56cc5edd5c2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:47 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit ddc43e886c144aa9ced936e4f5d816984cbd8f2c Merge: 2c510be 1bea001 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:46 2014 +0200 Merge branch 'master' into develop commit 2c510be02c5bfff38aee1bb712a29d3febe23c9c Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:46 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1bea001b6c5a9773ea2f84d166139dc6dee68c1b Merge: b335414 af09d6f Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:44 2014 +0200 Merge branch 'release/3.7.5' commit af09d6f792e898de4ae5c7895c3ee9e8286195a3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:20:44 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.5' with non-snapshot versions commit f2f2ab3f1a98b4efbb23b1da5423e5dfede52614 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:20:28 2014 +0200 prepare release 3.7.5 Summary of changes: .../persistence/entities/data/SpeciesBatchs.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinDataRow.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinDataRowModel.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportService.java | 24 ++++++++++++++++++++++ .../service/bigfin/BigfinImportServiceTest.java | 24 ++++++++++++++++++++++ .../generic/TuttiExportServiceAno5804Test.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../validation/tree/TuttiMessageNodeSupport.java | 24 ++++++++++++++++++++++ 8 files changed, 191 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 in repository tutti. See http://git.codelutin.com/tutti.git commit f2f2ab3f1a98b4efbb23b1da5423e5dfede52614 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:20:28 2014 +0200 prepare release 3.7.5 --- .../persistence/entities/data/SpeciesBatchs.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinDataRow.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinDataRowModel.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportService.java | 24 ++++++++++++++++++++++ .../service/bigfin/BigfinImportServiceTest.java | 24 ++++++++++++++++++++++ .../generic/TuttiExportServiceAno5804Test.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../validation/tree/TuttiMessageNodeSupport.java | 24 ++++++++++++++++++++++ 8 files changed, 191 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java index 3c8741e..cee5cea 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.persistence.entities.data; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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 com.google.common.base.Function; import java.io.Serializable; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java index 09475c1..aa9b43f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRow.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; import fr.ifremer.tutti.persistence.entities.referential.Species; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java index a4500c6..cc118dd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinDataRowModel.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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 com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index f06b104..3e2a6b1 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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 com.google.common.base.Charsets; import com.google.common.base.Function; import com.google.common.base.Preconditions; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java index 85c48df..0c38460 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/bigfin/BigfinImportServiceTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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 com.google.common.base.Predicate; import fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceAno5804Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceAno5804Test.java index f7f827a..3dd2413 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceAno5804Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/export/generic/TuttiExportServiceAno5804Test.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.generic; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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 com.google.common.io.Files; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.service.PersistenceService; diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index 1ea1e8f..27f7d63 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,3 +1,26 @@ +### +# #%L +# Tutti :: UI +# $Id:$ +# $HeadURL:$ +# %% +# Copyright (C) 2012 - 2014 Ifremer +# %% +# 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% +### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo #Tue Sep 02 15:54:43 CEST 2014 tutti.config.help=config.html diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/TuttiMessageNodeSupport.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/TuttiMessageNodeSupport.java index cd7421a..27662db 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/TuttiMessageNodeSupport.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/TuttiMessageNodeSupport.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.validation.tree; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2014 Ifremer + * %% + * 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 javax.swing.ImageIcon; import javax.swing.JComponent; import javax.swing.tree.DefaultMutableTreeNode; -- 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 in repository tutti. See http://git.codelutin.com/tutti.git commit af09d6f792e898de4ae5c7895c3ee9e8286195a3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:20:44 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/3.7.5' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 3776e79..e064d61 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5-SNAPSHOT</version> + <version>3.7.5</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index f9632cd..3cc0cbb 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 799c7f2..cd70b44 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 37b1478..7dd1d0c 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e648815..7264630 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- 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 in repository tutti. See http://git.codelutin.com/tutti.git commit 1bea001b6c5a9773ea2f84d166139dc6dee68c1b Merge: b335414 af09d6f Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:44 2014 +0200 Merge branch 'release/3.7.5' pom.xml | 4 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../persistence/entities/data/SpeciesBatchs.java | 42 +- .../tutti/persistence/test/DatabaseResource.java | 31 +- .../i18n/tutti-persistence_en_GB.properties | 24 + .../i18n/tutti-persistence_fr_FR.properties | 26 +- .../config/TuttiPersistenceConfigTest.java | 2 +- .../resources/tutti-test-read-dbEmpty.properties | 27 - .../src/test/resources/tutti-test-read.properties | 27 - tutti-service/pom.xml | 2 +- .../fr/ifremer/tutti/service/TuttiCsvUtil.java | 4 + .../tutti/service/bigfin/BigfinDataRow.java | 130 ++ .../tutti/service/bigfin/BigfinDataRowModel.java | 154 ++ .../tutti/service/bigfin/BigfinImportResult.java | 92 + .../tutti/service/bigfin/BigfinImportService.java | 635 +++++ .../fr/ifremer/tutti/service/bigfin/Signs.java | 217 ++ .../service/export/generic/CatchExportModel.java | 2 +- .../export/pdf/CatchesPdfExportService.java | 4 +- .../protocol/ProtocolImportExportService.java | 97 +- .../tutti/service/pupitri/CarrouselRow.java | 14 +- .../tutti/service/pupitri/CarrouselRowModel.java | 5 +- .../fr/ifremer/tutti/service/pupitri/TrunkRow.java | 14 +- .../tutti/service/pupitri/TrunkRowModel.java | 5 +- .../resources/i18n/tutti-service_en_GB.properties | 15 + .../resources/i18n/tutti-service_fr_FR.properties | 10 + .../ifremer/tutti/service/ServiceDbResource.java | 27 +- .../service/bigfin/BigfinImportServiceTest.java | 213 ++ .../generic/TuttiExportServiceAno5804Test.java | 106 + .../export/generic/TuttiExportServiceTest.java | 10 +- .../test/resources/bigfin/importbigfin-errors.csv | 4 + .../test/resources/bigfin/importbigfin-valid.csv | 36 + .../resources/bigfin/importbigfin-warnings.csv | 5 + .../test/resources/bigfin/protocol.tuttiProtocol | 2426 ++++++++++++++++++++ .../resources/tutti-test-read-dbCGFS.properties | 26 - .../resources/tutti-test-read-dbExport.properties | 26 - .../resources/tutti-test-read-dbMedits.properties | 25 - tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 3 +- tutti-ui-swing/src/main/help/fr/dbMapping.html | 4 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 8 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 33 +- .../action/EditCruiseInValidationUIAction.java | 6 +- .../EditFishingOperationInValidationUIAction.java | 6 +- .../ExportCruiseValidationMessagesAction.java | 6 +- .../ExportOperationValidationMessagesAction.java | 6 +- ...ortPsionAction.java => ImportBigfinAction.java} | 68 +- .../swing/action/ImportProtocolBenthosAction.java | 24 +- .../swing/action/ImportProtocolSpeciesAction.java | 24 +- .../tutti/ui/swing/action/ImportPsionAction.java | 6 +- .../action/SaveCruiseToReadyToSynchAction.java | 6 +- .../action/SelectSpeciesForBenthosBatchAction.java | 2 +- .../action/SelectSpeciesForSpeciesBatchAction.java | 2 +- .../tutti/ui/swing/action/ShowAboutAction.java | 2 +- .../ui/swing/action/ValidateCatchesAction.java | 4 +- .../tutti/ui/swing/content/MainUIHandler.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 58 +- .../operation/EditFishingOperationUIHandler.java | 25 +- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +- .../operation/catches/species/SpeciesBatchUI.css | 9 + .../operation/catches/species/SpeciesBatchUI.jaxx | 1 + .../catches/species/SpeciesBatchUIHandler.java | 11 +- .../species/frequency/SpeciesFrequencyUI.jaxx | 138 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 + .../fishing/VesselUseFeatureTabUIHandler.java | 6 + .../{cruise => validation}/ValidateCruiseUI.css | 0 .../{cruise => validation}/ValidateCruiseUI.jaxx | 1 + .../ValidateCruiseUIHandler.java | 9 +- .../ValidateCruiseUIModel.java | 2 +- .../tree/CruiseTreeNode.java | 24 +- .../tree/MessageTreeNode.java | 16 +- .../tree/OperationTreeNode.java | 35 +- .../tree/TuttiMessageNodeSupport.java} | 36 +- .../tree/ValidationTreeCellRenderer.java | 12 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 24 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 27 +- .../main/resources/icons/action-bigfin-import.png | Bin 0 -> 532 bytes .../icons/action-cruise-ready-to-sync.png | Bin 328 -> 465 bytes .../main/resources/icons/action-cruise-waiting.png | Bin 465 -> 328 bytes 80 files changed, 4704 insertions(+), 471 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 in repository tutti. See http://git.codelutin.com/tutti.git commit 2c510be02c5bfff38aee1bb712a29d3febe23c9c Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:46 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index 37ba771..e064d61 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.5</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 599d56f..3cc0cbb 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 21e61cb..cd70b44 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3724bf6..7dd1d0c 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9a0bb8d..7264630 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.8-SNAPSHOT</version> + <version>3.7.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- 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 in repository tutti. See http://git.codelutin.com/tutti.git commit ddc43e886c144aa9ced936e4f5d816984cbd8f2c Merge: 2c510be 1bea001 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:46 2014 +0200 Merge branch 'master' into develop .../persistence/entities/data/SpeciesBatchs.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinDataRow.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinDataRowModel.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportService.java | 24 ++++++++++++++++++++++ .../service/bigfin/BigfinImportServiceTest.java | 24 ++++++++++++++++++++++ .../generic/TuttiExportServiceAno5804Test.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../validation/tree/TuttiMessageNodeSupport.java | 24 ++++++++++++++++++++++ 8 files changed, 191 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 in repository tutti. See http://git.codelutin.com/tutti.git commit d1a041f09272187b5a9731978409a56cc5edd5c2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Sep 26 15:24:47 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e064d61..37ba771 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5</version> + <version>3.8-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3cc0cbb..599d56f 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index cd70b44..21e61cb 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 7dd1d0c..3724bf6 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 7264630..9a0bb8d 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.7.5</version> + <version>3.8-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm