branch develop updated (7cfdbd1 -> 7667843)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git from 7cfdbd1 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new f84eaec [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 4514657 [jgitflow-maven-plugin]updating poms for 1.5.11 branch with snapshot versions new af7e21a [jgitflow-maven-plugin]updating poms for branch'release/1.5.11' with non-snapshot versions new 87fc016 [jgitflow-maven-plugin]merging 'release/1.5.11' into 'master' new 3ea89f1 [jgitflow-maven-plugin]merging 'master' into 'develop' new 7667843 [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 7667843d6d876baa4e7fe51b6761b6366e44ac14 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:35 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3ea89f1543503048e8a86b1243a4098fc3f3d40a Merge: f84eaec 87fc016 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:35 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f84eaecff68e461eae5dfdd880ef2e152f7d1375 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:35 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 87fc016997f0a0a714fbbbd5e4ea9af7443f3fce Merge: 65d6b4c af7e21a Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:33 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.11' into 'master' commit af7e21a6c982c9178b8d545980b389e7e25d6c60 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:55:47 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.5.11' 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 pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 87fc016997f0a0a714fbbbd5e4ea9af7443f3fce Merge: 65d6b4c af7e21a Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:33 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.5.11' into 'master' pollen-persistence/pom.xml | 23 +++++++++++++++++- pollen-services/pom.xml | 23 +++++++++++++++++- pollen-ui-struts2/pom.xml | 23 +++++++++++++++++- .../webapp/WEB-INF/decorators/layout-default.jsp | 26 ++++++++------------- .../webapp/WEB-INF/jsp/poll/createPoll_choices.jsp | 6 ++--- .../webapp/WEB-INF/jsp/poll/displayDateChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayImageChoice.jsp | 2 +- .../WEB-INF/jsp/poll/displayPersonToList.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayTextChoice.jsp | 2 +- .../webapp/WEB-INF/jsp/poll/displayVotingList.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/poll/summary.jsp | 11 ++++----- pollen-votecounting-aggregator/pom.xml | 23 +++++++++++++++++- pollen-votecounting-api/pom.xml | 23 +++++++++++++++++- pollen-votecounting-borda/pom.xml | 23 +++++++++++++++++- pollen-votecounting-condorcet/pom.xml | 23 +++++++++++++++++- pollen-votecounting-coombs/pom.xml | 23 +++++++++++++++++- pollen-votecounting-instant-runoff/pom.xml | 23 +++++++++++++++++- pollen-votecounting-normal/pom.xml | 23 +++++++++++++++++- pollen-votecounting-number/pom.xml | 23 +++++++++++++++++- pollen-votecounting-percentage/pom.xml | 23 +++++++++++++++++- pom.xml | 27 +++++++++++++++++++--- 21 files changed, 311 insertions(+), 45 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 pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit f84eaecff68e461eae5dfdd880ef2e152f7d1375 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:35 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pollen-persistence/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-struts2/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index d6e22b5..c7553e4 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 369b924..50c1695 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 03c0c37..c3cc82f 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 27d623a..dced9d6 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index a3a959d..3731076 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 4122228..10ece3f 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index f7dbc38..697d4cf 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index b6e9426..1497a55 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index f2b15c7..b383719 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index ddd8b05..65f8fa8 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index 5ff3212..c227ba4 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 0b669d7..41eb5f7 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 5ad5692..61410b4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.11</version> <packaging>pom</packaging> <name>Pollen</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 pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 3ea89f1543503048e8a86b1243a4098fc3f3d40a Merge: f84eaec 87fc016 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:35 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 pollen_1.x. See https://gitlab.nuiton.org/None/pollen_1.x.git commit 7667843d6d876baa4e7fe51b6761b6366e44ac14 Author: Maven Release <maven-release@codelutin.com> Date: Mon Mar 20 10:58:35 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pollen-persistence/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-struts2/pom.xml | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index c7553e4..d6e22b5 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -31,7 +31,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 50c1695..369b924 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index c3cc82f..03c0c37 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index dced9d6..27d623a 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 3731076..a3a959d 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 10ece3f..4122228 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 697d4cf..f7dbc38 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 1497a55..b6e9426 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index b383719..f2b15c7 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index 65f8fa8..ddd8b05 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index c227ba4..5ff3212 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 41eb5f7..0b669d7 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 61410b4..5ad5692 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.11</version> + <version>1.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Pollen</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm