branch develop updated (f45fb28 -> 6fe8c0b)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See https://gitlab.nuiton.org/chorem/chorem.git from f45fb28 refs #1363 : clean code new f33891c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3268224 [jgitflow-maven-plugin]updating poms for 0.3.4 branch with snapshot versions new 975bdf6 [jgitflow-maven-plugin]updating poms for branch'release/0.3.4' with non-snapshot versions new 76a255d [jgitflow-maven-plugin]merging 'release/0.3.4' into 'master' new aec1c95 [jgitflow-maven-plugin]merging 'master' into 'develop' new 6fe8c0b [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 6fe8c0bf0cab13f09bde9ddb7039a9fb15924a10 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:24 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit aec1c953068be9cf2d2836b634f60bf400c4b521 Merge: f33891c 76a255d Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:23 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f33891c1b9b7d9a4066bd4e6d6a5dc70c305809f Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:23 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 76a255dc58b01f4cc396fce334a4e9cf9a77f162 Merge: 6d1b46e 975bdf6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:20 2016 +0200 [jgitflow-maven-plugin]merging 'release/0.3.4' into 'master' commit 975bdf63737fa3946e86ef850857e5cffc46b13b Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:34:06 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/0.3.4' 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 chorem. See https://gitlab.nuiton.org/chorem/chorem.git commit 975bdf63737fa3946e86ef850857e5cffc46b13b Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:34:06 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/0.3.4' with non-snapshot versions --- chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index a9b5820..920ef74 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.4-SNAPSHOT</version> + <version>0.3.4</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index d78291f..403f6c7 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.4-SNAPSHOT</version> + <version>0.3.4</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index 9acd6f0..eda7620 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.4-SNAPSHOT</version> + <version>0.3.4</version> <packaging>pom</packaging> <name>Chorem</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 chorem. See https://gitlab.nuiton.org/chorem/chorem.git commit 76a255dc58b01f4cc396fce334a4e9cf9a77f162 Merge: 6d1b46e 975bdf6 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:20 2016 +0200 [jgitflow-maven-plugin]merging 'release/0.3.4' into 'master' README.md | 3 +++ README.txt | 0 changelog.txt | 0 .../changelog.txt => chorem-entities/README.md | 0 chorem-entities/README.txt | 0 chorem-entities/changelog.txt | 0 chorem-entities/pom.xml | 2 +- chorem-webmotion/{README.txt => README.md} | 0 chorem-webmotion/pom.xml | 2 +- .../financial/BillingPerAccountReportAction.java | 2 +- .../financial/BillingPerProjectReportAction.java | 2 +- pom.xml | 17 ++++++++--------- 12 files changed, 15 insertions(+), 13 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 chorem. See https://gitlab.nuiton.org/chorem/chorem.git commit f33891c1b9b7d9a4066bd4e6d6a5dc70c305809f Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:23 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index c5f7b8c..920ef74 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.3.4</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index 0c30c1b..403f6c7 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.3.4</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index ea5d8f2..eda7620 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.4.0-SNAPSHOT</version> + <version>0.3.4</version> <packaging>pom</packaging> <name>Chorem</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 chorem. See https://gitlab.nuiton.org/chorem/chorem.git commit aec1c953068be9cf2d2836b634f60bf400c4b521 Merge: f33891c 76a255d Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:23 2016 +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 chorem. See https://gitlab.nuiton.org/chorem/chorem.git commit 6fe8c0bf0cab13f09bde9ddb7039a9fb15924a10 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jul 26 10:35:24 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- chorem-entities/pom.xml | 2 +- chorem-webmotion/pom.xml | 2 +- pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chorem-entities/pom.xml b/chorem-entities/pom.xml index 920ef74..c5f7b8c 100644 --- a/chorem-entities/pom.xml +++ b/chorem-entities/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.4</version> + <version>0.4.0-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index 403f6c7..0c30c1b 100644 --- a/chorem-webmotion/pom.xml +++ b/chorem-webmotion/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.4</version> + <version>0.4.0-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index eda7620..ea5d8f2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.4</version> + <version>0.4.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Chorem</name> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm