branch develop-1.1.x updated (68805a2 -> bc337b1)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 68805a2 [jgitflow-maven-plugin]updating poms for 1.1.13-SNAPSHOT development new c1bb7f2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 4573fec [jgitflow-maven-plugin]updating poms for branch'release/1.1.12' with non-snapshot versions new faebb03 [jgitflow-maven-plugin]merging 'release/1.1.12' into 'master-1.1.x' new af0c636 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new bc337b1 [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 bc337b141f61e0ce96cd72264234df63777fb832 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:53 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit af0c63688528477d2287408c579f2d17814b8af1 Merge: c1bb7f2 faebb03 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:53 2016 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit c1bb7f2b93057a37b47673297b4cdba44c169ea0 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:52 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit faebb037a5b8917654cb068fdf5392b46a7ab630 Merge: 1e7e0d0 4573fec Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.1.12' into 'master-1.1.x' commit 4573fec1d0f2f694181a5b4059df9f4a93b45c02 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:35:33 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.12' 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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit faebb037a5b8917654cb068fdf5392b46a7ab630 Merge: 1e7e0d0 4573fec Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:51 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.1.12' into 'master-1.1.x' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 32 ++ .../faxtomail/services/service/EmailService.java | 2 + .../services/service/EmailServiceImpl.java | 384 ++++++++++++++------- .../i18n/faxtomail-service_fr_FR.properties | 1 + .../services/service/EmailServiceTest.java | 62 +--- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/actions/OpenReplyAction.java | 15 +- .../ui/swing/content/demande/DemandeUIModel.java | 14 +- .../demande/replies/DemandRepliesUIHandler.java | 31 +- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/action/DemandDetailAction.java | 20 +- .../faxtomail/web/job/MailFilterJob.java | 80 +---- pom.xml | 2 +- 15 files changed, 350 insertions(+), 301 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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit c1bb7f2b93057a37b47673297b4cdba44c169ea0 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:52 2016 +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 06afa76..10ba0a5 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.13-SNAPSHOT</version> + <version>1.1.12</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b820bee..ced96a6 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.13-SNAPSHOT</version> + <version>1.1.12</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 04039de..f0c2878 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>1.1.13-SNAPSHOT</version> + <version>1.1.12</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 45b3003..d44c6e6 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>1.1.13-SNAPSHOT</version> + <version>1.1.12</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 84e4f8a..f3c476a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.13-SNAPSHOT</version> + <version>1.1.12</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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit af0c63688528477d2287408c579f2d17814b8af1 Merge: c1bb7f2 faebb03 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:53 2016 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' -- 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-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit bc337b141f61e0ce96cd72264234df63777fb832 Author: Maven Release <maven-release@codelutin.com> Date: Wed May 25 18:37:53 2016 +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 10ba0a5..06afa76 100644 --- a/faxtomail-persistence/pom.xml +++ b/faxtomail-persistence/pom.xml @@ -25,7 +25,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ced96a6..b820bee 100644 --- a/faxtomail-service/pom.xml +++ b/faxtomail-service/pom.xml @@ -27,7 +27,7 @@ <parent> <artifactId>faxtomail</artifactId> <groupId>com.franciaflex</groupId> - <version>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index f0c2878..04039de 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>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d44c6e6..45b3003 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>1.1.12</version> + <version>1.1.13-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index f3c476a..84e4f8a 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.12</version> + <version>1.1.13-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