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 20653dcaacede101a51bca62ac38a8e1eac517c6 Merge: 9654d30 ab1d55b Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 26 19:21:15 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/LICENSE.txt | 674 +++++++++++++++++++++ tutti-ui-swing-updater/pom.xml | 18 +- .../tutti/ui/swing/updater/DeleteHelper.java | 24 + .../fr/ifremer/tutti/ui/swing/updater/Module.java | 24 + .../fr/ifremer/tutti/ui/swing/updater/Updater.java | 24 + tutti-ui-swing/pom.xml | 2 +- 10 files changed, 767 insertions(+), 7 deletions(-) diff --cc pom.xml index 7aed8f5,7aed8f5..56662f4 --- a/pom.xml +++ b/pom.xml @@@ -32,7 -32,7 +32,7 @@@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> -- <version>3.12</version> ++ <version>3.13-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --cc tutti-ichtyometer/pom.xml index 69993a2,69993a2..df0cc25 --- a/tutti-ichtyometer/pom.xml +++ b/tutti-ichtyometer/pom.xml @@@ -27,7 -27,7 +27,7 @@@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> -- <version>3.12</version> ++ <version>3.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --cc tutti-persistence/pom.xml index 715930a,715930a..546f64a --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@@ -27,7 -27,7 +27,7 @@@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> -- <version>3.12</version> ++ <version>3.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --cc tutti-service/pom.xml index 34a2bd6,34a2bd6..bdda5e6 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@@ -27,7 -27,7 +27,7 @@@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> -- <version>3.12</version> ++ <version>3.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --cc tutti-ui-swing-updater/pom.xml index 063d722,7bba0ca..dae37b6 --- a/tutti-ui-swing-updater/pom.xml +++ b/tutti-ui-swing-updater/pom.xml @@@ -5,17 -5,18 +5,31 @@@ Copyright (C) 2013 - 2014 Ifremer %% This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by ++<<<<<<< HEAD it under the terms of the GNU Affero 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 Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses />. ++======= + 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>. ++>>>>>>> refs/heads/master #L% --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@@ -24,7 -25,7 +38,7 @@@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> -- <version>3.12</version> ++ <version>3.13-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --cc tutti-ui-swing/pom.xml index 7e381c1,7e381c1..2ab977a --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@@ -27,7 -27,7 +27,7 @@@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> -- <version>3.12</version> ++ <version>3.13-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>.