branch develop updated (a12389a -> bc15c1a)
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 a12389a [jgitflow-maven-plugin]updating poms for 4.0.6-SNAPSHOT development new a1afca0 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b537f43 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' with non-snapshot versions new 6e3a108 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' new 194926b [jgitflow-maven-plugin]merging 'master' into 'develop' new bc15c1a [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 bc15c1ad44e9e51a1d7634a89e5a27298c4ae5e6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:54:00 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 194926bae2651222f1d40b6eae50e8f49278ff6b Merge: a1afca0 6e3a108 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:54:00 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit a1afca09f130ae6266fddcdfa55ae5875de59b4d Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:53:59 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6e3a10818c88912c736552e347b9ef73d32a46d8 Merge: a295daf b537f43 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:53:54 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' commit b537f4386cea0bc3720005410224c0f6d14de1f6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:48:33 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' 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 b537f4386cea0bc3720005410224c0f6d14de1f6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:48:33 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/4.0.5' 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 a8f5f30..3e82a70 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.5-SNAPSHOT</version> + <version>4.0.5</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 4164a47..02e2a4e 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 382fc2a..655fa9c 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index ae399ad..1f7188f 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 3f61997..6869c58 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 9f80514..484ed52 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.5-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 95cc832..ba48c03 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.5-SNAPSHOT</version> + <version>4.0.5</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 6e3a10818c88912c736552e347b9ef73d32a46d8 Merge: a295daf b537f43 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:53:54 2015 +0200 [jgitflow-maven-plugin]merging 'release/4.0.5' into 'master' pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../service/CruisePersistenceServiceImpl.java | 20 -------------------- .../util/VesselPersonFeaturesPersistenceHelper.java | 1 - tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 9 files changed, 7 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 a1afca09f130ae6266fddcdfa55ae5875de59b4d Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:53:59 2015 +0200 [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 36ca153..3e82a70 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.6-SNAPSHOT</version> + <version>4.0.5</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 875acd1..02e2a4e 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.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index d17724e..655fa9c 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.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 3c39cff..1f7188f 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.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 52d1f14..6869c58 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.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing-updater/pom.xml b/tutti-ui-swing-updater/pom.xml index 8128002..484ed52 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.6-SNAPSHOT</version> + <version>4.0.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 32b440e..ba48c03 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.6-SNAPSHOT</version> + <version>4.0.5</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 194926bae2651222f1d40b6eae50e8f49278ff6b Merge: a1afca0 6e3a108 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:54:00 2015 +0200 [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 bc15c1ad44e9e51a1d7634a89e5a27298c4ae5e6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Aug 25 16:54:00 2015 +0200 [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 3e82a70..36ca153 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>4.0.5</version> + <version>4.0.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> diff --git a/tutti-ichtyometer/pom.xml b/tutti-ichtyometer/pom.xml index 02e2a4e..875acd1 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 655fa9c..d17724e 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-report-generator/pom.xml b/tutti-report-generator/pom.xml index 1f7188f..3c39cff 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 6869c58..52d1f14 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.5</version> + <version>4.0.6-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 484ed52..8128002 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.5</version> + <version>4.0.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index ba48c03..32b440e 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.5</version> + <version>4.0.6-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