branch develop updated (6fb60b6 -> 6741be4)
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 6fb60b6 [jgitflow-maven-plugin]updating poms for 3.14-SNAPSHOT development new fd3b9b7 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5ae8dbc prepare release 3.13 new 526b4f0 [jgitflow-maven-plugin]updating poms for branch'release/3.13' with non-snapshot versions new e7092d8 Merge branch 'release/3.13' new 84cc016 Merge branch 'master' into develop new 6741be4 [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 6741be42795c5ff19539f2f8785b2299f025311c Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:43:04 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 84cc0160a82bead731eb75c0ab6b10217178b78d Merge: fd3b9b7 e7092d8 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:43:02 2015 +0000 Merge branch 'master' into develop commit fd3b9b7c3b233de9be6c4024fc27f37a61ebffba Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:43:00 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e7092d814afd93847aa0f869fae10d4ed4f285ad Merge: d6e6335 526b4f0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:42:56 2015 +0000 Merge branch 'release/3.13' commit 526b4f04cf44902bc7c462bade5b8272103a129d Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:37:08 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13' with non-snapshot versions commit 5ae8dbc90bcd30d8f1a926221c48f1f8b30afde6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:36:25 2015 +0000 prepare release 3.13 Summary of changes: .../java/fr/ifremer/tutti/util/NumbersTest.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/service/SpeciesMap.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportContext.java | 24 ++++++++++++++++++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Size.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationData.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportService.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../operation/catches/EditCatchesSvgHandler.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 16 files changed, 337 insertions(+), 1 deletion(-) -- 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 5ae8dbc90bcd30d8f1a926221c48f1f8b30afde6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:36:25 2015 +0000 prepare release 3.13 --- .../java/fr/ifremer/tutti/util/NumbersTest.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/service/SpeciesMap.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportContext.java | 24 ++++++++++++++++++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Size.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationData.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportService.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../operation/catches/EditCatchesSvgHandler.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 16 files changed, 337 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/test/java/fr/ifremer/tutti/util/NumbersTest.java b/tutti-persistence/src/test/java/fr/ifremer/tutti/util/NumbersTest.java index ebc8463..77a5431 100644 --- a/tutti-persistence/src/test/java/fr/ifremer/tutti/util/NumbersTest.java +++ b/tutti-persistence/src/test/java/fr/ifremer/tutti/util/NumbersTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.util; +/* + * #%L + * Tutti :: Persistence + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 org.junit.Assert; import org.junit.Test; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/SpeciesMap.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/SpeciesMap.java index 886a03d..3018753 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/SpeciesMap.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/SpeciesMap.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.data.SpeciesAbleBatch; import fr.ifremer.tutti.persistence.entities.protocol.SpeciesProtocol; import fr.ifremer.tutti.persistence.entities.referential.Species; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java index e295f10..0bd2fd7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportContext.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 com.google.common.base.Preconditions; import com.google.common.collect.Multimap; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/SpeciesOrSpeciesBatch.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/SpeciesOrSpeciesBatch.java index c7681b1..9ff8b82 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/SpeciesOrSpeciesBatch.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/csv/SpeciesOrSpeciesBatch.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin.csv; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.data.SpeciesBatch; import fr.ifremer.tutti.persistence.entities.referential.Species; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java index cce79c8..062983e 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sex.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin.signs; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sign.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sign.java index d735381..26b7b8f 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sign.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Sign.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin.signs; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.Caracteristic; import fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java index 065f20c..cfc87a6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/Size.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin.signs; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java index 27b9cbe..0e2ffb7 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/signs/VracHorsVrac.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.bigfin.signs; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 fr.ifremer.adagio.core.dao.referential.pmfm.PmfmId; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueId; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportBean.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportBean.java index 2d3a35c..1758783 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportBean.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportBean.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.toconfirmreport; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.data.Cruise; import fr.ifremer.tutti.type.WeightUnit; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationBean.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationBean.java index 2b62c7a..9e2ad96 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationBean.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationBean.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.toconfirmreport; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.data.FishingOperation; import java.util.Date; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java index aeaa300..f9f57ad 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportFishingOperationData.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.toconfirmreport; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java index d7219ee..58117b9 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/export/toconfirmreport/ToConfirmReportService.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.service.export.toconfirmreport; +/* + * #%L + * Tutti :: Service + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.BenthosBatch; import fr.ifremer.tutti.persistence.entities.data.Cruise; 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 cd85432..573b92b 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 - 2015 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 #Thu Jan 29 11:48:31 CET 2015 \ "tutti.editProtocol.action.addCaracteristicMapping.help"\ = diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java index 2ca0c10..2eb927a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches; +/* + * #%L + * Tutti :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2012 - 2015 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 com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index d29fb23..c618dfa 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -153,6 +153,7 @@ tutti.config.option.ui.color.blockingLayer.shortLabel= tutti.config.option.ui.color.catch.shortLabel= tutti.config.option.ui.color.cellWithValue.shortLabel= tutti.config.option.ui.color.computedWeights.shortLabel= +tutti.config.option.ui.color.marineLitter.shortLabel= tutti.config.option.ui.color.rowInvalid.shortLabel= tutti.config.option.ui.color.rowReadOnly.shortLabel= tutti.config.option.ui.color.rowToConfirm.shortLabel= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index ef484ec..f4802d5 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -131,11 +131,11 @@ tutti.config.option.tmp.directory.shortLabel=Répertoire temporaire tutti.config.option.tremieCarousselVessel.shortLabel=Navire ayant un carrousel et une trémie tutti.config.option.ui.color.alternateRow.shortLabel=Couleur alternée tutti.config.option.ui.color.benthos.shortLabel=Couleur des libellés de benthos (Écran Capture > Résumé) -tutti.config.option.ui.color.marineLitter.shortLabel=Couleur des libellés de macro-déchets (Écran Capture > Résumé) tutti.config.option.ui.color.blockingLayer.shortLabel=Couleur d'attente tutti.config.option.ui.color.catch.shortLabel=Couleur des libellés de capture (Écran Capture > Résumé) tutti.config.option.ui.color.cellWithValue.shortLabel=Couleur cellule avec donnée tutti.config.option.ui.color.computedWeights.shortLabel=Couleur de valeur calculée +tutti.config.option.ui.color.marineLitter.shortLabel=Couleur des libellés de macro-déchets (Écran Capture > Résumé) tutti.config.option.ui.color.rowInvalid.shortLabel=Couleur d'une ligne invalide tutti.config.option.ui.color.rowReadOnly.shortLabel=Couleur d'une cellule en lecture seule tutti.config.option.ui.color.rowToConfirm.shortLabel=Couleur d'une espèce à confirmer -- 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 526b4f04cf44902bc7c462bade5b8272103a129d Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:37:08 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.13' 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-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 9f5e4af..42f3472 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.13</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index df0cc25..729b12f 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.13-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 546f64a..67d47ef 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.13-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index bdda5e6..2208c5a 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.13-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 8519855..84c2c1c 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index b619964..a444e3d 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.13-SNAPSHOT</version> + <version>3.13</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 e7092d814afd93847aa0f869fae10d4ed4f285ad Merge: d6e6335 526b4f0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:42:56 2015 +0000 Merge branch 'release/3.13' README.txt | 33 +- pom.xml | 14 +- src/site/rst/dbversions.rst | 4 + src/update/tutti-application.properties | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 16 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 32 + .../tutti/persistence/TuttiPersistenceImpl.java | 92 ++- .../persistence/TuttiPersistenceNoDbImpl.java | 10 + .../persistence/entities/data/SpeciesBatchs.java | 20 + .../entities/protocol/TuttiProtocols.java | 33 + .../persistence/entities/referential/Speciess.java | 11 + .../service/BenthosBatchPersistenceService.java | 10 + .../BenthosBatchPersistenceServiceImpl.java | 24 + .../service/SpeciesBatchPersistenceService.java | 10 + .../SpeciesBatchPersistenceServiceImpl.java | 24 + .../src/main/java/fr/ifremer/tutti/util/Jdbcs.java | 31 + .../main/java/fr/ifremer/tutti/util/Numbers.java | 10 + .../i18n/tutti-persistence_en_GB.properties | 4 + .../i18n/tutti-persistence_fr_FR.properties | 6 +- .../java/fr/ifremer/tutti/util/NumbersTest.java | 50 ++ tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PdfGeneratorService.java | 1 + .../ifremer/tutti/service/PersistenceService.java | 10 + .../java/fr/ifremer/tutti/service/SpeciesMap.java | 147 ++++ .../fr/ifremer/tutti/service/TuttiDataContext.java | 41 +- .../tutti/service/bigfin/BigfinDataRowModel.java | 138 ---- .../tutti/service/bigfin/BigfinImportContext.java | 381 ++++++++++ .../tutti/service/bigfin/BigfinImportService.java | 366 +++++----- .../fr/ifremer/tutti/service/bigfin/Signs.java | 216 ------ .../service/bigfin/{ => csv}/BigfinDataRow.java | 75 +- .../service/bigfin/csv/BigfinDataRowModel.java | 233 +++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 66 ++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 133 ++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 51 ++ .../ifremer/tutti/service/bigfin/signs/Size.java | 135 ++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 116 +++ .../catches/ValidateCruiseOperationsService.java | 38 +- .../service/catches/WeightComputingService.java | 15 +- .../tutti/service/export/ExportCatchContext.java | 40 +- .../ToConfirmReportBatchEntryBean.java | 88 +++ .../toconfirmreport/ToConfirmReportBean.java | 79 +++ .../ToConfirmReportFishingOperationBean.java | 84 +++ .../ToConfirmReportFishingOperationData.java | 141 ++++ .../toconfirmreport/ToConfirmReportService.java | 221 ++++++ .../resources/ftl/toConfirmSpeciesReport_fr.ftl | 189 +++++ .../resources/i18n/tutti-service_en_GB.properties | 11 + .../resources/i18n/tutti-service_fr_FR.properties | 13 +- tutti-ui-swing-updater/pom.xml | 2 +- .../tutti/ui/swing/updater/DeleteHelper.java | 27 + .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 14 +- .../src/main/resources/update_runtime.bat | 29 +- .../src/main/resources/update_runtime.sh | 21 +- tutti-ui-swing/pom.xml | 69 +- .../src/main/assembly/full-linux-component.xml | 2 +- .../src/main/assembly/full-shared-component.xml | 45 +- .../src/main/assembly/full-windows-component.xml | 3 +- .../{full-windows-component.xml => launcher.xml} | 61 +- .../main/assembly/{full => launcher}/README.txt | 0 .../{full => launcher}/linux/tutti-sanity.sh | 2 +- .../assembly/{full => launcher}/linux/tutti.sh | 2 +- .../{full => launcher}/windows/tutti-sanity.bat | 0 .../assembly/{full => launcher}/windows/tutti.bat | 0 .../src/main/assembly/report/version.appup | 1 - tutti-ui-swing/src/main/assembly/standalone.xml | 39 +- .../main/assembly/standalone/launcher.properties | 9 +- .../src/main/assembly/standalone/linux/launch.sh | 8 +- .../main/assembly/standalone/windows/launch.bat | 7 +- .../src/main/filtered-resources/log4j.properties | 5 +- .../filtered-resources/tutti-help-fr.properties | 5 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 48 +- .../ui/swing/action/CloseApplicationAction.java | 4 +- .../tutti/ui/swing/action/CloseDbAction.java | 5 +- .../ui/swing/action/ExportAndCleanDbAction.java | 21 +- .../tutti/ui/swing/action/ExportDbAction.java | 6 +- .../tutti/ui/swing/action/ImportDbAction.java | 6 +- .../tutti/ui/swing/action/OpenDbAction.java | 6 +- .../tutti/ui/swing/action/ReimportDbAction.java | 9 +- .../tutti/ui/swing/action/ReinstallDbAction.java | 9 +- .../tutti/ui/swing/action/ReloadTuttiAction.java | 2 +- .../action/SaveSampleCategoryModelAction.java | 2 +- ... => SpeciesToConfirmReportForCruiseAction.java} | 95 +-- .../ui/swing/action/UpdateApplicationAction.java | 2 +- .../tutti/ui/swing/action/UpdateReportAction.java | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 12 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 1 + .../operation/catches/EditCatchesSvgHandler.java | 774 +++++++++++++++++++++ .../content/operation/catches/EditCatchesUI.css | 241 ------- .../content/operation/catches/EditCatchesUI.jaxx | 200 +----- .../operation/catches/EditCatchesUIHandler.java | 634 ++--------------- .../replace/AbstractReplaceTemporaryUIModel.java | 2 +- .../validation/ValidateCruiseUIHandler.java | 13 +- .../content/validation/ValidateCruiseUIModel.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 79 ++- .../util/AbstractTuttiTabContainerUIHandler.java | 55 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 21 +- .../tutti/ui/swing/util/catches/EnterWeightUI.jaxx | 6 +- .../swing/util/catches/EnterWeightUIHandler.java | 72 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 318 +++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 9 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 13 +- 104 files changed, 4345 insertions(+), 2163 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 fd3b9b7c3b233de9be6c4024fc27f37a61ebffba Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:43:00 2015 +0000 [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-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 447d0be..42f3472 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index a873dad..729b12f 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 56f92cf..67d47ef 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 347b320..2208c5a 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.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index ab763a5..84c2c1c 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.14-SNAPSHOT</version> + <version>3.13</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 90a07d1..a444e3d 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.14-SNAPSHOT</version> + <version>3.13</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 84cc0160a82bead731eb75c0ab6b10217178b78d Merge: fd3b9b7 e7092d8 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:43:02 2015 +0000 Merge branch 'master' into develop .../java/fr/ifremer/tutti/util/NumbersTest.java | 24 ++++++++++++++++++++++ .../java/fr/ifremer/tutti/service/SpeciesMap.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/BigfinImportContext.java | 24 ++++++++++++++++++++++ .../service/bigfin/csv/SpeciesOrSpeciesBatch.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Sign.java | 24 ++++++++++++++++++++++ .../ifremer/tutti/service/bigfin/signs/Size.java | 24 ++++++++++++++++++++++ .../tutti/service/bigfin/signs/VracHorsVrac.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationBean.java | 24 ++++++++++++++++++++++ .../ToConfirmReportFishingOperationData.java | 24 ++++++++++++++++++++++ .../toconfirmreport/ToConfirmReportService.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../operation/catches/EditCatchesSvgHandler.java | 24 ++++++++++++++++++++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 16 files changed, 337 insertions(+), 1 deletion(-) -- 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 6741be42795c5ff19539f2f8785b2299f025311c Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 10 15:43:04 2015 +0000 [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-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 42f3472..447d0be 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13</version> + <version>3.14-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 729b12f..a873dad 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.13</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 67d47ef..56f92cf 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.13</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 2208c5a..347b320 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.13</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 84c2c1c..ab763a5 100644 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.13</version> + <version>3.14-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a444e3d..90a07d1 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.13</version> + <version>3.14-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