branch develop updated (a9431c9 -> 5f9fd08)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository chorem. See http://git.chorem.org/chorem.git from a9431c9 [jgitflow-maven-plugin]updating poms for 0.4.0-SNAPSHOT development new f56b925 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 556b732 [jgitflow-maven-plugin]updating poms for 0.3.3 branch with snapshot versions new 5eac43e [jgitflow-maven-plugin]updating poms for branch'release/0.3.3' with non-snapshot versions new 6d1b46e [jgitflow-maven-plugin]merging 'release/0.3.3' into 'master' new 6fa509f [jgitflow-maven-plugin]merging 'master' into 'develop' new 5f9fd08 [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 5f9fd08800302c976053ab9aa022a5cb047cfcb1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:44 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6fa509fc36f56d8e2d76143b1eebd270b1c786ef Merge: f56b925 6d1b46e Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:44 2016 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit f56b9258b3a93d8bb863e8359544bdfa0198687d Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:44 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 6d1b46e7223105aba1bd3f055c17d35cc50b9b8f Merge: 67ec711 5eac43e Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:43 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.3.3' into 'master' commit 5eac43eefcfbc7da9057eb59327b1bb8a64fbee3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:13 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.3.3' 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 http://git.chorem.org/chorem.git commit 5eac43eefcfbc7da9057eb59327b1bb8a64fbee3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:13 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/0.3.3' 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 1b95177..3e22a1a 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.3-SNAPSHOT</version> + <version>0.3.3</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index 8595017..731d75d 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.3-SNAPSHOT</version> + <version>0.3.3</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index e6b6270..b7e83c1 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.3-SNAPSHOT</version> + <version>0.3.3</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 http://git.chorem.org/chorem.git commit 6d1b46e7223105aba1bd3f055c17d35cc50b9b8f Merge: 67ec711 5eac43e Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:43 2016 +0100 [jgitflow-maven-plugin]merging 'release/0.3.3' into 'master' chorem-entities/pom.xml | 2 +- .../src/main/java/org/chorem/ChoremQueryMaker.java | 13 ++++ chorem-webmotion/pom.xml | 2 +- .../financial/AccountBillingReportAction.java | 32 +++++--- .../financial/BillingPerAccountReportAction.java | 90 +++++++++++++++++----- .../financial/BillingPerProjectReportAction.java | 44 ++++++++--- .../financial/ProjectBillingReportAction.java | 31 +++++--- chorem-webmotion/src/main/resources/mapping | 2 +- .../jsp/financial/reports/accountBillingReport.jsp | 6 +- .../financial/reports/billingPerAccountReport.jsp | 4 + .../financial/reports/billingPerProjectReport.jsp | 6 +- .../jsp/financial/reports/projectBillingReport.jsp | 6 +- pom.xml | 4 +- 13 files changed, 183 insertions(+), 59 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 http://git.chorem.org/chorem.git commit f56b9258b3a93d8bb863e8359544bdfa0198687d Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:44 2016 +0100 [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..3e22a1a 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.3</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/chorem-webmotion/pom.xml b/chorem-webmotion/pom.xml index 0c30c1b..731d75d 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.3</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index 9d9cb7d..b7e83c1 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.3</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 http://git.chorem.org/chorem.git commit 6fa509fc36f56d8e2d76143b1eebd270b1c786ef Merge: f56b925 6d1b46e Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:44 2016 +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 chorem. See http://git.chorem.org/chorem.git commit 5f9fd08800302c976053ab9aa022a5cb047cfcb1 Author: Maven Release <maven-release@codelutin.com> Date: Mon Feb 8 09:19:44 2016 +0100 [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 3e22a1a..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.3</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 731d75d..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.3</version> + <version>0.4.0-SNAPSHOT</version> </parent> <groupId>org.chorem.chorem</groupId> diff --git a/pom.xml b/pom.xml index b7e83c1..9d9cb7d 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>chorem</artifactId> - <version>0.3.3</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