branch develop updated (023b658 -> 78d419a)
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 023b658 Merge branch 'develop' of https://git.codelutin.com/coselmar into develop new 2a20746 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4f07d21 [jgitflow-maven-plugin]updating poms for branch '0.4.2' with snapshot versions new d2df78d [jgitflow-maven-plugin]updating poms for branch'release/0.4.2' with non-snapshot versions new a319f1e Merge branch 'release/0.4.2' new d30743b Merge branch 'master' into develop new 78d419a [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 78d419a48714d454f6ecf12f374d83b376db8e1d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:39 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d30743bfeb0ad509fe4d0bb05ddef49a88c4571d Merge: 2a20746 a319f1e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:39 2015 +0000 Merge branch 'master' into develop commit 2a2074688266dfd69f0d953f92b9b627f4ff83d5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:39 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a319f1e71d0014dcf98c8af44adbe9f47cb82ea2 Merge: 91289c7 d2df78d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:37 2015 +0000 Merge branch 'release/0.4.2' commit d2df78d03f050db047a01632dd14f83297cb348f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:15:37 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.4.2' 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 d2df78d03f050db047a01632dd14f83297cb348f Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:15:37 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/0.4.2' 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 0181ea9..745b7fa 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.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index 1beb941..6f0f4d3 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.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 8d3d30e..ab832c2 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.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index e8b3a8d..809ddc3 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.2-SNAPSHOT</version> + <version>0.4.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index d4dd0d9..0d25a20 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.2-SNAPSHOT</version> + <version>0.4.2</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 a319f1e71d0014dcf98c8af44adbe9f47cb82ea2 Merge: 91289c7 d2df78d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:37 2015 +0000 Merge branch 'release/0.4.2' coselmar-bundle/pom.xml | 2 +- coselmar-persistence/pom.xml | 2 +- coselmar-rest/pom.xml | 2 +- .../services/CoselmarApplicationContext.java | 3 +++ .../CoselmarServicesApplicationContext.java | 27 ++++++++++++++++++++-- .../services/DefaultCoselmarServicesContext.java | 7 +++--- .../coselmar/services/indexation/LuceneUtils.java | 24 +++++++++++++++---- .../services/AbstractCoselmarWebServiceTest.java | 5 ++-- .../services/FakeCoselmarApplicationContext.java | 21 ++++++++++++++++- .../services/FakeCoselmarServicesContext.java | 5 +++- coselmar-ui/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 84 insertions(+), 18 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 2a2074688266dfd69f0d953f92b9b627f4ff83d5 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:39 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..745b7fa 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.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-persistence/pom.xml b/coselmar-persistence/pom.xml index d5094fe..6f0f4d3 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.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index c54358e..ab832c2 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.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/coselmar-ui/pom.xml b/coselmar-ui/pom.xml index 7d1f199..809ddc3 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.2</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index cb154b9..0d25a20 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.2</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 d30743bfeb0ad509fe4d0bb05ddef49a88c4571d Merge: 2a20746 a319f1e Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:39 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 78d419a48714d454f6ecf12f374d83b376db8e1d Author: Maven Release <maven-release@codelutin.com> Date: Mon Jan 12 15:17:39 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 745b7fa..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.2</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 6f0f4d3..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.2</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 ab832c2..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.2</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 809ddc3..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.2</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coselmar</groupId> diff --git a/pom.xml b/pom.xml index 0d25a20..cb154b9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coselmar</artifactId> - <version>0.4.2</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