branch develop updated (26e222c -> 9c486b9)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 26e222c Correction du format de cellvolume (c'est un float et non pas un integer) (See #7865) new 8153da8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ecc1b0c [jgitflow-maven-plugin]updating poms for 2.9.1 branch with snapshot versions new 0494feb [jgitflow-maven-plugin]updating poms for branch'release/2.9.1' with non-snapshot versions new ca9ca02 [jgitflow-maven-plugin]merging 'release/2.9.1' into 'master' new cb892ae [jgitflow-maven-plugin]merging 'master' into 'develop' new 9c486b9 [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 9c486b987a210098e1cc6b05ca31c164555d18db Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:07 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit cb892ae2a7eb67cf00d624d8f4be43c3eedbcad0 Merge: 8153da8 ca9ca02 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:07 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 8153da8e345a8e0449198c7ebbb63c3b2156a67a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:07 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ca9ca02a3e21b7847eedabe46725274ea36a8c2b Merge: 437ca02 0494feb Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:03 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.9.1' into 'master' commit 0494feb1ae86b37bf1359b780af2f74e2979dadb Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:26:34 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.9.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 echobase. See http://git.codelutin.com/echobase.git commit 0494feb1ae86b37bf1359b780af2f74e2979dadb Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:26:34 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.9.1' with non-snapshot versions --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 9150d43..0e0bc56 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1-SNAPSHOT</version> + <version>2.9.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 8889e54..773cffa 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1-SNAPSHOT</version> + <version>2.9.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index dd9d4f2..bb9cd25 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1-SNAPSHOT</version> + <version>2.9.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index d5d5e85..acd35f3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1-SNAPSHOT</version> + <version>2.9.1</version> <modules> <module>echobase-domain</module> -- 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 echobase. See http://git.codelutin.com/echobase.git commit ca9ca02a3e21b7847eedabe46725274ea36a8c2b Merge: 437ca02 0494feb Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:03 2016 +0100 [jgitflow-maven-plugin]merging 'release/2.9.1' into 'master' echobase-domain/pom.xml | 2 +- .../main/java/fr/ifremer/echobase/entities/data/VoyageImpl.java | 7 ++++--- echobase-services/pom.xml | 2 +- .../services/service/importdata/csv/AcousticImportModel.java | 2 +- echobase-ui/pom.xml | 2 +- echobase-ui/src/main/resources/struts.xml | 2 +- pom.xml | 2 +- 7 files changed, 10 insertions(+), 9 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 echobase. See http://git.codelutin.com/echobase.git commit 8153da8e345a8e0449198c7ebbb63c3b2156a67a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:07 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 4102e99..0e0bc56 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.9.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index a9b9c73..773cffa 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.9.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index c3c94af..bb9cd25 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.9.1</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 6e42a10..acd35f3 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.9.1</version> <modules> <module>echobase-domain</module> -- 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 echobase. See http://git.codelutin.com/echobase.git commit cb892ae2a7eb67cf00d624d8f4be43c3eedbcad0 Merge: 8153da8 ca9ca02 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:07 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 echobase. See http://git.codelutin.com/echobase.git commit 9c486b987a210098e1cc6b05ca31c164555d18db Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 12 16:29:07 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-domain/pom.xml b/echobase-domain/pom.xml index 0e0bc56..4102e99 100644 --- a/echobase-domain/pom.xml +++ b/echobase-domain/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index 773cffa..a9b9c73 100644 --- a/echobase-services/pom.xml +++ b/echobase-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index bb9cd25..c3c94af 100644 --- a/echobase-ui/pom.xml +++ b/echobase-ui/pom.xml @@ -7,7 +7,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index acd35f3..6e42a10 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.9.1</version> + <version>3.0-SNAPSHOT</version> <modules> <module>echobase-domain</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm