[Pollen-commits] [pollen] 04/06: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit fea63eee6b63e197bba3ca4901b8b2cb56abe499 Author: Maven Release <maven-release@codelutin.com> Date: Fri Aug 29 18:23:03 2014 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pollen-persistence/pom.xml | 2 +- pollen-rest-api/pom.xml | 2 +- pollen-services/pom.xml | 2 +- pollen-ui-angular/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 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pollen-persistence/pom.xml b/pollen-persistence/pom.xml index cb8cc02..2d20a77 100644 --- a/pollen-persistence/pom.xml +++ b/pollen-persistence/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-rest-api/pom.xml b/pollen-rest-api/pom.xml index 1bb11c5..ec21e91 100644 --- a/pollen-rest-api/pom.xml +++ b/pollen-rest-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-services/pom.xml b/pollen-services/pom.xml index 71345de..04dddbf 100644 --- a/pollen-services/pom.xml +++ b/pollen-services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-ui-angular/pom.xml b/pollen-ui-angular/pom.xml index 452bab5..cb3f6a8 100644 --- a/pollen-ui-angular/pom.xml +++ b/pollen-ui-angular/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index 5012b50..943b881 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-api/pom.xml b/pollen-votecounting-api/pom.xml index dfbb715..fbd7301 100644 --- a/pollen-votecounting-api/pom.xml +++ b/pollen-votecounting-api/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-borda/pom.xml b/pollen-votecounting-borda/pom.xml index fba3fd7..69d3f84 100644 --- a/pollen-votecounting-borda/pom.xml +++ b/pollen-votecounting-borda/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-condorcet/pom.xml b/pollen-votecounting-condorcet/pom.xml index 345fe66..2c2bee2 100644 --- a/pollen-votecounting-condorcet/pom.xml +++ b/pollen-votecounting-condorcet/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-coombs/pom.xml b/pollen-votecounting-coombs/pom.xml index eb73702..424bb8e 100644 --- a/pollen-votecounting-coombs/pom.xml +++ b/pollen-votecounting-coombs/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-instant-runoff/pom.xml b/pollen-votecounting-instant-runoff/pom.xml index aaa023b..529678a 100644 --- a/pollen-votecounting-instant-runoff/pom.xml +++ b/pollen-votecounting-instant-runoff/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-normal/pom.xml b/pollen-votecounting-normal/pom.xml index f60484d..eacfdc3 100644 --- a/pollen-votecounting-normal/pom.xml +++ b/pollen-votecounting-normal/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-number/pom.xml b/pollen-votecounting-number/pom.xml index c734203..802d93b 100644 --- a/pollen-votecounting-number/pom.xml +++ b/pollen-votecounting-number/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pollen-votecounting-percentage/pom.xml b/pollen-votecounting-percentage/pom.xml index 2db0b26..235dbff 100644 --- a/pollen-votecounting-percentage/pom.xml +++ b/pollen-votecounting-percentage/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</version> </parent> <groupId>org.chorem.pollen</groupId> diff --git a/pom.xml b/pom.xml index 0c40527..cac1762 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>pollen</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.0-alpha-2</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>.