branch develop updated (02a4944 -> d46a8e0)
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 02a4944 [jgitflow-maven-plugin]updating poms for 2.1.5-SNAPSHOT development new 21677fb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new ab35d62 [jgitflow-maven-plugin]updating poms for branch'release/2.1.4' with non-snapshot versions new 67d6818 [jgitflow-maven-plugin]merging 'release/2.1.4' into 'master' new 906d4ee [jgitflow-maven-plugin]merging 'master' into 'develop' new d46a8e0 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 d46a8e0fffeea36bf0dd4552fc45c67964f49975 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:45 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 906d4eed92f74e778421ef4310c37be5dacc08f3 Merge: 21677fb 67d6818 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:44 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 21677fb70039276904c489ae8fce0f1024007159 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:44 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 67d6818f4a833b534979a50b76c961f6eaecb95c Merge: 7244743 ab35d62 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:43 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.1.4' into 'master' commit ab35d62fb075a04de005b30fa47538a8ff93954a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:30:04 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.1.4' with non-snapshot versions Summary of changes: -- 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 ab35d62fb075a04de005b30fa47538a8ff93954a Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:30:04 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.1.4' 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 6e3cc59..897d156 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.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b6fedf2..d1948b4 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.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 12982f2..fd6b5d8 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.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index a16de42..51353c5 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.1.4-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 78a8d6b..8ff87aa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1.4</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 67d6818f4a833b534979a50b76c961f6eaecb95c Merge: 7244743 ab35d62 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:43 2017 +0100 [jgitflow-maven-plugin]merging 'release/2.1.4' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 57 +++- .../faxtomail/services/service/EmailService.java | 2 + .../services/service/EmailServiceImpl.java | 340 +++++++++++++-------- .../i18n/faxtomail-service_fr_FR.properties | 1 + .../services/service/EmailServiceTest.java | 65 +--- faxtomail-ui-swing/pom.xml | 2 +- .../content/demande/DemandeListUIHandler.java | 1 - .../ui/swing/content/demande/DemandeUIHandler.java | 12 +- .../ui/swing/content/demande/DemandeUIModel.java | 14 +- .../demande/replies/DemandRepliesUIHandler.java | 24 +- .../demande/replies/actions/OpenReplyAction.java | 15 +- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/DemandDetailAction.java | 20 +- .../faxtomail/web/job/MailFilterJob.java | 69 +---- pom.xml | 4 +- 17 files changed, 313 insertions(+), 319 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 21677fb70039276904c489ae8fce0f1024007159 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:44 2017 +0100 [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 2415088..897d156 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.1.5-SNAPSHOT</version> + <version>2.1.4</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 622663b..d1948b4 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.1.5-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 456756c..fd6b5d8 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.1.5-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d1cc186..51353c5 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.1.5-SNAPSHOT</version> + <version>2.1.4</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 08579fd..8ff87aa 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.5-SNAPSHOT</version> + <version>2.1.4</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 906d4eed92f74e778421ef4310c37be5dacc08f3 Merge: 21677fb 67d6818 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:44 2017 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 d46a8e0fffeea36bf0dd4552fc45c67964f49975 Author: Maven Release <maven-release@codelutin.com> Date: Tue Jan 3 17:31:45 2017 +0100 [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 897d156..2415088 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.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index d1948b4..622663b 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.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index fd6b5d8..456756c 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.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 51353c5..d1cc186 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.1.4</version> + <version>2.1.5-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 8ff87aa..08579fd 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.4</version> + <version>2.1.5-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