branch develop updated (112ca20 -> 61638af)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git from 112ca20 fixes #1128: Migrates to git (fix multilang site urls) new 6b1b97c Fix gitignore new 256fdc1 fixes #1320: Update libs new ba3d26f Update dates new 61638af Set min jre to 1.7 The 4 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 61638af91f826108f50836afc735e40d5a7a0313 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Feb 23 09:38:35 2016 +0100 Set min jre to 1.7 commit ba3d26fd07389e1497ddf9a7e2a5b2c37545aea1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 22 18:57:52 2016 +0100 Update dates commit 256fdc124e17ee638f4e968abfa7121c005a48d8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 22 18:55:28 2016 +0100 fixes #1320: Update libs commit 6b1b97cd7b13f2db603c74d57bee221bc75eadfb Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 22 18:44:58 2016 +0100 Fix gitignore Summary of changes: .gitignore | 4 ++++ pom.xml | 20 ++++++++++---------- .../org/chorem/jtimer/resources/JTimer.properties | 2 +- .../org/chorem/jtimer/resources/JTimer_fr.properties | 2 +- .../chorem/jtimer/ui/resources/HelpFrame.properties | 4 ++-- .../jtimer/ui/resources/HelpFrame_fr.properties | 4 ++-- 6 files changed, 20 insertions(+), 16 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 http://git.chorem.org/jtimer.git commit 6b1b97cd7b13f2db603c74d57bee221bc75eadfb Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 22 18:44:58 2016 +0100 Fix gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 5fb0960..e2f61eb 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,7 @@ target/* */*.iws */*.iml */.idea +/target/ +.project +.settings +.classpath -- 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 http://git.chorem.org/jtimer.git commit 256fdc124e17ee638f4e968abfa7121c005a48d8 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 22 18:55:28 2016 +0100 fixes #1320: Update libs --- pom.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index 31453c7..425bba9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>1.5</version> + <version>6</version> </parent> <groupId>org.chorem</groupId> @@ -91,7 +91,7 @@ <locales>fr,en</locales> <xmrpcVersion>3.1.3</xmrpcVersion> - <jnaVersion>4.0.0</jnaVersion> + <jnaVersion>4.2.1</jnaVersion> <!-- files to deploy to redmine --> <redmine.releaseFiles> @@ -220,7 +220,7 @@ <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.10</version> + <version>2.17</version> <configuration> <configLocation>${project.basedir}/src/main/config/checkstyle.xml </configLocation> @@ -250,7 +250,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> - <version>3.0-alpha-2</version> + <version>3.0-rc-3</version> <scope>compile</scope> <exclusions> <exclusion> @@ -314,7 +314,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.20</version> + <version>2.3.23</version> </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> @@ -340,17 +340,17 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.0</version> + <version>4.1</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.3.1</version> + <version>3.4</version> </dependency> <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> - <version>1.1.3</version> + <version>1.2</version> </dependency> <dependency> <groupId>commons-io</groupId> @@ -375,7 +375,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.8.7</version> + <version>6.9.10</version> <scope>test</scope> <exclusions> <exclusion> -- 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 http://git.chorem.org/jtimer.git commit ba3d26fd07389e1497ddf9a7e2a5b2c37545aea1 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Feb 22 18:57:52 2016 +0100 Update dates --- src/main/resources/org/chorem/jtimer/resources/JTimer.properties | 2 +- src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties | 2 +- .../resources/org/chorem/jtimer/ui/resources/HelpFrame.properties | 4 ++-- .../resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties index 84e6cea..1490cda 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 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 diff --git a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties index aa6a4de..be9d292 100644 --- a/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties +++ b/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties @@ -2,7 +2,7 @@ # #%L # jTimer # %% -# Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 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 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 8de8ad0..6c6fc61 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 - 2013 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 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 - 2013, 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 - 2016, 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 adbe364..ca99d33 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 - 2013 CodeLutin, Chatellier Eric +# Copyright (C) 2007 - 2016 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 - 2013, 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 - 2016, 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 http://git.chorem.org/jtimer.git commit 61638af91f826108f50836afc735e40d5a7a0313 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Feb 23 09:38:35 2016 +0100 Set min jre to 1.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 425bba9..6cd8ccb 100644 --- a/pom.xml +++ b/pom.xml @@ -415,7 +415,7 @@ <jar>jtimer.jar</jar> <errTitle>${project.name}</errTitle> <jre> - <minVersion>1.6.0</minVersion> + <minVersion>1.7.0</minVersion> </jre> </configuration> </execution> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm