[wao] branch develop updated (ddc0e5a -> 0482f72)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from ddc0e5a [jgitflow-maven-plugin]updating poms for 4.2-RC3-SNAPSHOT development new e660385 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b1c881c [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC2' with non-snapshot versions new 8b04093 Merge branch 'release/4.2-RC2' new b668ab2 Merge branch 'master' into develop new 0482f72 [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 0482f7227a1bd41957cf9049a0a596ee97f0d59b Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:47 2014 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b668ab2463ff338e239e9dfcff8cb716100dba24 Merge: e660385 8b04093 Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:47 2014 +0100 Merge branch 'master' into develop commit e660385f0fcc45c789132643b734a1cb8e6e23a5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:47 2014 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 8b0409342326c8a0ec59d270831f596461b8c0a3 Merge: a403303 b1c881c Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:45 2014 +0100 Merge branch 'release/4.2-RC2' commit b1c881cfb986b3c126c95363687d63205df0dc2f Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:20:04 2014 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC2' 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 wao. See http://git.codelutin.com/wao.git commit b1c881cfb986b3c126c95363687d63205df0dc2f Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:20:04 2014 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2-RC2' with non-snapshot versions --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index e921973..73390c6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2-SNAPSHOT</version> + <version>4.2-RC2</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 80f3419..8069fea 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2-SNAPSHOT</version> + <version>4.2-RC2</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index fc0e0a9..2d3bcb8 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2-SNAPSHOT</version> + <version>4.2-RC2</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 50c2794..dc8266b 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2-SNAPSHOT</version> + <version>4.2-RC2</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit 8b0409342326c8a0ec59d270831f596461b8c0a3 Merge: a403303 b1c881c Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:45 2014 +0100 Merge branch 'release/4.2-RC2' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- .../wao/services/service/ContactsService.java | 2 ++ .../service/csv/ContactImportExportModel.java | 1 + wao-web/pom.xml | 2 +- .../wao/web/DefaultWaoApplicationContext.java | 39 ++++++++++++++++++++++ .../web/converter/JFreeChartToImgTagConverter.java | 15 ++++++++- .../main/resources/i18n/wao-web_fr_FR.properties | 4 +-- 9 files changed, 62 insertions(+), 7 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 wao. See http://git.codelutin.com/wao.git commit e660385f0fcc45c789132643b734a1cb8e6e23a5 Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:47 2014 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 184913e..73390c6 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC3-SNAPSHOT</version> + <version>4.2-RC2</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index b37e9e4..8069fea 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC3-SNAPSHOT</version> + <version>4.2-RC2</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index dfb1033..2d3bcb8 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC3-SNAPSHOT</version> + <version>4.2-RC2</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index ac70646..dc8266b 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC3-SNAPSHOT</version> + <version>4.2-RC2</version> </parent> <artifactId>wao-web</artifactId> -- 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 wao. See http://git.codelutin.com/wao.git commit b668ab2463ff338e239e9dfcff8cb716100dba24 Merge: e660385 8b04093 Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:47 2014 +0100 Merge branch '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 wao. See http://git.codelutin.com/wao.git commit 0482f7227a1bd41957cf9049a0a596ee97f0d59b Author: Maven Release <maven-release@codelutin.com> Date: Wed Oct 29 12:22:47 2014 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- wao-persistence/pom.xml | 2 +- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 73390c6..184913e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2</version> + <version>4.2-RC3-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 8069fea..b37e9e4 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2</version> + <version>4.2-RC3-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 2d3bcb8..dfb1033 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2</version> + <version>4.2-RC3-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index dc8266b..ac70646 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2-RC2</version> + <version>4.2-RC3-SNAPSHOT</version> </parent> <artifactId>wao-web</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm