branch develop updated (9b8214f -> 2c797de)
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 9b8214f Fix scm section new aaab304 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 9196e4b [jgitflow-maven-plugin]updating poms for 2.10 branch with snapshot versions new 1e38884 [jgitflow-maven-plugin]updating poms for branch'release/2.10' with non-snapshot versions new 437ca02 [jgitflow-maven-plugin]merging 'release/2.10' into 'master' new 13477a3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 2c797de [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 2c797de35b3fa80569b63878dc36036176447e96 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:48 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 13477a3e31fee1cb1e94515b9cbb5ffa40ca2bf4 Merge: aaab304 437ca02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:45 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit aaab304ce197eb04902d9fd5d152ab35aff1da70 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:43 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 437ca02e6a29d952929d4f9e88da363c33fc48bb Merge: df07e0f 1e38884 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:37 2015 +0100 [jgitflow-maven-plugin]merging 'release/2.10' into 'master' commit 1e388842769e91c74a324e0f8250d297f3721066 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:30:06 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.10' 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 1e388842769e91c74a324e0f8250d297f3721066 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:30:06 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.10' 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 39237f1..6727fb2 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.10-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index c9d296b..4d44488 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.10-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index 2358853..ca57b14 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.10-SNAPSHOT</version> + <version>2.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 70ee4cf..3c576b2 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.10-SNAPSHOT</version> + <version>2.10</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 437ca02e6a29d952929d4f9e88da363c33fc48bb Merge: df07e0f 1e38884 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:37 2015 +0100 [jgitflow-maven-plugin]merging 'release/2.10' into 'master' echobase-domain/pom.xml | 2 +- echobase-services/pom.xml | 2 +- echobase-ui/pom.xml | 2 +- .../webapp/WEB-INF/jsp/exportCoser/configure.jsp | 2 +- pom.xml | 27 +++++----------------- src/site/en/rst/{install.rst => install.rst.vm} | 0 src/site/rst/install.rst.vm | 6 +++-- src/site/site_en.xml | 8 +++++++ src/site/site_fr.xml | 12 ++++++++-- 9 files changed, 32 insertions(+), 29 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 aaab304ce197eb04902d9fd5d152ab35aff1da70 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:43 2015 +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..6727fb2 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.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-services/pom.xml b/echobase-services/pom.xml index a9b9c73..4d44488 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.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/echobase-ui/pom.xml b/echobase-ui/pom.xml index c3c94af..ca57b14 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.10</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 6e42a10..3c576b2 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.10</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 13477a3e31fee1cb1e94515b9cbb5ffa40ca2bf4 Merge: aaab304 437ca02 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:45 2015 +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 2c797de35b3fa80569b63878dc36036176447e96 Author: Maven Release <maven-release@codelutin.com> Date: Mon Dec 21 13:31:48 2015 +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 6727fb2..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.10</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 4d44488..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.10</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 ca57b14..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.10</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> diff --git a/pom.xml b/pom.xml index 3c576b2..6e42a10 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>2.10</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