branch develop-1.1.x updated (c8b67c9 -> 3214d47)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from c8b67c9 [jgitflow-maven-plugin]updating poms for 1.1.10-SNAPSHOT development new 1894941 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 756bdcb prise en compte des serveur snon graphiques (refs #7855) new 21683b6 [jgitflow-maven-plugin]updating poms for branch'release/1.1.9' with non-snapshot versions new 53d3372 Merge branch 'release/1.1.9' into master-1.1.x new d4a51eb Merge branch 'master-1.1.x' into develop-1.1.x new 3214d47 [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 3214d47e3b6e71adde8843b12237befc3fd32523 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:39 2016 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit d4a51eb86ea85fff3ca025ffd724b18aa664426e Merge: 1894941 53d3372 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:37 2016 +0100 Merge branch 'master-1.1.x' into develop-1.1.x commit 1894941747fda03739066515484d352959d23de2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:36 2016 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 53d337230fa926df71399fa5f725c1fff6eea688 Merge: d666cde 21683b6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:29 2016 +0100 Merge branch 'release/1.1.9' into master-1.1.x commit 21683b69ac043b04e3a3d9cd2333c41258ac019f Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:29:57 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.9' with non-snapshot versions commit 756bdcb81ee070d2f453a0f3d1f724cf5cc31966 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:28:02 2016 +0100 prise en compte des serveur snon graphiques (refs #7855) Summary of changes: .../com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 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 http://git.codelutin.com/faxtomail.git commit 21683b69ac043b04e3a3d9cd2333c41258ac019f Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:29:57 2016 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.9' 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 be5dd8c..6945839 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.9-SNAPSHOT</version> + <version>1.1.9</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 67b436b..ddaddee 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.9-SNAPSHOT</version> + <version>1.1.9</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ed548a1..dcc166f 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.9-SNAPSHOT</version> + <version>1.1.9</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 5b64636..412ec36 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.9-SNAPSHOT</version> + <version>1.1.9</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 7bdce93..7b96eb5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.9-SNAPSHOT</version> + <version>1.1.9</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 http://git.codelutin.com/faxtomail.git commit 53d337230fa926df71399fa5f725c1fff6eea688 Merge: d666cde 21683b6 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:29 2016 +0100 Merge branch 'release/1.1.9' into master-1.1.x faxtomail-persistence/pom.xml | 2 +- .../faxtomail/FaxToMailConfiguration.java | 4 + .../faxtomail/FaxToMailConfigurationOption.java | 7 + .../i18n/faxtomail-persistence_fr_FR.properties | 1 + faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 35 ++++- .../services/service/EmailServiceImpl.java | 3 +- .../services/service/EmailServiceTest.java | 166 +++++++++++++-------- .../src/test/resources/emails/test6863.eml | 8 + .../src/test/resources/emails/test7716.eml | 31 ++++ .../src/test/resources/emails/test7740.eml | 24 +++ .../src/test/resources/emails/test7855.eml | 24 +++ faxtomail-ui-swing/pom.xml | 2 +- .../actions/ComputeQuantitiesByRangeAction.java | 22 ++- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 17 files changed, 259 insertions(+), 78 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 http://git.codelutin.com/faxtomail.git commit 1894941747fda03739066515484d352959d23de2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:36 2016 +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 ab1aa4f..6945839 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.10-SNAPSHOT</version> + <version>1.1.9</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 0ae3c12..ddaddee 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.10-SNAPSHOT</version> + <version>1.1.9</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 9976659..dcc166f 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.10-SNAPSHOT</version> + <version>1.1.9</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 6f181b4..412ec36 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.10-SNAPSHOT</version> + <version>1.1.9</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index ad8bce3..7b96eb5 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.10-SNAPSHOT</version> + <version>1.1.9</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 http://git.codelutin.com/faxtomail.git commit d4a51eb86ea85fff3ca025ffd724b18aa664426e Merge: 1894941 53d3372 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:37 2016 +0100 Merge branch 'master-1.1.x' into develop-1.1.x .../com/franciaflex/faxtomail/services/FaxToMailServiceUtils.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 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 http://git.codelutin.com/faxtomail.git commit 3214d47e3b6e71adde8843b12237befc3fd32523 Author: Maven Release <maven-release@codelutin.com> Date: Fri Jan 22 16:37:39 2016 +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 6945839..ab1aa4f 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.9</version> + <version>1.1.10-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ddaddee..0ae3c12 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.9</version> + <version>1.1.10-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index dcc166f..9976659 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.9</version> + <version>1.1.10-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 412ec36..6f181b4 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.9</version> + <version>1.1.10-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 7b96eb5..ad8bce3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.9</version> + <version>1.1.10-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