This is an automated email from the git hooks/post-receive script. New change to branch master in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from e8bb063 [jgitflow-maven-plugin]merging 'release/1.5.2' into 'master' adds 999759e [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development adds d704222 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 7d4876e [jgitflow-maven-plugin]merging 'master' into 'develop' adds af14e55 [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 5ad75f1 Fix website adds 43b02e0 Remove timebundle code from master (refactored in branch) adds 304b94d fixes #143: On idle dialog, add an option to create a new task to assign idle time to adds d97a2b4 fixes #144: Select the parent on "left arrow" key adds 116e58a fixes #145: Add an option to show in system tray the name of the currently running task adds 114fa16 fixes #148: An illegal reflective access operation on java 11 adds 0f049bc fixes #149: Update libs adds 6e984dd Setup Sonar build adds f92ff6f Try to fix Sonar build adds 7b5a7f1 Update libs. Switch to logback. adds 1a2d9b9 Fix logback config. adds 9e128d8 fixes #150: Does not build on JDK11 adds 0be0fe6 Update libs adds 7710d0e fixes #151: Try to fix NPE with swing utilities adds 2227172 Improve UI (dialog icon) adds 8b56d2c fixes #152: Use fatcow icons adds 677a32f fixes #149: Update snakeyaml adds ea89e50 fixes #149: Remove unused gson adds 6ea1dd1 Update site adds 074dd34 Fix CI only on tags new 7b4b204 [gitflow-maven-plugin]Update versions for release new 05ebc17 Merge branch 'release/1.5.3' The 2 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 05ebc177474a2a066ca9d2b42a1dcd52610cbd56 Merge: e8bb063 7b4b204 Author: Éric <chatellier@codelutin.com> Date: Mon Mar 2 17:07:49 2020 +0100 Merge branch 'release/1.5.3' commit 7b4b2048a840b57ec994f61f1994d1aeaa4dfbe3 Author: Éric <chatellier@codelutin.com> Date: Mon Mar 2 17:06:39 2020 +0100 [gitflow-maven-plugin]Update versions for release Summary of changes: .gitlab-ci.yml | 25 ++- README.md | 5 +- pom.xml | 82 ++++--- src/main/java/org/chorem/jtimer/JTimer.java | 108 +++++---- src/main/java/org/chorem/jtimer/JTimerConfig.java | 32 ++- src/main/java/org/chorem/jtimer/JTimerFactory.java | 51 +---- .../java/org/chorem/jtimer/data/TimerCore.java | 18 +- .../java/org/chorem/jtimer/entities/TimerSync.java | 151 ------------- .../java/org/chorem/jtimer/entities/TimerTask.java | 21 +- .../jtimer/plugin/timebundle/TimeBundleHelper.java | 136 ------------ .../jtimer/plugin/timebundle/TimeBundleSaver.java | 219 ------------------ .../plugin/timebundle/TimeBundleSynchronizer.java | 171 -------------- .../plugin/timebundle/TimeBundleVetoable.java | 56 ----- .../plugin/timebundle/TimerSyncCellRenderer.java | 46 ---- .../jtimer/plugin/timebundle/TimerSyncEditor.java | 245 --------------------- .../plugin/timebundle/TimerSyncTableModel.java | 203 ----------------- .../java/org/chorem/jtimer/system/SystemInfo.java | 5 - .../jtimer/system/macos/ApplicationServices.java | 2 +- .../jtimer/system/macos/MacOSSystemInfo.java | 7 +- .../chorem/jtimer/system/unix/UnixSystemInfo.java | 24 +- .../java/org/chorem/jtimer/system/unix/X11.java | 2 +- .../java/org/chorem/jtimer/system/unix/Xss.java | 2 +- .../org/chorem/jtimer/system/win32/Kernel32.java | 2 +- .../org/chorem/jtimer/system/win32/User32.java | 2 +- .../jtimer/system/win32/Win32SystemInfo.java | 7 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 36 ++- .../chorem/jtimer/ui/systray/SystrayManager.java | 8 +- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 75 ++++++- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 1 + .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 10 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 18 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 103 ++++++--- .../org/chorem/jtimer/ui/widget/DialogView.java | 8 +- src/main/resources/{log4j2.xml => logback.xml} | 32 ++- .../resources/TimerSyncEditor.properties | 46 ---- .../resources/TimerSyncEditor_fr.properties | 47 ---- .../plugin/timebundle/resources/dialog-close.png | Bin 1382 -> 0 bytes .../org/chorem/jtimer/resources/JTimer.properties | 28 +-- .../chorem/jtimer/resources/JTimer_fr.properties | 15 +- .../resources/org/chorem/jtimer/resources/bell.png | Bin 1887 -> 2110 bytes .../org/chorem/jtimer/resources/bookmark-new.png | Bin 1532 -> 0 bytes .../org/chorem/jtimer/resources/clock_play.png | Bin 0 -> 2609 bytes .../org/chorem/jtimer/resources/clock_stop.png | Bin 0 -> 2513 bytes .../org/chorem/jtimer/resources/date_task.png | Bin 0 -> 2358 bytes .../org/chorem/jtimer/resources/document-new.png | Bin 1008 -> 0 bytes .../org/chorem/jtimer/resources/go-next.png | Bin 1219 -> 0 bytes .../org/chorem/jtimer/resources/note_add.png | Bin 0 -> 1409 bytes .../org/chorem/jtimer/resources/notes.png | Bin 2234 -> 0 bytes .../org/chorem/jtimer/resources/process-stop.png | Bin 1927 -> 0 bytes .../org/chorem/jtimer/resources/report_add.png | Bin 0 -> 1871 bytes .../ui/alert/resources/AlertEditor.properties | 6 +- .../jtimer/ui/alert/resources/accept_button.png | Bin 0 -> 712 bytes .../org/chorem/jtimer/ui/alert/resources/add.png | Bin 0 -> 698 bytes .../org/chorem/jtimer/ui/alert/resources/cross.png | Bin 0 -> 473 bytes .../chorem/jtimer/ui/alert/resources/delete.png | Bin 0 -> 695 bytes .../ui/report/resources/ReportView.properties | 10 +- .../ui/report/resources/applications-system.png | Bin 1488 -> 0 bytes .../chorem/jtimer/ui/report/resources/cross.png | Bin 0 -> 1049 bytes .../org/chorem/jtimer/ui/report/resources/date.png | Bin 0 -> 775 bytes .../jtimer/ui/report/resources/date_current.png | Bin 667 -> 0 bytes .../jtimer/ui/report/resources/date_previous.png | Bin 720 -> 761 bytes .../jtimer/ui/report/resources/dialog-close.png | Bin 1382 -> 0 bytes .../ui/report/resources/document_prepare.png | Bin 0 -> 1675 bytes .../chorem/jtimer/ui/report/resources/email_go.png | Bin 0 -> 1364 bytes .../jtimer/ui/report/resources/mail-forward.png | Bin 893 -> 0 bytes .../jtimer/ui/resources/HelpFrame.properties | 2 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 2 +- .../jtimer/ui/resources/NewTaskView.properties | 4 +- .../org/chorem/jtimer/ui/resources/date_task.png | Bin 0 -> 2358 bytes .../chorem/jtimer/ui/resources/document-new.png | Bin 1008 -> 0 bytes .../ui/systray/resources/SystrayManager.properties | 1 + .../systray/resources/SystrayManager_fr.properties | 1 + .../ui/tasks/resources/IdleDialog.properties | 13 +- .../ui/tasks/resources/IdleDialog_fr.properties | 2 + .../ui/tasks/resources/RunTaskJob.properties | 4 +- .../jtimer/ui/tasks/resources/appointment-new.png | Bin 2399 -> 0 bytes .../jtimer/ui/tasks/resources/arrow_right.png | Bin 0 -> 577 bytes .../org/chorem/jtimer/ui/tasks/resources/bell.png | Bin 0 -> 2110 bytes .../chorem/jtimer/ui/tasks/resources/bell48.png | Bin 3725 -> 0 bytes .../jtimer/ui/tasks/resources/clock_edit.png | Bin 0 -> 2726 bytes .../jtimer/ui/tasks/resources/clock_pause.png | Bin 0 -> 2583 bytes .../ui/tasks/resources/document-revert-3.png | Bin 2043 -> 0 bytes .../chorem/jtimer/ui/tasks/resources/go-jump.png | Bin 1491 -> 0 bytes .../chorem/jtimer/ui/tasks/resources/go-next.png | Bin 1219 -> 0 bytes .../jtimer/ui/tasks/resources/process-stop.png | Bin 1927 -> 0 bytes .../org/chorem/jtimer/ui/tasks/resources/stop.png | Bin 0 -> 1173 bytes .../ui/tasks/resources/unmark_to_download.png | Bin 0 -> 8134 bytes src/site/rst/index.rst.vm | 18 +- src/site/rst/timebundle.rst | 30 --- src/site/site.xml | 10 +- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 2 - .../plugin/timebundle/TimeBundleHelperTest.java | 87 -------- .../plugin/timebundle/TimeBundleSaverTest.java | 66 ------ .../jtimer/ui/report/ReportGeneratorTest.java | 11 +- 94 files changed, 415 insertions(+), 1903 deletions(-) delete mode 100644 src/main/java/org/chorem/jtimer/entities/TimerSync.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelper.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaver.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSynchronizer.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleVetoable.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncCellRenderer.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncEditor.java delete mode 100644 src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncTableModel.java rename src/main/resources/{log4j2.xml => logback.xml} (58%) delete mode 100644 src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/TimerSyncEditor.properties delete mode 100644 src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/TimerSyncEditor_fr.properties delete mode 100644 src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/dialog-close.png mode change 100755 => 100644 src/main/resources/org/chorem/jtimer/resources/bell.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/bookmark-new.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/clock_play.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/clock_stop.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/date_task.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/document-new.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/go-next.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/note_add.png delete mode 100755 src/main/resources/org/chorem/jtimer/resources/notes.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/process-stop.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/report_add.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/accept_button.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/add.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/cross.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/delete.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/applications-system.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/cross.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/date.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/dialog-close.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/document_prepare.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/email_go.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/mail-forward.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/resources/date_task.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/resources/document-new.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/appointment-new.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/arrow_right.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell.png delete mode 100755 src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell48.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_edit.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_pause.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/document-revert-3.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-jump.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-next.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/process-stop.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/stop.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/unmark_to_download.png delete mode 100644 src/site/rst/timebundle.rst delete mode 100644 src/test/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelperTest.java delete mode 100644 src/test/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaverTest.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.