branch develop updated (12ee8e3 -> 374b042)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git from 12ee8e3 Update struts new eb41976 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds ff3ed90 [jgitflow-maven-plugin]updating poms for 1.6.2 branch with snapshot versions new c0e84db [jgitflow-maven-plugin]updating poms for branch'release/1.6.2' with non-snapshot versions new e009008 [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' new 08e6077 [jgitflow-maven-plugin]merging 'master' into 'develop' new 374b042 [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 374b042300f1b1063d6c5fecf78815d3e9b0b3e6 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:52 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 08e60776df54a4d5939f4aec3ada538e1520b075 Merge: eb41976 e009008 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:52 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit eb41976a227592b4f15573cbf1579aa2f8e889e0 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:52 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e0090081fa824d1eef4db3168db39701de3194b8 Merge: abd1d5d c0e84db Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:51 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' commit c0e84db41ee9cae7b8de59d766cb18f7476d1f29 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:34 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6.2' with non-snapshot versions Summary of changes: -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit c0e84db41ee9cae7b8de59d766cb18f7476d1f29 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:34 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6.2' with non-snapshot versions --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index af8dae8..5b59f48 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.2</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 94e9793..6f95acc 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.2</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 78baabb..55b32b2 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.2</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit e0090081fa824d1eef4db3168db39701de3194b8 Merge: abd1d5d c0e84db Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:51 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- .../org/chorem/bow/action/login/RegisterAction.java | 20 +++++++++++++++++++- bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 2 +- bow-ui/src/main/webapp/WEB-INF/jsp/register.jsp | 3 ++- bow-ui/src/main/webapp/css/connexion.css | 6 +++++- pom.xml | 4 ++-- 7 files changed, 31 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit eb41976a227592b4f15573cbf1579aa2f8e889e0 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:52 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 0f8d6d2..5b59f48 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6.2</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 9fd76c5..6f95acc 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6.2</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 5298d0c..55b32b2 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.6.2</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 08e60776df54a4d5939f4aec3ada538e1520b075 Merge: eb41976 e009008 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:52 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See https://gitlab.nuiton.org/chorem/bow.git commit 374b042300f1b1063d6c5fecf78815d3e9b0b3e6 Author: Éric <chatellier@codelutin.com> Date: Tue Jul 31 15:21:52 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bow-extension-chromium/pom.xml b/bow-extension-chromium/pom.xml index 5b59f48..0f8d6d2 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.2</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 6f95acc..9fd76c5 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.2</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 55b32b2..5298d0c 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.2</version> + <version>1.7-SNAPSHOT</version> <packaging>pom</packaging> <name>bow</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm