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 efb69b27d0e7e35e741502c7c5be65b82f7e9b98 Author: Maven Release <maven-release@codelutin.com> Date: Fri Nov 7 16:48:33 2014 +0000 [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..4184f81 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index ddaa308..8d42010 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-struts2/pom.xml b/pollen-ui-struts2/pom.xml index bb8d05b..4a55a20 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 3a5fe26..c7b119c 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index 34d2185..9aa9405 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index 9a3c2fd..060585b 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 52cc060..ce39c09 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index dbf84f9..ca1f36c 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.7</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..f9ba2c3 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index d4348db..5f302e2 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index df8cd13..87f6721 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 94f273e..1c97949 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.7</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index e7b97fe..32735a7 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.7</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>.