branch develop updated (ba435dc3 -> a14d762d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from ba435dc3 [jgitflow-maven-plugin]updating poms for 2.4.27-SNAPSHOT development new c486de37 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds a3863a85 [jgitflow-maven-plugin]updating poms for 2.4.26 branch with snapshot versions new dee8ce7a Fix release ... new 011c40e1 [jgitflow-maven-plugin]updating poms for branch'release/2.4.26' with non-snapshot versions new 12d2e165 [jgitflow-maven-plugin]merging 'release/2.4.26' into 'master' new e58c6a83 [jgitflow-maven-plugin]merging 'master' into 'develop' new a14d762d [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 a14d762d28d62ef1369ec782f302f7ac9cdda973 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:32 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e58c6a83b3175963e3aa00f50a95a4e189fda62b Merge: c486de37 12d2e165 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:31 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit c486de37cbfd6b51b9b99ea694504444228f6524 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:31 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 12d2e165d6538f7a7c53bb25dd93bbf79d22d5e9 Merge: 45d439a2 011c40e1 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:30 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.26' into 'master' commit 011c40e1e8fcdd8675485a1bf1025ebfbbb81177 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:41:10 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.26' with non-snapshot versions commit dee8ce7ac20c89219d557992831ef26cada8a74e Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:40:51 2018 +0200 Fix release ... Summary of changes: .../src/license/THIRD-PARTY.properties | 11 ++++------ .../faxtomail/services/service/ImageUtilTest.java | 24 ++++++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 12 ++++------- 3 files changed, 32 insertions(+), 15 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit dee8ce7ac20c89219d557992831ef26cada8a74e Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:40:51 2018 +0200 Fix release ... --- .../src/license/THIRD-PARTY.properties | 11 ++++------ .../faxtomail/services/service/ImageUtilTest.java | 24 ++++++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 12 ++++------- 3 files changed, 32 insertions(+), 15 deletions(-) diff --git a/faxtomail-service/src/license/THIRD-PARTY.properties b/faxtomail-service/src/license/THIRD-PARTY.properties index 37a36253..b0330ac8 100644 --- a/faxtomail-service/src/license/THIRD-PARTY.properties +++ b/faxtomail-service/src/license/THIRD-PARTY.properties @@ -5,6 +5,7 @@ # - Apache License # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-clause License w/nuclear disclaimer # - BSD License # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -23,6 +24,7 @@ # - GPLv2+CE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - JJ2000 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -32,19 +34,14 @@ # - New BSD License # - Public Domain # - The Apache Software License, Version 2.0 +# - The BSD License # - The H2 License, Version 1.0 # - UnboundID LDAP SDK Free Use License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jul 09 18:33:13 CEST 2018 -com.twelvemonkeys.common--common-image--3.0.2=BSD 3-Clause License -com.twelvemonkeys.common--common-io--3.0.2=BSD 3-Clause License -com.twelvemonkeys.common--common-lang--3.0.2=BSD 3-Clause License -com.twelvemonkeys.imageio--imageio-core--3.0.2=BSD 3-Clause License -com.twelvemonkeys.imageio--imageio-jpeg--3.0.2=BSD 3-Clause License -com.twelvemonkeys.imageio--imageio-metadata--3.0.2=BSD 3-Clause License +#Fri Oct 19 16:38:26 CEST 2018 commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java index c8e5f207..dd2d0330 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/ImageUtilTest.java @@ -1,4 +1,28 @@ package com.franciaflex.faxtomail.services.service; +/*- + * #%L + * FaxToMail :: Service + * $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% + */ + public class ImageUtilTest { } diff --git a/faxtomail-ui-web/src/license/THIRD-PARTY.properties b/faxtomail-ui-web/src/license/THIRD-PARTY.properties index 7307574f..e8f83c8e 100644 --- a/faxtomail-ui-web/src/license/THIRD-PARTY.properties +++ b/faxtomail-ui-web/src/license/THIRD-PARTY.properties @@ -5,7 +5,7 @@ # - Apache License # - Apache License 2.0 # - Apache License, version 2.0 -# - BSD 3-Clause License +# - BSD 3-clause License w/nuclear disclaimer # - BSD License # - CDDL # - CDDL + GPLv2 with classpath exception @@ -26,6 +26,7 @@ # - GPLv2+CE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - JJ2000 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -37,6 +38,7 @@ # - SIL Open Font License (OFL) # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 +# - The BSD License # - The H2 License, Version 1.0 # - The MIT License # - UnboundID LDAP SDK Free Use License @@ -44,13 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jul 09 18:45:15 CEST 2018 -com.twelvemonkeys.common--common-image--3.0.2=BSD 3-Clause License -com.twelvemonkeys.common--common-io--3.0.2=BSD 3-Clause License -com.twelvemonkeys.common--common-lang--3.0.2=BSD 3-Clause License -com.twelvemonkeys.imageio--imageio-core--3.0.2=BSD 3-Clause License -com.twelvemonkeys.imageio--imageio-jpeg--3.0.2=BSD 3-Clause License -com.twelvemonkeys.imageio--imageio-metadata--3.0.2=BSD 3-Clause License +#Fri Oct 19 16:40:12 CEST 2018 commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License -- 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 011c40e1e8fcdd8675485a1bf1025ebfbbb81177 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:41:10 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.26' 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 46a400fa..7b5129c3 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.26-SNAPSHOT</version> + <version>2.4.26</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 62f73c2e..3260c32b 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.26-SNAPSHOT</version> + <version>2.4.26</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 6390c4c8..74c9a608 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.26-SNAPSHOT</version> + <version>2.4.26</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 76166acc..50fbb3df 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.26-SNAPSHOT</version> + <version>2.4.26</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 8c4f946c..da73775f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.26-SNAPSHOT</version> + <version>2.4.26</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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 12d2e165d6538f7a7c53bb25dd93bbf79d22d5e9 Merge: 45d439a2 011c40e1 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:30 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.26' into 'master' .gitlab-ci.yml | 40 +++++ faxtomail-persistence/pom.xml | 2 +- .../entities/AbstractFaxToMailTopiaDao.java | 20 ++- .../persistence/entities/EmailTopiaDao.java | 187 +-------------------- faxtomail-service/pom.xml | 14 +- .../src/license/THIRD-PARTY.properties | 11 +- .../faxtomail/services/FaxToMailServiceUtils.java | 12 ++ .../services/service/ClientServiceImpl.java | 13 +- .../services/service/ConfigurationServiceImpl.java | 4 +- .../services/service/EmailServiceImpl.java | 99 ++++++++--- .../services/service/InitFaxToMailServiceImpl.java | 5 +- .../services/service/LdapServiceImpl.java | 3 - .../services/FaxToMailServiceUtilsTest.java | 38 +++++ .../services/service/EmailServiceTest.java | 139 +++++++++++++-- .../faxtomail/services/service/ImageUtilTest.java | 28 +++ .../src/test/resources/pdf/10004-page1.png | Bin 0 -> 72751 bytes faxtomail-service/src/test/resources/pdf/10075.pdf | Bin 0 -> 479471 bytes faxtomail-ui-swing/pom.xml | 14 +- .../src/license/THIRD-PARTY.properties | 13 +- .../swing/actions/PrintOnDefaultPrinterAction.java | 6 +- .../ui/swing/actions/ShowDemandeAction.java | 8 + .../faxtomail/ui/swing/content/MainUIHandler.java | 4 +- .../ui/swing/content/demande/DemandeUIHandler.java | 71 +++++--- .../content/demande/actions/ArchiveAction.java | 15 +- .../demande/actions/ArchiveFromListAction.java | 14 +- .../actions/ComputeQuantitiesByRangeAction.java | 12 +- .../OpenMailFolderChooserFromListAction.java | 8 +- .../demande/actions/SaveDemandeFromListAction.java | 10 +- .../demandgroup/DemandGroupCellRenderer.java | 2 - .../content/pdfeditor/PDFEditorUIHandler.java | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../transmit/MailFolderChooserUIHandler.java | 22 +-- .../content/transmit/actions/TransmitAction.java | 12 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 45 ++--- faxtomail-ui-web/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 12 +- .../faxtomail/web/FaxToMailInterceptor.java | 7 +- .../faxtomail/web/job/MailFilterJob.java | 28 +-- pom.xml | 26 ++- 39 files changed, 567 insertions(+), 383 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c486de37cbfd6b51b9b99ea694504444228f6524 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:31 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- 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 edf9cd08..7b5129c3 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.27-SNAPSHOT</version> + <version>2.4.26</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7846dfc0..3260c32b 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.27-SNAPSHOT</version> + <version>2.4.26</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3bedaa65..74c9a608 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.27-SNAPSHOT</version> + <version>2.4.26</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index a54e3b1e..50fbb3df 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.27-SNAPSHOT</version> + <version>2.4.26</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 588d4f6d..da73775f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.27-SNAPSHOT</version> + <version>2.4.26</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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit e58c6a83b3175963e3aa00f50a95a4e189fda62b Merge: c486de37 12d2e165 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:31 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' .../src/license/THIRD-PARTY.properties | 11 ++++------ .../faxtomail/services/service/ImageUtilTest.java | 24 ++++++++++++++++++++++ .../src/license/THIRD-PARTY.properties | 12 ++++------- 3 files changed, 32 insertions(+), 15 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 develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a14d762d28d62ef1369ec782f302f7ac9cdda973 Author: jcouteau <couteau@codelutin.com> Date: Fri Oct 19 16:43:32 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- 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 7b5129c3..edf9cd08 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.26</version> + <version>2.4.27-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 3260c32b..7846dfc0 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.26</version> + <version>2.4.27-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 74c9a608..3bedaa65 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.26</version> + <version>2.4.27-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 50fbb3df..a54e3b1e 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.26</version> + <version>2.4.27-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index da73775f..588d4f6d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.26</version> + <version>2.4.27-SNAPSHOT</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>.
participants (1)
-
codelutin.com scm