branch master updated (a30014ac -> f85227fd)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from a30014ac Merge branch 'release/2.4.5' adds 82eb4abe [jgitflow-maven-plugin]updating poms for 2.4.6-SNAPSHOT development adds 70992329 fixes #9713 new c0f35d23 Fix release ... new acfd6d52 [jgitflow-maven-plugin]updating poms for branch'release/2.4.6' with non-snapshot versions new f85227fd Merge branch 'release/2.4.6' 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 f85227fdc9283863b438a1055161b74fb008da6d Merge: a30014ac acfd6d52 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 11:23:38 2018 +0100 Merge branch 'release/2.4.6' Conflicts: faxtomail-persistence/pom.xml faxtomail-service/pom.xml faxtomail-ui-swing/pom.xml faxtomail-ui-web/pom.xml pom.xml commit acfd6d52be211780b2634649bdc72ea8521db39e Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 10:58:46 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.4.6' with non-snapshot versions commit c0f35d239d09714727767863c26d8c005a15607f Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 10:58:32 2018 +0100 Fix release ... Summary of changes: faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java | 11 +++++++++++ .../swing/content/demande/actions/LoadFolderEmailsAction.java | 8 ++++++-- faxtomail-ui-swing/src/main/resources/log4j2.xml | 1 + faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 23 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c0f35d239d09714727767863c26d8c005a15607f Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 10:58:32 2018 +0100 Fix release ... --- .../faxtomail/ui/swing/OpenPDFTest.java | 26 +++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java b/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java index 6395d49e..9c54a0ff 100644 --- a/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java +++ b/faxtomail-ui-swing/src/test/java/com/franciaflex/faxtomail/ui/swing/OpenPDFTest.java @@ -1,5 +1,29 @@ package com.franciaflex.faxtomail.ui.swing; +/*- + * #%L + * FaxToMail :: UI + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 - 2018 Mac-Groupe, Code Lutin + * %% + * 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% + */ + import org.junit.Test; @@ -37,4 +61,4 @@ public class OpenPDFTest { } } -} \ No newline at end of file +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit acfd6d52be211780b2634649bdc72ea8521db39e Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 10:58:46 2018 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.4.6' with non-snapshot versions --- faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/faxtomail-persistence/pom.xml b/faxtomail-persistence/pom.xml index 81a19a92..57af3a44 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.6-SNAPSHOT</version> + <version>2.4.6</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e88c6af1..ea02d3fd 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>2.4.6-SNAPSHOT</version> + <version>2.4.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 10e7fd96..3e6808ee 100644 --- a/faxtomail-ui-swing/pom.xml +++ b/faxtomail-ui-swing/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.6-SNAPSHOT</version> + <version>2.4.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 153ec671..ce0208ef 100644 --- a/faxtomail-ui-web/pom.xml +++ b/faxtomail-ui-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.6-SNAPSHOT</version> + <version>2.4.6</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 9557cf20..61a712f5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.6-SNAPSHOT</version> + <version>2.4.6</version> <packaging>pom</packaging> <name>FaxToMail</name> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch master in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f85227fdc9283863b438a1055161b74fb008da6d Merge: a30014ac acfd6d52 Author: Maven Release <maven-release@codelutin.com> Date: Tue Feb 20 11:23:38 2018 +0100 Merge branch 'release/2.4.6' Conflicts: faxtomail-persistence/pom.xml faxtomail-service/pom.xml faxtomail-ui-swing/pom.xml faxtomail-ui-web/pom.xml pom.xml faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../franciaflex/faxtomail/ui/swing/FaxToMailUIContext.java | 11 +++++++++++ .../swing/content/demande/actions/LoadFolderEmailsAction.java | 8 ++++++-- faxtomail-ui-swing/src/main/resources/log4j2.xml | 1 + faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 23 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm