branch develop updated (8aadbc0a -> 3fb11db2)
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 8aadbc0a [jgitflow-maven-plugin]updating poms for 2.4.24-SNAPSHOT development new cfed7122 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 89a4fb9c Fix release ... new 7cb1f9c0 [jgitflow-maven-plugin]updating poms for branch'release/2.4.23' with non-snapshot versions new 7b39667c [jgitflow-maven-plugin]merging 'release/2.4.23' into 'master' new 03e21871 [jgitflow-maven-plugin]merging 'master' into 'develop' new 3fb11db2 [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 3fb11db28c9fdb6cb7da92394901678b94f641a3 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:48 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 03e2187102cf83df9a9fd45bf1046ef398bb73f9 Merge: cfed7122 7b39667c Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:42 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit cfed71228356ab88afdd80a1f699fccf7836beef Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:40 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 7b39667c1ed49f71f30740f498a2d1625f66e33c Merge: 827de030 7cb1f9c0 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:30 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.23' into 'master' commit 7cb1f9c0e72cfc1ef59762613bf433ae1d067e57 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:49:43 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.23' with non-snapshot versions commit 89a4fb9ce0d29d3bb4b58833322b54a2f0807756 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:48:40 2018 +0200 Fix release ... Summary of changes: faxtomail-service/pom.xml | 2 ++ faxtomail-service/src/license/THIRD-PARTY.properties | 8 +++++++- faxtomail-ui-web/src/license/THIRD-PARTY.properties | 10 ++++++++-- 3 files changed, 17 insertions(+), 3 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 89a4fb9ce0d29d3bb4b58833322b54a2f0807756 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:48:40 2018 +0200 Fix release ... --- faxtomail-service/pom.xml | 2 ++ faxtomail-service/src/license/THIRD-PARTY.properties | 8 +++++++- faxtomail-ui-web/src/license/THIRD-PARTY.properties | 10 ++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1ffbe3d4..9d77d375 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -230,11 +230,13 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>jbig2-imageio</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>com.twelvemonkeys.imageio</groupId> <artifactId>imageio-jpeg</artifactId> + <scope>runtime</scope> </dependency> </dependencies> diff --git a/faxtomail-service/src/license/THIRD-PARTY.properties b/faxtomail-service/src/license/THIRD-PARTY.properties index 66ea6b03..37a36253 100644 --- a/faxtomail-service/src/license/THIRD-PARTY.properties +++ b/faxtomail-service/src/license/THIRD-PARTY.properties @@ -38,7 +38,13 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 23 16:51:12 CET 2015 +#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 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-ui-web/src/license/THIRD-PARTY.properties b/faxtomail-ui-web/src/license/THIRD-PARTY.properties index 20490739..7307574f 100644 --- a/faxtomail-ui-web/src/license/THIRD-PARTY.properties +++ b/faxtomail-ui-web/src/license/THIRD-PARTY.properties @@ -5,8 +5,8 @@ # - Apache License # - Apache License 2.0 # - Apache License, version 2.0 +# - BSD 3-Clause License # - BSD License -# - BSD-style license # - CDDL # - CDDL + GPLv2 with classpath exception # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -44,7 +44,13 @@ # Please fill the missing licenses for dependencies : # # -#Mon Nov 23 16:52:08 CET 2015 +#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 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 7cb1f9c0e72cfc1ef59762613bf433ae1d067e57 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:49:43 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.23' 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 a2b4530b..8171e2f4 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.23-SNAPSHOT</version> + <version>2.4.23</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 9d77d375..969c1b03 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.23-SNAPSHOT</version> + <version>2.4.23</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 8ed194ad..21a90153 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.23-SNAPSHOT</version> + <version>2.4.23</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 15df0b13..4268125c 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.23-SNAPSHOT</version> + <version>2.4.23</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 06129a2d..6ccc48f4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.23-SNAPSHOT</version> + <version>2.4.23</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 7b39667c1ed49f71f30740f498a2d1625f66e33c Merge: 827de030 7cb1f9c0 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:30 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.23' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 19 +- .../src/license/THIRD-PARTY.properties | 8 +- .../faxtomail/services/service/EmailService.java | 2 + .../services/service/EmailServiceImpl.java | 76 +++++- .../services/service/EmailServiceTest.java | 80 ++++++- .../src/test/resources/emails/test10015-2.eml | 254 +++++++++++++++++++++ .../src/test/resources/emails/test10015.eml | 152 ++++++++++++ faxtomail-service/src/test/resources/pdf/10004.pdf | Bin 0 -> 26374 bytes faxtomail-ui-swing/pom.xml | 6 +- .../ui/swing/actions/ShowDemandeAction.java | 5 +- .../content/demande/DemandeListUIHandler.java | 13 ++ .../ui/swing/content/demande/DemandeUIHandler.java | 31 ++- .../demande/actions/ArchiveFromListAction.java | 19 +- .../demande/actions/LoadFolderEmailsAction.java | 60 ++++- .../demande/actions/SaveDemandeFromListAction.java | 79 +++++++ .../demande/takenby/actions/TakenByAction.java | 28 +-- .../content/transmit/actions/TransmitAction.java | 12 +- faxtomail-ui-web/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 10 +- .../faxtomail/web/job/MailFilterJob.java | 6 - pom.xml | 8 +- 22 files changed, 810 insertions(+), 62 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 cfed71228356ab88afdd80a1f699fccf7836beef Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:40 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 7eb7db9a..8171e2f4 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.24-SNAPSHOT</version> + <version>2.4.23</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b2ad347b..a2d505cd 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.24-SNAPSHOT</version> + <version>2.4.23</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 53b6b42f..21a90153 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.24-SNAPSHOT</version> + <version>2.4.23</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 80ef0ab5..4268125c 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.24-SNAPSHOT</version> + <version>2.4.23</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 979d38a1..6ccc48f4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.24-SNAPSHOT</version> + <version>2.4.23</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 03e2187102cf83df9a9fd45bf1046ef398bb73f9 Merge: cfed7122 7b39667c Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:42 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' faxtomail-service/pom.xml | 2 ++ faxtomail-service/src/license/THIRD-PARTY.properties | 8 +++++++- faxtomail-ui-web/src/license/THIRD-PARTY.properties | 10 ++++++++-- 3 files changed, 17 insertions(+), 3 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 3fb11db28c9fdb6cb7da92394901678b94f641a3 Author: jcouteau <couteau@codelutin.com> Date: Mon Jul 9 18:54:48 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 8171e2f4..7eb7db9a 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.23</version> + <version>2.4.24-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 969c1b03..ba383fb9 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.23</version> + <version>2.4.24-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 21a90153..53b6b42f 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.23</version> + <version>2.4.24-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 4268125c..80ef0ab5 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.23</version> + <version>2.4.24-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 6ccc48f4..979d38a1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.23</version> + <version>2.4.24-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