branch develop updated (7f00023 -> 15dfa6a)
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 7f00023 [jgitflow-maven-plugin]updating poms for 4.0-RC2-SNAPSHOT development new 8e6ec7c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4ea6c96 [jgitflow-maven-plugin]updating poms for branch '4.0-RC1' with snapshot versions new 33b14a5 add license headers new cf05752 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions new ec86284 Merge branch 'release/4.0-RC1' new e810999 Merge branch 'master' into develop new 15dfa6a [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 15dfa6ac5ec2df102432f8d124239b78df48e55c Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:29 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e8109991e137fabccf190f777e9c75f71d117856 Merge: 8e6ec7c ec86284 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:29 2015 +0000 Merge branch 'master' into develop commit 8e6ec7c91bbff7f2e7158a36992aa6b83f0a2a45 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:28 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ec862843e6e1afa22aedfa0712e6aab0b2a07c9f Merge: 8bc5347 cf05752 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:23 2015 +0000 Merge branch 'release/4.0-RC1' commit cf057524597ebb83f82fd5e80d96fd8c0fbc38d8 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:45:33 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions commit 33b14a5fd02b3bbc9f1fc617047a5f13cac3b38a Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:45:15 2015 +0000 add license headers Summary of changes: .../tutti/ichtyometer/RemoteDevicesFinder.java | 24 ++++++++++++++++++++++ .../tutti/ichtyometer/ServiceRecordsFinder.java | 24 ++++++++++++++++++++++ .../util/actions/ShowComboBoxPopupActions.java | 24 ++++++++++++++++++++++ 3 files changed, 72 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 33b14a5fd02b3bbc9f1fc617047a5f13cac3b38a Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:45:15 2015 +0000 add license headers --- .../tutti/ichtyometer/RemoteDevicesFinder.java | 24 ++++++++++++++++++++++ .../tutti/ichtyometer/ServiceRecordsFinder.java | 24 ++++++++++++++++++++++ .../util/actions/ShowComboBoxPopupActions.java | 24 ++++++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDevicesFinder.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDevicesFinder.java index e79f907..944a634 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDevicesFinder.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/RemoteDevicesFinder.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer; +/* + * #%L + * Tutti :: Ichtyometer API + * $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.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/ServiceRecordsFinder.java b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/ServiceRecordsFinder.java index a4d39f0..1970679 100644 --- a/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/ServiceRecordsFinder.java +++ b/tutti-ichtyometer/src/main/java/fr/ifremer/tutti/ichtyometer/ServiceRecordsFinder.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ichtyometer; +/* + * #%L + * Tutti :: Ichtyometer API + * $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.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java index 62f3ca7..fb3a9ab 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/actions/ShowComboBoxPopupActions.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.util.actions; +/* + * #%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 javax.swing.JComboBox; import java.util.TimerTask; -- 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 cf057524597ebb83f82fd5e80d96fd8c0fbc38d8 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:45:33 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC1' with non-snapshot versions --- pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 52bd47c..99db92d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4df79f4..dc4f19b 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9cb5a54..56a5be3 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 61b7e94..ad48a19 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 49cc3fc..e07aa38 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index cdd9667..83af374 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>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 3d32272..ceeb8d5 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>4.0-RC1-SNAPSHOT</version> + <version>4.0-RC1</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 ec862843e6e1afa22aedfa0712e6aab0b2a07c9f Merge: 8bc5347 cf05752 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:23 2015 +0000 Merge branch 'release/4.0-RC1' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- .../tutti/ichtyometer/IchtyometerClient.java | 192 ++++---------------- .../tutti/ichtyometer/RemoteDevicesFinder.java | 159 +++++++++++++++++ .../tutti/ichtyometer/ServiceRecordsFinder.java | 144 +++++++++++++++ .../tutti/ichtyometer/tool/FeedReaderTool.java | 2 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 2 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 10 +- .../tutti/ichtyometer/IchtyometerClientTest.java | 2 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 2 +- .../ichtyometer/interactive/CommandEngineTest.java | 2 +- tutti-persistence/pom.xml | 2 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 9 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 15 +- .../tutti/persistence/TuttiPersistence.java | 2 + .../tutti/persistence/TuttiPersistenceImpl.java | 48 +++-- .../persistence/TuttiPersistenceNoDbImpl.java | 9 +- .../tutti/persistence/entities/data/Cruises.java | 15 ++ .../entities/data/FishingOperations.java | 38 ++++ .../entities/data/SpeciesAbleBatchs.java | 11 ++ .../persistence/entities/referential/Speciess.java | 7 + .../tutti/persistence/model/ProgramDataModel.java | 12 +- .../service/BenthosBatchPersistenceService.java | 2 +- .../BenthosBatchPersistenceServiceImpl.java | 169 +----------------- .../MarineLitterBatchPersistenceServiceImpl.java | 15 +- .../service/SpeciesBatchPersistenceService.java | 2 +- .../SpeciesBatchPersistenceServiceImpl.java | 196 +-------------------- .../service/util/BatchPersistenceHelper.java | 71 +++++--- .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 4 +- .../BenthosBatchPersistenceServiceWriteTest.java | 2 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../ifremer/tutti/service/PersistenceService.java | 13 +- .../tutti/service/bigfin/BigfinImportService.java | 2 +- .../catches/multipost/MultiPostImportService.java | 4 +- .../genericformat/GenericFormatContextSupport.java | 30 +++- .../genericformat/GenericFormatExportService.java | 62 ------- .../GenericFormatImportConfiguration.java | 13 -- .../GenericFormatImportCruiseContext.java | 16 ++ .../GenericFormatImportCruiseResult.java | 10 +- .../GenericFormatImportOperationContext.java | 19 ++ .../GenericFormatImportOperationResult.java | 42 +---- .../genericformat/GenericFormatImportRequest.java | 4 - .../genericformat/GenericFormatImportResult.java | 2 +- .../GenericFormatReferentialImportResult.java | 5 + .../genericformat/GenericFormatResultSupport.java | 9 +- .../GenericFormatValidateFileContext.java | 4 +- .../GenericFormatValidateFileResult.java | 7 + .../GenericformatImportPersistenceHelper.java | 4 +- .../consumer/CsvConsumerForCatch.java | 2 + .../consumer/CsvConsumerForSurvey.java | 6 +- .../service/genericformat/csv/CatchModel.java | 4 +- .../importactions/DoCheckWeightAction.java | 1 + .../importactions/ImportCatchAction.java | 3 +- .../importactions/RestoreAfterValidateAction.java | 132 ++++++++++++-- .../service/psionimport/PsionImportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 6 +- .../service/report/ReportGenerationService.java | 29 ++- .../resources/ftl/genericFormatImportReport_fr.ftl | 165 ++++++++++------- .../ftl/genericFormatValidateReport_fr.ftl | 86 +++++++-- .../ifremer/tutti/service/ServiceDbResource.java | 17 +- .../service/bigfin/BigfinImportService2Test.java | 2 +- .../GenericFormatExportServiceAno5804Test.java | 14 +- .../GenericFormatExportServiceTest.java | 27 ++- .../GenericFormatImportServiceTest.java | 104 +---------- .../GenericFormatImportServiceValidTest.java | 13 ++ tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 15 ++ .../actions/AbstractChangeScreenAction.java | 36 ++++ .../content/actions/ConnectIchtyometerAction.java | 10 +- .../EditCatchesForSelectedCruiseAction.java | 1 + .../content/actions/EditSelectedCruiseAction.java | 4 + .../content/actions/EditSelectedProgramAction.java | 3 + .../actions/OpenGenericFormatExportScreen.java | 21 +-- .../actions/OpenGenericFormatImportScreen.java | 21 +-- .../content/actions/OpenReportScreenAction.java | 12 +- .../OpenTemporaryReferentialScreenAction.java | 1 + .../swing/content/config/TuttiConfigUIHandler.java | 7 + .../swing/content/db/actions/ReimportDbAction.java | 75 +++++--- .../content/db/actions/ReinstallDbAction.java | 73 +++++--- .../GenericFormatExportUIHandler.java | 5 + .../genericformat/GenericFormatImportUI.css | 7 - .../genericformat/GenericFormatImportUI.jaxx | 9 - .../GenericFormatImportUIHandler.java | 7 +- .../genericformat/GenericFormatImportUIModel.java | 20 +-- .../actions/GenericFormatImportAction.java | 40 ++++- .../genericformat/tree/CruiseSelectTreeNode.java | 19 +- .../genericformat/tree/DataSelectTreeModel.java | 11 +- .../tree/ExportDataSelectTreeCellRenderer.java | 21 ++- .../tree/ImportDataSelectTreeCellRenderer.java | 29 +-- .../genericformat/tree/ProgramSelectTreeNode.java | 12 ++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 17 +- .../swing/content/home/SelectCruiseUIHandler.java | 106 +---------- .../content/home/actions/DeleteProtocolAction.java | 11 +- .../content/home/actions/EditCruiseAction.java | 1 + .../content/home/actions/EditProgramAction.java | 1 + .../content/home/actions/ExportProtocolAction.java | 5 +- .../content/home/actions/NewCruiseAction.java | 1 + .../content/home/actions/NewProgramAction.java | 1 + .../catches/benthos/BenthosBatchUIHandler.java | 2 +- .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../referential/ManageTemporaryReferentialUI.css | 12 +- .../referential/ManageTemporaryReferentialUI.jaxx | 23 +-- .../ManageTemporaryReferentialUIHandler.java | 112 ------------ .../actions/ExportExistingTemporaryGearAction.java | 6 +- .../ExportExistingTemporaryPersonAction.java | 6 +- .../ExportExistingTemporarySpeciesAction.java | 4 +- .../ExportExistingTemporaryVesselAction.java | 4 +- .../actions/ImportTemporaryGearAction.java | 2 +- .../actions/ImportTemporaryPersonAction.java | 2 +- .../actions/ImportTemporarySpeciesAction.java | 2 +- .../actions/ImportTemporaryVesselAction.java | 2 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 8 +- .../OpenReplaceTemporaryPersonUIAction.java | 8 +- .../OpenReplaceTemporarySpeciesUIAction.java | 8 +- .../OpenReplaceTemporaryVesselUIAction.java | 8 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 94 ++++++++++ .../util/actions/ShowComboBoxPopupActions.java | 25 ++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 20 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 30 ++-- 124 files changed, 1626 insertions(+), 1394 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 8e6ec7c91bbff7f2e7158a36992aa6b83f0a2a45 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:28 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-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b8bb9df..99db92d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 6e7bae1..dc4f19b 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 9ec9a37..56a5be3 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index d6fc696..ad48a19 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index d020dd7..e07aa38 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 2287152..83af374 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>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 22e47cd..ceeb8d5 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>4.0-RC2-SNAPSHOT</version> + <version>4.0-RC1</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 e8109991e137fabccf190f777e9c75f71d117856 Merge: 8e6ec7c ec86284 Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:29 2015 +0000 Merge branch 'master' into develop .../tutti/ichtyometer/RemoteDevicesFinder.java | 24 ++++++++++++++++++++++ .../tutti/ichtyometer/ServiceRecordsFinder.java | 24 ++++++++++++++++++++++ .../util/actions/ShowComboBoxPopupActions.java | 24 ++++++++++++++++++++++ 3 files changed, 72 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 15dfa6ac5ec2df102432f8d124239b78df48e55c Author: Maven Release <maven-release@codelutin.com> Date: Sun Apr 5 06:52:29 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-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 99db92d..b8bb9df 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index dc4f19b..6e7bae1 100644 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 56a5be3..9ec9a37 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index ad48a19..d6fc696 100644 --- a/tutti-report-generator/pom.xml +++ b/tutti-report-generator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index e07aa38..d020dd7 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC1</version> + <version>4.0-RC2-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 83af374..2287152 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>4.0-RC1</version> + <version>4.0-RC2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ceeb8d5..22e47cd 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>4.0-RC1</version> + <version>4.0-RC2-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