branch develop updated (0020269 -> a5a859f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coser. See http://git.codelutin.com/coser.git from 0020269 fixes #7217: [TECH] Mise à jour de codelutinpom en 2.2 Merge branch 'feature/7217' into develop new 70d9476 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ee4dd8f [jgitflow-maven-plugin]updating poms for 1.5.5 branch with snapshot versions new 3180d2c [jgitflow-maven-plugin]updating poms for branch'release/1.5.5' with non-snapshot versions new 243d55b [jgitflow-maven-plugin]merging 'release/1.5.5' into 'master' new c2d5e0b [jgitflow-maven-plugin]merging 'master' into 'develop' new a5a859f [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 a5a859f732a9492dcc348509ec7975354c89ed43 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:42 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c2d5e0b38330f1a4c2acb8e45742f50d81e760a7 Merge: 70d9476 243d55b Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:42 2015 +0000 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 70d9476b04a56f50b2e90cf60d315871d13f5901 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:41 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 243d55b0b6093943b7e48a9f48990677988098b3 Merge: cf6a3b4 3180d2c Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:39 2015 +0000 [jgitflow-maven-plugin]merging 'release/1.5.5' into 'master' commit 3180d2c80a04a9ff29532d0da338505d43c1a38b Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:44:57 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.5' 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 coser. See http://git.codelutin.com/coser.git commit 3180d2c80a04a9ff29532d0da338505d43c1a38b Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:44:57 2015 +0000 [jgitflow-maven-plugin]updating poms for branch'release/1.5.5' with non-snapshot versions --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 5c032ef..d9b3628 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index 5cb7c28..f7f8306 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index 0a1ea71..e60c2ea 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index f419683..6c9b940 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5-SNAPSHOT</version> + <version>1.5.5</version> <packaging>pom</packaging> <name>Coser</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 coser. See http://git.codelutin.com/coser.git commit 243d55b0b6093943b7e48a9f48990677988098b3 Merge: cf6a3b4 3180d2c Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:39 2015 +0000 [jgitflow-maven-plugin]merging 'release/1.5.5' into 'master' coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 4 ++++ coser-web/src/main/webapp/images/europe.png | Bin 0 -> 1284 bytes coser-web/src/main/webapp/images/logo_ministere.jpg | Bin 0 -> 10526 bytes coser-web/src/main/webapp/styles/coser.css | 11 ++++++++++- pom.xml | 4 ++-- 8 files changed, 19 insertions(+), 6 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 coser. See http://git.codelutin.com/coser.git commit 70d9476b04a56f50b2e90cf60d315871d13f5901 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:41 2015 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index 8a0163c..d9b3628 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index e12f2ad..f7f8306 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index adfec90..e60c2ea 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.5</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 1033f40..6c9b940 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.5</version> <packaging>pom</packaging> <name>Coser</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 coser. See http://git.codelutin.com/coser.git commit c2d5e0b38330f1a4c2acb8e45742f50d81e760a7 Merge: 70d9476 243d55b Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:42 2015 +0000 [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 coser. See http://git.codelutin.com/coser.git commit a5a859f732a9492dcc348509ec7975354c89ed43 Author: Maven Release <maven-release@codelutin.com> Date: Thu Jun 11 16:50:42 2015 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- coser-business/pom.xml | 2 +- coser-ui/pom.xml | 2 +- coser-web/pom.xml | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coser-business/pom.xml b/coser-business/pom.xml index d9b3628..8a0163c 100644 --- a/coser-business/pom.xml +++ b/coser-business/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-ui/pom.xml b/coser-ui/pom.xml index f7f8306..e12f2ad 100644 --- a/coser-ui/pom.xml +++ b/coser-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/coser-web/pom.xml b/coser-web/pom.xml index e60c2ea..adfec90 100644 --- a/coser-web/pom.xml +++ b/coser-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> diff --git a/pom.xml b/pom.xml index 6c9b940..1033f40 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.5.5</version> + <version>1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Coser</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm