branch develop updated (e3af9d1 -> 7bd2a35)
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 e3af9d1 Use chorempom 10.4 + tidy pom + fix Bad webstart generation on snapshot site (Fixes #1370) new e9f9c56 refs #1359: Fix menu action name new 0dfba41 Happy new year commit new 7bd2a35 Update libs The 3 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 7bd2a35676c022f9eedf05b310cf5a7386ccca95 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jan 13 11:26:01 2017 +0100 Update libs commit 0dfba417145b76d90ad61394f5eabaec61b8d8c0 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jan 13 11:25:43 2017 +0100 Happy new year commit commit e9f9c5672d4c116163844498131136bf064c1962 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jan 13 11:25:28 2017 +0100 refs #1359: Fix menu action name Summary of changes: pom.xml | 38 +++++++++++++++++----- src/main/java/org/chorem/jtimer/JTimer.java | 2 +- .../jtimer/ui/resources/HelpFrame.properties | 4 +-- .../jtimer/ui/resources/HelpFrame_fr.properties | 4 +-- 4 files changed, 35 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 jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit e9f9c5672d4c116163844498131136bf064c1962 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jan 13 11:25:28 2017 +0100 refs #1359: Fix menu action name --- src/main/java/org/chorem/jtimer/JTimer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index 5b4393b..dd97e87 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -372,7 +372,7 @@ public class JTimer extends SingleFrameApplication implements menuBar.add(createMenu("projectMenu", projectMenuActionNames)); String[] taskMenuActionNames = {"newTask", "editTask", "closeTask", - "deleteTask", "---", "startTask", "stopAllTasks", "---", + "deleteTask", "---", "startTask", "stopTask", "---", "addAnnotation", "editAlert", "increment1Task", "increment5Task", "increment30Task", "decrement1Task", "decrement5Task", "decrement30Task", "setToZero", "mergeTasks"}; -- 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 0dfba417145b76d90ad61394f5eabaec61b8d8c0 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jan 13 11:25:43 2017 +0100 Happy new year commit --- .../resources/org/chorem/jtimer/ui/resources/HelpFrame.properties | 4 ++-- .../resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties index e4dc923..eafafe0 100644 --- a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties +++ b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2017 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -25,7 +25,7 @@ aboutIcon = jtimer-logo-orange.jpg # About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2016, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2017, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> aboutLicenseTitle = License aboutLicense = You can modify and redistribute the program under the conditions of the GNU General Public License (version 2 or later). A copy of the GPL is in the file "LICENSE.txt" provided with ${Application.title}. All rights reserved. No guarantees are provided for use of this program. diff --git a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties index f98e302..d4eb8ed 100644 --- a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2017 CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -22,7 +22,7 @@ # About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} -aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2016, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> +aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2017, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> aboutLicenseTitle = Licence aboutLicense = Vous pouvez modifier et redistribuer ce programme sous les conditions \u00E9nonc\u00E9es par la licence GNU GPL (version 2 ou ult\u00E9rieure). Une copie de la licence GPL est dans le fichier \u00AB\u00A0LICENSE.txt\u00A0\u00BB fourni avec ${Application.title}. Tous droits r\u00E9serv\u00E9s. Aucune garantie n'est fournie pour l'utilisation de ce programme. -- 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 7bd2a35676c022f9eedf05b310cf5a7386ccca95 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Jan 13 11:26:01 2017 +0100 Update libs --- pom.xml | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 846d7b2..ebda6ac 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,33 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + %% + Copyright (C) 2007 - 2017 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public + License along with this program. If not, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>10.4</version> + <version>10.5</version> </parent> <groupId>org.chorem</groupId> @@ -106,7 +128,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-rc-4</version> + <version>3.1.1</version> <scope>compile</scope> <exclusions> <exclusion> @@ -160,13 +182,13 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.6.2</version> + <version>2.7</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.6.2</version> + <version>2.7</version> <scope>runtime</scope> </dependency> <dependency> @@ -182,12 +204,12 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>2.7</version> + <version>2.8.0</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.4</version> + <version>3.5</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -204,7 +226,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.9.10</version> + <version>6.10</version> <scope>test</scope> <exclusions> <exclusion> @@ -365,7 +387,7 @@ <plugin> <groupId>com.akathist.maven.plugins.launch4j</groupId> <artifactId>launch4j-maven-plugin</artifactId> - <version>1.7.11</version> + <version>1.7.15</version> <executions> <execution> <id>launch4j</id> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm