branch develop updated (9155314 -> b3d6b88)
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 9155314 Merge branch 'feature/sync' into 'develop' new b3d6b88 Prepare 1.6-alpha-1 release 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 b3d6b88f0ccaf02758119513f6083cd2640d5956 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jul 25 16:00:38 2016 +0200 Prepare 1.6-alpha-1 release Summary of changes: pom.xml | 13 ++++++------ src/license/THIRD-PARTY.properties | 19 ------------------ .../java/org/chorem/jtimer/entities/SyncInfo.java | 23 +++++++++++++++++++++- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 4 ++-- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 22 +++++++++++++++++++++ .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 6 +++--- 6 files changed, 55 insertions(+), 32 deletions(-) delete mode 100644 src/license/THIRD-PARTY.properties -- 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 b3d6b88f0ccaf02758119513f6083cd2640d5956 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Jul 25 16:00:38 2016 +0200 Prepare 1.6-alpha-1 release --- pom.xml | 13 ++++++------ src/license/THIRD-PARTY.properties | 19 ------------------ .../java/org/chorem/jtimer/entities/SyncInfo.java | 23 +++++++++++++++++++++- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 4 ++-- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 22 +++++++++++++++++++++ .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 6 +++--- 6 files changed, 55 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 9d15586..1ee6adb 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>10</version> + <version>10.1</version> </parent> <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6-alpha-1-SNAPSHOT</version> <name>jTimer</name> <description> @@ -102,7 +102,6 @@ <javaVersion>1.8</javaVersion> <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <gsonVersion>2.6.2</gsonVersion> </properties> <build> @@ -274,19 +273,19 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <version>2.6</version> + <version>2.6.2</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-jcl</artifactId> - <version>2.6</version> + <version>2.6.2</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.23</version> + <version>2.3.25-incubating</version> </dependency> <dependency> <groupId>org.yaml</groupId> @@ -298,7 +297,7 @@ <dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>${gsonVersion}</version> + <version>2.7</version> </dependency> <!-- commons-xxx lib --> diff --git a/src/license/THIRD-PARTY.properties b/src/license/THIRD-PARTY.properties deleted file mode 100644 index a3d13e9..0000000 --- a/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - ASL, version 2 -# - Apache License, Version 2.0 -# - GNU LESSER GENERAL PUBLIC LICENSE -# - LGPL 2.1 -# - LGPL, version 2.1 -# - Lesser General Public License (LGPL) -# - Lesser General Public License (LGPL) v 3.0 -# - The Apache Software License, Version 2.0 -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Fri May 27 09:37:37 CEST 2016 -org.apache.ant--ant--1.7.0=Apache License, Version 2.0 -org.apache.ant--ant-launcher--1.7.0=Apache License, Version 2.0 -org.testng--testng--6.9.11=Apache License, Version 2.0 diff --git a/src/main/java/org/chorem/jtimer/entities/SyncInfo.java b/src/main/java/org/chorem/jtimer/entities/SyncInfo.java index ce2e428..6a7a636 100644 --- a/src/main/java/org/chorem/jtimer/entities/SyncInfo.java +++ b/src/main/java/org/chorem/jtimer/entities/SyncInfo.java @@ -1,5 +1,26 @@ -package org.chorem.jtimer.entities; +/*- + * #%L + * jTimer + * %% + * Copyright (C) 2016 CodeLutin, Charlène Servantie + * %% + * 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% + */ +package org.chorem.jtimer.entities; import java.util.Date; diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index 6edd028..5bfdb50 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -8,12 +8,12 @@ * 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>. diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index f5aad9d..39f104d 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -1,3 +1,25 @@ +/*- + * #%L + * jTimer + * %% + * Copyright (C) 2016 CodeLutin, Charlène Servantie + * %% + * 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% + */ + package org.chorem.jtimer.io; import com.google.gson.JsonObject; diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java index 9cafe82..f5088e1 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java @@ -8,12 +8,12 @@ * 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>. @@ -449,4 +449,4 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener } } } -} \ No newline at end of file +} -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm