[wao] branch develop updated (d764db7 -> a633eaf)
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 d764db7 [jgitflow-maven-plugin]updating poms for 4.2.2-SNAPSHOT development new fb98730 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1d7abc6 [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' with non-snapshot versions new d2cb61f Merge branch 'release/4.2.1' new 238c992 Merge branch 'master' into develop new a633eaf [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 a633eaf82e4d0388fb141ade221b29af759f850e Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:36 2014 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 238c992e4714450c9ec19cf0e70de8300ec5f6a5 Merge: fb98730 d2cb61f Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:35 2014 +0100 Merge branch 'master' into develop commit fb98730b3a7deb3f4930f8f729143aa0104990a6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:35 2014 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d2cb61f9d34ef95b5c7d0c74ccf77f166029472f Merge: 536f15a 1d7abc6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:33 2014 +0100 Merge branch 'release/4.2.1' commit 1d7abc674408187615d876c11531e7e569f4c0d9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:01:36 2014 +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 wao. See http://git.codelutin.com/wao.git commit 1d7abc674408187615d876c11531e7e569f4c0d9 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:01:36 2014 +0100 [jgitflow-maven-plugin]updating poms for branch'release/4.2.1' 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 a961ca1..d8893ba 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.1-SNAPSHOT</version> + <version>4.2.1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 187c7e0..cce435a 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.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 947af6b..d637b67 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.1-SNAPSHOT</version> + <version>4.2.1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 2e9cda0..0461bab 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.1-SNAPSHOT</version> + <version>4.2.1</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 d2cb61f9d34ef95b5c7d0c74ccf77f166029472f Merge: 536f15a 1d7abc6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:33 2014 +0100 Merge branch 'release/4.2.1' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../main/java/fr/ifremer/wao/entity/ContactState.java | 4 ++-- wao-services/pom.xml | 2 +- .../wao/services/service/SampleRowsFilterValues.java | 18 ++++++++++-------- wao-web/pom.xml | 2 +- 6 files changed, 16 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 wao. See http://git.codelutin.com/wao.git commit fb98730b3a7deb3f4930f8f729143aa0104990a6 Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:35 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 f41927e..d8893ba 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.2-SNAPSHOT</version> + <version>4.2.1</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index f482185..cce435a 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.2-SNAPSHOT</version> + <version>4.2.1</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 685af2f..d637b67 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.2-SNAPSHOT</version> + <version>4.2.1</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 57684f4..0461bab 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.2-SNAPSHOT</version> + <version>4.2.1</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 238c992e4714450c9ec19cf0e70de8300ec5f6a5 Merge: fb98730 d2cb61f Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:35 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 a633eaf82e4d0388fb141ade221b29af759f850e Author: Maven Release <maven-release@codelutin.com> Date: Thu Oct 30 18:04:36 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 d8893ba..f41927e 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>4.2.1</version> + <version>4.2.2-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index cce435a..f482185 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.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index d637b67..685af2f 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.1</version> + <version>4.2.2-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 0461bab..57684f4 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.1</version> + <version>4.2.2-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