branch develop updated (9e128d8 -> 0be0fe6)
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 9e128d8 fixes #150: Does not build on JDK11 new 0be0fe6 Update libs The 1 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 0be0fe65c9f0e31f8d3045659ddd448363ecb29a Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jan 6 12:26:08 2020 +0100 Update libs Summary of changes: pom.xml | 8 ++++---- .../resources/org/chorem/jtimer/ui/resources/HelpFrame.properties | 2 +- .../org/chorem/jtimer/ui/resources/HelpFrame_fr.properties | 2 +- .../java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java | 5 +++-- 4 files changed, 9 insertions(+), 8 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 0be0fe65c9f0e31f8d3045659ddd448363ecb29a Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jan 6 12:26:08 2020 +0100 Update libs --- pom.xml | 8 ++++---- .../resources/org/chorem/jtimer/ui/resources/HelpFrame.properties | 2 +- .../org/chorem/jtimer/ui/resources/HelpFrame_fr.properties | 2 +- .../java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index e56ec04..ab18a09 100644 --- a/pom.xml +++ b/pom.xml @@ -171,7 +171,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>5.4.0</version> + <version>5.5.0</version> <scope>compile</scope> </dependency> <dependency> @@ -228,7 +228,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>7.0.0</version> + <version>7.1.0</version> <scope>test</scope> <exclusions> <exclusion> @@ -282,7 +282,7 @@ <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>extra-enforcer-rules</artifactId> - <version>1.0-beta-7</version> + <version>1.2</version> </dependency> </dependencies> </plugin> @@ -369,7 +369,7 @@ <productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion> <txtProductVersion>${project.version}</txtProductVersion> <companyName>${project.organization.name}</companyName> - <copyright>${project.inceptionYear} - 2019 ${project.organization.name}</copyright> + <copyright>${project.inceptionYear} - 2020 ${project.organization.name}</copyright> <internalName>jtimer</internalName> <originalFilename>jtimer.exe</originalFilename> </versionInfo> 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 5c40182..bcf9b2d 100644 --- a/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties +++ b/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties @@ -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 - 2019, 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 - 2020, 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 ca514b7..89be3f7 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 @@ -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 - 2019, 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 - 2020, 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. diff --git a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java index 37f1ee8..f235344 100644 --- a/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java +++ b/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java @@ -22,7 +22,8 @@ package org.chorem.jtimer.ui.report; -import com.google.gson.internal.JavaVersion; +import org.apache.commons.lang3.JavaVersion; +import org.apache.commons.lang3.SystemUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.AbstractJTimerTest; @@ -215,7 +216,7 @@ public class ReportGeneratorTest extends AbstractJTimerTest { Assert.assertNotNull(content); // no annotations - if (JavaVersion.isJava9OrLater()) { + if (SystemUtils.isJavaVersionAtLeast(JavaVersion.JAVA_9)) { Assert.assertTrue(content.indexOf("* 2/3/09, 2:10 PM : Test task and subtask time") > 0); Assert.assertTrue(content.indexOf("* 12/11/08, 12:00 AM : Not easy work") > 0); } else { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm