branch develop updated (8a5936e -> 6ab099f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository bow. See http://git.chorem.org/bow.git from 8a5936e change wikitty version to 3.12.1 new b2ce337 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 0c613db [jgitflow-maven-plugin]updating poms for 1.5.1 branch with snapshot versions new a20cbb6 [jgitflow-maven-plugin]updating poms for branch'release/1.5.1' with non-snapshot versions new 6af647d [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' new dabf83e [jgitflow-maven-plugin]merging 'master' into 'develop' new 6ab099f [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 6ab099f19dd3eafa7e2bb76068e2be309492d6bb Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:38:00 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit dabf83e4ee5f1268712a6181988db464cdf7c052 Merge: b2ce337 6af647d Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:38:00 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit b2ce3379318e956414d107df04621f445a709588 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:38:00 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6af647d6f216287dbd26c69ba48170699407772d Merge: 6bcdda0 a20cbb6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:37:59 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' commit a20cbb6eb878d76bfaeb8f553242ec41f6fb6d44 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:37:22 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5.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 http://git.chorem.org/bow.git commit a20cbb6eb878d76bfaeb8f553242ec41f6fb6d44 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:37:22 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5.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 6c911f0..615ea0e 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index bba196d..3dd62b0 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.1</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index 9d536d9..cb10151 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5.1-SNAPSHOT</version> + <version>1.5.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 http://git.chorem.org/bow.git commit 6af647d6f216287dbd26c69ba48170699407772d Merge: 6bcdda0 a20cbb6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:37:59 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.5.1' into 'master' bow-extension-chromium/pom.xml | 2 +- bow-ui/pom.xml | 2 +- .../src/main/java/org/chorem/bow/BowConfigOption.java | 2 +- .../org/chorem/bow/action/group/GroupEditAction.java | 18 +++++++++++++----- .../org/chorem/bow/action/group/GroupViewAction.java | 4 +++- bow-ui/src/main/webapp/WEB-INF/jsp/groupView.jsp | 10 +++++----- pom.xml | 4 ++-- 7 files changed, 26 insertions(+), 16 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 http://git.chorem.org/bow.git commit b2ce3379318e956414d107df04621f445a709588 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:38:00 2015 +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 7ed8a7d..615ea0e 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index d15ad9b..3dd62b0 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.1</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index ae86097..cb10151 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.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 http://git.chorem.org/bow.git commit dabf83e4ee5f1268712a6181988db464cdf7c052 Merge: b2ce337 6af647d Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:38:00 2015 +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 http://git.chorem.org/bow.git commit 6ab099f19dd3eafa7e2bb76068e2be309492d6bb Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 21 11:38:00 2015 +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 615ea0e..7ed8a7d 100644 --- a/bow-extension-chromium/pom.xml +++ b/bow-extension-chromium/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>bow-extension-chromium</artifactId> diff --git a/bow-ui/pom.xml b/bow-ui/pom.xml index 3dd62b0..d15ad9b 100644 --- a/bow-ui/pom.xml +++ b/bow-ui/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5.1</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>bow-ui</artifactId> diff --git a/pom.xml b/pom.xml index cb10151..ae86097 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>bow</artifactId> - <version>1.5.1</version> + <version>1.6-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