branch develop updated (da0b12c -> 1ffab85)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git from da0b12c fixes #6425 fix search on documents new ed149c2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4bbff76 [jgitflow-maven-plugin]updating poms for branch '0.4.1' with snapshot versions new 8a032c9 [jgitflow-maven-plugin]updating poms for branch'release/0.4.1' with non-snapshot versions new 91289c7 Merge branch 'release/0.4.1' new 3187a1a Merge branch 'master' into develop new 1ffab85 [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 1ffab85d3cf18da5e99cabc270e5e2fc39a69490 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:37 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3187a1a682840ac5ea42abe13464997d26ea93cd Merge: ed149c2 91289c7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:36 2015 +0000 Merge branch 'master' into develop commit ed149c285c57206a905929147a2b44300c2991ea Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:36 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 91289c752d99e0fceb0777f46ec174cd8cdaad13 Merge: 498ec23 8a032c9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:35 2015 +0000 Merge branch 'release/0.4.1' commit 8a032c9e009f53b1496c34f8b12cd8712a485013 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:23:21 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.4.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 coselmar. See http://git.codelutin.com/coselmar.git commit 8a032c9e009f53b1496c34f8b12cd8712a485013 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:23:21 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.4.1' with non-snapshot versions --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 4541ec6..4af359b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 12c988c..dad69b1 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 94a444f..99212f1 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index ad8ce32..10d1544 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 185d0e4..09cdd28 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.1</version> <packaging>pom</packaging> <name>Coselmar</name> -- 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 coselmar. See http://git.codelutin.com/coselmar.git commit 91289c752d99e0fceb0777f46ec174cd8cdaad13 Merge: 498ec23 8a032c9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:35 2015 +0000 Merge branch 'release/0.4.1' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 4 ++-- pom.xml | 2 +- 6 files changed, 7 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 coselmar. See http://git.codelutin.com/coselmar.git commit ed149c285c57206a905929147a2b44300c2991ea Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:36 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 4b1cf61..4af359b 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d5094fe..dad69b1 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index c54358e..99212f1 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7d1f199..10d1544 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4.1</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index cb154b9..09cdd28 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.5-SNAPSHOT</version> + <version>0.4.1</version> <packaging>pom</packaging> <name>Coselmar</name> -- 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 coselmar. See http://git.codelutin.com/coselmar.git commit 3187a1a682840ac5ea42abe13464997d26ea93cd Merge: ed149c2 91289c7 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:36 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 coselmar. See http://git.codelutin.com/coselmar.git commit 1ffab85d3cf18da5e99cabc270e5e2fc39a69490 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 07:24:37 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coselmar-bundle/pom.xml b/coselmar-bundle/pom.xml index 4af359b..4b1cf61 100644 --- a/coselmar-bundle/pom.xml +++ b/coselmar-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index dad69b1..d5094fe 100644 --- a/coselmar-persistence/pom.xml +++ b/coselmar-persistence/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 99212f1..c54358e 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 10d1544..7d1f199 100644 --- a/coselmar-ui/pom.xml +++ b/coselmar-ui/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 09cdd28..cb154b9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.1</version> + <version>0.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Coselmar</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm