[pollen_1.x] branch develop updated (8670e96 -> f8389b5)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git from 8670e96 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new d9f270c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds f6d7463 [jgitflow-maven-plugin]updating poms for branch '1.5.6' with snapshot versions new 0214f49 fix license files new d845dfe [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions new 126239c Merge branch 'release/1.5.6' new e9299e1 Merge branch 'master' into develop new f8389b5 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 f8389b5e9b14aaf52c117e7b03c6574c33f56497 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:20 2014 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e9299e1b2619ad64cc8b906d6fd5fc48effdcf0b Merge: d9f270c 126239c Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:17 2014 +0200 Merge branch 'master' into develop commit d9f270c0b9253aeaaf0bbb46e22e2f011e4c47cc Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:16 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 126239c0623e687892b4c948ca65322f2c11de72 Merge: b1a38ac d845dfe Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:11 2014 +0200 Merge branch 'release/1.5.6' commit d845dfe117d0c06abc4cf0fc6ce9b404aa2bef89 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 11:57:55 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions commit 0214f4954e8013dd4e81a3b26db38c0be0155ba1 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 11:54:37 2014 +0200 fix license files Summary of changes: pollen-services/LICENSE.txt | 2 +- pollen-ui-struts2/LICENSE.txt | 2 +- pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- 11 files changed, 11 insertions(+), 11 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 http://git.chorem.org/pollen_1.x.git commit 0214f4954e8013dd4e81a3b26db38c0be0155ba1 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 11:54:37 2014 +0200 fix license files --- pollen-services/LICENSE.txt | 2 +- pollen-ui-struts2/LICENSE.txt | 2 +- pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pollen-services/LICENSE.txt b/pollen-services/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-services/LICENSE.txt +++ b/pollen-services/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-ui-struts2/LICENSE.txt b/pollen-ui-struts2/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-ui-struts2/LICENSE.txt +++ b/pollen-ui-struts2/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-aggregator/LICENSE.txt b/pollen-votecounting-aggregator/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-aggregator/LICENSE.txt +++ b/pollen-votecounting-aggregator/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-api/LICENSE.txt b/pollen-votecounting-api/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-api/LICENSE.txt +++ b/pollen-votecounting-api/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-borda/LICENSE.txt b/pollen-votecounting-borda/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-borda/LICENSE.txt +++ b/pollen-votecounting-borda/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-condorcet/LICENSE.txt b/pollen-votecounting-condorcet/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-condorcet/LICENSE.txt +++ b/pollen-votecounting-condorcet/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-coombs/LICENSE.txt b/pollen-votecounting-coombs/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-coombs/LICENSE.txt +++ b/pollen-votecounting-coombs/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-instant-runoff/LICENSE.txt b/pollen-votecounting-instant-runoff/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-instant-runoff/LICENSE.txt +++ b/pollen-votecounting-instant-runoff/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-normal/LICENSE.txt b/pollen-votecounting-normal/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-normal/LICENSE.txt +++ b/pollen-votecounting-normal/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-number/LICENSE.txt b/pollen-votecounting-number/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-number/LICENSE.txt +++ b/pollen-votecounting-number/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pollen-votecounting-percentage/LICENSE.txt b/pollen-votecounting-percentage/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/pollen-votecounting-percentage/LICENSE.txt +++ b/pollen-votecounting-percentage/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. -- 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 http://git.chorem.org/pollen_1.x.git commit d845dfe117d0c06abc4cf0fc6ce9b404aa2bef89 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 11:57:55 2014 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.5.6' with non-snapshot versions --- 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 49d2e37..80b7c31 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index cd4f7cb..c740692 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index 89ec69e..9c69705 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 9396ec0..b946a75 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index d004804..27e0ba2 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index eb7d6c7..8531af4 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 1bf4ee9..7f081a8 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index 3d08a54..f593ea9 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index fb33266..9730318 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index bdac8fd..2e82f44 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index 342d1cd..e69bc03 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 076d70f..0aa2c3b 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 8681533..ca74d34 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6-SNAPSHOT</version> + <version>1.5.6</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 http://git.chorem.org/pollen_1.x.git commit 126239c0623e687892b4c948ca65322f2c11de72 Merge: b1a38ac d845dfe Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:11 2014 +0200 Merge branch 'release/1.5.6' pollen-persistence/pom.xml | 4 +- .../business/persistence/CommentDAOImpl.java | 31 +-- .../business/persistence/CommentDAOImplTest.java | 60 ---- pollen-services/LICENSE.txt | 2 +- pollen-services/pom.xml | 2 +- .../pollen/services/impl/PollCommentService.java | 14 - .../pollen/services/impl/PollFeedService.java | 125 ++++++--- pollen-ui-struts2/LICENSE.txt | 2 +- pollen-ui-struts2/pom.xml | 2 +- .../pollen/ui/actions/json/GetPollComments.java | 109 -------- .../webapp/WEB-INF/decorators/layout-default.jsp | 6 +- pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-aggregator/pom.xml | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-api/pom.xml | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-borda/pom.xml | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-condorcet/pom.xml | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-coombs/pom.xml | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/pom.xml | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-normal/pom.xml | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-number/pom.xml | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- pollen-votecounting-percentage/pom.xml | 2 +- pom.xml | 303 ++++++++++----------- src/site/site_en.xml | 66 +---- src/site/site_fr.xml | 69 +---- 32 files changed, 282 insertions(+), 549 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 http://git.chorem.org/pollen_1.x.git commit d9f270c0b9253aeaaf0bbb46e22e2f011e4c47cc Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:16 2014 +0200 [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 973a489..80b7c31 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index ddaa308..c740692 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index bb8d05b..9c69705 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 3a5fe26..b946a75 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 34d2185..27e0ba2 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 9a3c2fd..8531af4 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 52cc060..7f081a8 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index dbf84f9..f593ea9 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index 35a176e..9730318 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index d4348db..2e82f44 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index df8cd13..e69bc03 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 94f273e..0aa2c3b 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 5d26f69..ca74d34 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.5.6</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 http://git.chorem.org/pollen_1.x.git commit e9299e1b2619ad64cc8b906d6fd5fc48effdcf0b Merge: d9f270c 126239c Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:17 2014 +0200 Merge branch 'master' into develop pollen-services/LICENSE.txt | 2 +- pollen-ui-struts2/LICENSE.txt | 2 +- pollen-votecounting-aggregator/LICENSE.txt | 2 +- pollen-votecounting-api/LICENSE.txt | 2 +- pollen-votecounting-borda/LICENSE.txt | 2 +- pollen-votecounting-condorcet/LICENSE.txt | 2 +- pollen-votecounting-coombs/LICENSE.txt | 2 +- pollen-votecounting-instant-runoff/LICENSE.txt | 2 +- pollen-votecounting-normal/LICENSE.txt | 2 +- pollen-votecounting-number/LICENSE.txt | 2 +- pollen-votecounting-percentage/LICENSE.txt | 2 +- 11 files changed, 11 insertions(+), 11 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 http://git.chorem.org/pollen_1.x.git commit f8389b5e9b14aaf52c117e7b03c6574c33f56497 Author: Maven Release <maven-release@codelutin.com> Date: Sun Oct 19 12:02:20 2014 +0200 [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 80b7c31..973a489 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -10,7 +10,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 c740692..ddaa308 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 9c69705..bb8d05b 100644 --- a/pollen-ui-struts2/pom.xml +++ b/pollen-ui-struts2/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 b946a75..3a5fe26 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 27e0ba2..34d2185 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 8531af4..9a3c2fd 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 7f081a8..52cc060 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 f593ea9..dbf84f9 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 9730318..35a176e 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 2e82f44..d4348db 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 e69bc03..df8cd13 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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 0aa2c3b..94f273e 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</version> + <version>1.6-SNAPSHOT</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index ca74d34..5d26f69 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>1.5.6</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