branch develop updated (da7a47f -> aae138f)
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 da7a47f [jgitflow-maven-plugin]updating poms for 1.7-SNAPSHOT development new cea90fd [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds fd8c912 [jgitflow-maven-plugin]updating poms for 1.6.1 branch with snapshot versions new 775dd8b [jgitflow-maven-plugin]updating poms for branch'release/1.6.1' with non-snapshot versions new abd1d5d [jgitflow-maven-plugin]merging 'release/1.6.1' into 'master' new 5db3900 [jgitflow-maven-plugin]merging 'master' into 'develop' new aae138f [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 aae138f6f08110a17e29333bddefbe2fd679a9ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:15 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 5db3900640c85c842eb6c8dc83f94377a4793203 Merge: cea90fd abd1d5d Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:15 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit cea90fd7c3475be199c7e8a4a78415464087f1e2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:15 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit abd1d5da5564dc25aea9bb08076354375a54b26e Merge: 8e5e31c 775dd8b Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:14 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.6.1' into 'master' commit 775dd8b6bb88b3c57e685fae0e4ab5279d441a98 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:05:51 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.6.1' 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 775dd8b6bb88b3c57e685fae0e4ab5279d441a98 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:05:51 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.6.1' 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 07ef6d7..55c01d4 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.1-SNAPSHOT</version> + <version>1.6.1</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index d5d19ab..9dd1bcb 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.1-SNAPSHOT</version> + <version>1.6.1</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index d8a3229..23b9d94 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.1-SNAPSHOT</version> + <version>1.6.1</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 abd1d5da5564dc25aea9bb08076354375a54b26e Merge: 8e5e31c 775dd8b Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:14 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.6.1' into 'master' README.txt => README.md | 0 bow-extension-chromium/{README.txt => README.md} | 0 bow-extension-chromium/changelog.txt | 0 bow-extension-chromium/pom.xml | 23 +++++- bow-ui/{README.txt => README.md} | 0 bow-ui/changelog.txt | 0 bow-ui/pom.xml | 23 +++++- .../src/main/java/org/chorem/bow/BowSession.java | 7 ++ bow-ui/src/main/webapp/WEB-INF/jsp/inc/footer.jsp | 4 +- bow-ui/src/main/webapp/WEB-INF/jsp/inc/header.jsp | 3 + changelog.txt | 0 pom.xml | 81 +++++++++++++--------- 12 files changed, 103 insertions(+), 38 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 cea90fd7c3475be199c7e8a4a78415464087f1e2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:15 2017 +0100 [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..55c01d4 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.1</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 9fd76c5..9dd1bcb 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.1</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 93474bf..23b9d94 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.1</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 5db3900640c85c842eb6c8dc83f94377a4793203 Merge: cea90fd abd1d5d Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:15 2017 +0100 [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 aae138f6f08110a17e29333bddefbe2fd679a9ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 12:06:15 2017 +0100 [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 55c01d4..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.1</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 9dd1bcb..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.1</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 23b9d94..93474bf 100644 --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6.1</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