branch develop updated (1906468 -> 44599e2)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 1906468 Merge branch 'feature/1364_sous_taches' into 'develop' new 403715c [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds c01ffc9 [jgitflow-maven-plugin]updating poms for 1.6-alpha-2 branch with snapshot versions new bb832ce [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-2' with non-snapshot versions new b0179f3 [jgitflow-maven-plugin]merging 'release/1.6-alpha-2' into 'master' new eca589d [jgitflow-maven-plugin]merging 'master' into 'develop' new 44599e2 [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 44599e20ce73722abcc836c92f59e5b1d2bb7449 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit eca589d613c7fde910b9cf4058acb18192132863 Merge: 403715c b0179f3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 403715c84123629d135bb4f090d0c8969b6c36af Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b0179f3ea08e3bcc49c148580ddc6804da868f63 Merge: e30532c bb832ce Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.6-alpha-2' into 'master' commit bb832ce33de0a4fe8c04b1d7dd68308acab860f5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:07 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-2' 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 jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit bb832ce33de0a4fe8c04b1d7dd68308acab860f5 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:07 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-2' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1e42f4a..8dbf8d5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-alpha-2-SNAPSHOT</version> + <version>1.6-alpha-2</version> <name>jTimer</name> <description> -- 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 jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit b0179f3ea08e3bcc49c148580ddc6804da868f63 Merge: e30532c bb832ce Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.6-alpha-2' into 'master' pom.xml | 2 +- src/main/java/org/chorem/jtimer/JTimerConfig.java | 9 - src/main/java/org/chorem/jtimer/JTimerFactory.java | 4 - .../java/org/chorem/jtimer/entities/TimerTask.java | 7 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 143 ++++++-------- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 4 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 220 ++++++++++----------- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 5 +- .../jtimer/entities/TimerTaskHelperTest.java | 33 +++- 9 files changed, 201 insertions(+), 226 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 jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 403715c84123629d135bb4f090d0c8969b6c36af Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d89bb5..8dbf8d5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6-alpha-2</version> <name>jTimer</name> <description> -- 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 jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit eca589d613c7fde910b9cf4058acb18192132863 Merge: 403715c b0179f3 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 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 jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 44599e20ce73722abcc836c92f59e5b1d2bb7449 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jul 29 17:26:47 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8dbf8d5..7d89bb5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-alpha-2</version> + <version>1.6-SNAPSHOT</version> <name>jTimer</name> <description> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm