branch develop updated (9f77610 -> cf76282)
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 9f77610 [jgitflow-maven-plugin]updating poms for 4.0-RC4-SNAPSHOT development new 31a054b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 08c9baf add missing license headers new b3e3ae9 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions new b987ea6 Merge branch 'release/4.0-RC3' new eb9214d Merge branch 'master' into develop new cf76282 [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 cf76282bdca9aab0438a8063ba1d379b1b6942d5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:14 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit eb9214d967bee99e561126079fbd41a032f9c426 Merge: 31a054b b987ea6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:10 2015 +0000 Merge branch 'master' into develop commit 31a054b3acbca586560572493563ed36a7d58df8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:08 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b987ea6104dda1c69fd6760e839a2332e0a384c1 Merge: 6cca7a9 b3e3ae9 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:02 2015 +0000 Merge branch 'release/4.0-RC3' commit b3e3ae96aab4f73d0704e949fc2f2dfddcfc11e6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 13:59:42 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' with non-snapshot versions commit 08c9bafc290fc43830547a3663a7e101b4ccd49a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 13:59:23 2015 +0000 add missing license headers Summary of changes: .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 24 ++++++++++++++++++++++ .../tutti/ui/swing/updater/MoveHelperTest.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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 08c9bafc290fc43830547a3663a7e101b4ccd49a Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 13:59:23 2015 +0000 add missing license headers --- .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 24 ++++++++++++++++++++++ .../tutti/ui/swing/updater/MoveHelperTest.java | 24 ++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java index ef8e9b4..b4d0d38 100644 --- a/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java +++ b/tutti-ui-swing-updater/src/main/java/fr/ifremer/tutti/ui/swing/updater/MoveHelper.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.updater; +/* + * #%L + * Tutti :: UI Updater + * $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 java.io.IOException; import java.nio.file.FileVisitResult; import java.nio.file.Files; diff --git a/tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java b/tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java index 7110747..377dc3a 100644 --- a/tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java +++ b/tutti-ui-swing-updater/src/test/java/fr/ifremer/tutti/ui/swing/updater/MoveHelperTest.java @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.updater; +/* + * #%L + * Tutti :: UI Updater + * $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.Ignore; import org.junit.Test; -- 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 b3e3ae96aab4f73d0704e949fc2f2dfddcfc11e6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 13:59:42 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/4.0-RC3' 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 9b02a05..821d88a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4688400..79e5661 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index ddfea11..2c78194 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 0249d78..761ce47 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3615d1e..9b6019f 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 9bdb4e9..708d776 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 873c440..06923d5 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-RC3-SNAPSHOT</version> + <version>4.0-RC3</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 b987ea6104dda1c69fd6760e839a2332e0a384c1 Merge: 6cca7a9 b3e3ae9 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:02 2015 +0000 Merge branch 'release/4.0-RC3' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../importactions/ImportCatchAction.java | 8 ++ .../producer/CsvProducerForCatch.java | 20 +++- tutti-ui-swing-updater/pom.xml | 9 +- .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 121 +++++++++++++++++++++ .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 31 ++++-- .../ui/swing/updater/UpdaterFileSystemPathes.java | 27 ++++- .../tutti/ui/swing/updater/MoveHelperTest.java | 52 +++++++++ tutti-ui-swing/pom.xml | 2 +- .../swing/content/config/TuttiConfigUIHandler.java | 11 ++ 15 files changed, 273 insertions(+), 28 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 31a054b3acbca586560572493563ed36a7d58df8 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:08 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 8ff313f..821d88a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 895d9ea..79e5661 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 08e7f83..2c78194 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 426c6d2..761ce47 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 69125f4..9b6019f 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index b6f8c7c..708d776 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index acc022a..06923d5 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-RC4-SNAPSHOT</version> + <version>4.0-RC3</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 eb9214d967bee99e561126079fbd41a032f9c426 Merge: 31a054b b987ea6 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:10 2015 +0000 Merge branch 'master' into develop .../ifremer/tutti/ui/swing/updater/MoveHelper.java | 24 ++++++++++++++++++++++ .../tutti/ui/swing/updater/MoveHelperTest.java | 24 ++++++++++++++++++++++ 2 files changed, 48 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 cf76282bdca9aab0438a8063ba1d379b1b6942d5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Apr 15 14:06:14 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 821d88a..8ff313f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 79e5661..895d9ea 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 2c78194..08e7f83 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 761ce47..426c6d2 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 9b6019f..69125f4 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-RC3</version> + <version>4.0-RC4-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 708d776..b6f8c7c 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-RC3</version> + <version>4.0-RC4-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 06923d5..acc022a 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-RC3</version> + <version>4.0-RC4-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