branch develop updated (5405695 -> 90c3842)
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 5405695 [jgitflow-maven-plugin]updating poms for 5.1-SNAPSHOT development new 3af26ff [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 429443c [jgitflow-maven-plugin]updating poms for branch'release/5.0' with non-snapshot versions new fce17c4 Merge branch 'release/5.0' new 2dd0e0b Merge branch 'master' into develop new 90c3842 [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 90c38420b51484f4f0c3fdec0a41e22bb87a9e8b Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:10 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 2dd0e0b5f04a2c11bc04d2394037f3a0b816521d Merge: 3af26ff fce17c4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:10 2015 +0000 Merge branch 'master' into develop commit 3af26ff36fc5defab08beb81ecdf82916b9657e9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:10 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit fce17c4a56ab23b60f3db42b8c248ffca5a2d1e4 Merge: 86eaaef 429443c Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:08 2015 +0000 Merge branch 'release/5.0' commit 429443cd82936fe382a9ccdb879a14d3ff84d788 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:41:32 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0' 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 429443cd82936fe382a9ccdb879a14d3ff84d788 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:41:32 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/5.0' 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 8da7a50..11ce9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 26c6ea3..2828e0e 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 3d39d69..0d4b0d3 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index d54b842..13c8db4 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0-SNAPSHOT</version> + <version>5.0</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 fce17c4a56ab23b60f3db42b8c248ffca5a2d1e4 Merge: 86eaaef 429443c Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:08 2015 +0000 Merge branch 'release/5.0' pom.xml | 2 +- wao-persistence/pom.xml | 2 +- .../wao/entity/IndividualMeasurementStrategy.java | 43 +++++++--------------- .../i18n/wao-persistence_en_GB.properties | 20 +++++++--- .../i18n/wao-persistence_fr_FR.properties | 20 +++++++--- wao-services/pom.xml | 2 +- wao-web/pom.xml | 2 +- 7 files changed, 46 insertions(+), 45 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 3af26ff36fc5defab08beb81ecdf82916b9657e9 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:10 2015 +0000 [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 1112af8..11ce9bf 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 7336997..2828e0e 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index f50ac53..0d4b0d3 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 08e2ca1..13c8db4 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.1-SNAPSHOT</version> + <version>5.0</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 2dd0e0b5f04a2c11bc04d2394037f3a0b816521d Merge: 3af26ff fce17c4 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:10 2015 +0000 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 90c38420b51484f4f0c3fdec0a41e22bb87a9e8b Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 24 09:44:10 2015 +0000 [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 11ce9bf..1112af8 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0</version> + <version>5.1-SNAPSHOT</version> <packaging>pom</packaging> <name>Wao</name> diff --git a/wao-persistence/pom.xml b/wao-persistence/pom.xml index 2828e0e..7336997 100644 --- a/wao-persistence/pom.xml +++ b/wao-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>wao-persistence</artifactId> diff --git a/wao-services/pom.xml b/wao-services/pom.xml index 0d4b0d3..f50ac53 100644 --- a/wao-services/pom.xml +++ b/wao-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0</version> + <version>5.1-SNAPSHOT</version> </parent> <artifactId>wao-services</artifactId> diff --git a/wao-web/pom.xml b/wao-web/pom.xml index 13c8db4..08e2ca1 100644 --- a/wao-web/pom.xml +++ b/wao-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>5.0</version> + <version>5.1-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