branch develop updated (d828fd7 -> 1db67bd)
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 d828fd7 Merge branch 'feature/6714' into 'develop' new a84b618 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds b9796d6 [jgitflow-maven-plugin]updating poms for 4.2.1 branch with snapshot versions new ea13caf [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' with non-snapshot versions new f5125de [jgitflow-maven-plugin]merging 'release/4.2.1' into 'master' new 8305b0e [jgitflow-maven-plugin]merging 'master' into 'develop' new 1db67bd [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 1db67bd8b1ae45c9cf7b0941e161191367806a5a Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:54 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 8305b0e42ecb30b07841651011d7a44b304ea047 Merge: a84b618 f5125de Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:53 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit a84b618264b6b7a0c6e9c98197d98047ab568bf5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:53 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit f5125de6712768fcb6ffccbbe625606213519957 Merge: b203959 ea13caf Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:46 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.2.1' into 'master' commit ea13caf4212ed6c14ef52b84e380a9083331b4ca Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:25:03 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' with non-snapshot versions Summary of changes: -- 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 ea13caf4212ed6c14ef52b84e380a9083331b4ca Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:25:03 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' 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 8f81c22..58541ca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>4.2.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4676fae..0c5a9d3 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.2.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 54136fb..2f1eab7 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.2.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index c29e998..85ebdcd 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.2.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index afa0754..61bfc9e 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.2.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index ef2d06e..e9c9370 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.2.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index a0ca950..341a4ba 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.2.1-SNAPSHOT</version> + <version>4.2.1</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 f5125de6712768fcb6ffccbbe625606213519957 Merge: b203959 ea13caf Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:46 2016 +0100 [jgitflow-maven-plugin]merging 'release/4.2.1' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../TuttiReferentialSynchroServiceImpl.java | 68 +++++++++++++++++++--- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 8 files changed, 68 insertions(+), 14 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 a84b618264b6b7a0c6e9c98197d98047ab568bf5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:53 2016 +0100 [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 f7c7fd1..58541ca 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.3-SNAPSHOT</version> + <version>4.2.1</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 3156dbd..0c5a9d3 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.3-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 40fdcfe..2f1eab7 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.3-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index bf6d29b..85ebdcd 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.3-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 2e5d508..61bfc9e 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.3-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index d969e87..e9c9370 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.3-SNAPSHOT</version> + <version>4.2.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index e26f64e..341a4ba 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.3-SNAPSHOT</version> + <version>4.2.1</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 8305b0e42ecb30b07841651011d7a44b304ea047 Merge: a84b618 f5125de Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:53 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 1db67bd8b1ae45c9cf7b0941e161191367806a5a Author: Maven Release <maven-release@codelutin.com> Date: Wed Jan 6 16:27:54 2016 +0100 [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 58541ca..f7c7fd1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.2.1</version> + <version>4.3-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 0c5a9d3..3156dbd 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.2.1</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 2f1eab7..40fdcfe 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.2.1</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 85ebdcd..bf6d29b 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.2.1</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 61bfc9e..2e5d508 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.2.1</version> + <version>4.3-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 e9c9370..d969e87 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.2.1</version> + <version>4.3-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 341a4ba..e26f64e 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.2.1</version> + <version>4.3-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