branch develop-1.1.x updated (ad3dc011 -> 9d7168d8)
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 ad3dc011 [jgitflow-maven-plugin]updating poms for 1.1.19-SNAPSHOT development new 331db98b [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 5d4f595c [jgitflow-maven-plugin]updating poms for branch'release/1.1.18' with non-snapshot versions new 4d785a42 [jgitflow-maven-plugin]merging 'release/1.1.18' into 'master-1.1.x' new f54350c2 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new 9d7168d8 [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 9d7168d89c90caab01392b14f0b88940410f735e Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:54 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f54350c2e27c3dbbdea87dd1ddcd798b2535d290 Merge: 331db98b 4d785a42 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:50 2018 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit 331db98bfad8317690c6944e386c556dd42b6de7 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:50 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 4d785a42b948282c2880111b7625def1a68dae8a Merge: a20321f2 5d4f595c Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:48 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.18' into 'master-1.1.x' commit 5d4f595c0c50d187da41ef55f80731d7d04d3682 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:42:15 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.18' 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 5d4f595c0c50d187da41ef55f80731d7d04d3682 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:42:15 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.18' 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 a701e426..1eb7a049 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.18-SNAPSHOT</version> + <version>1.1.18</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 8d281d57..49089418 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.18-SNAPSHOT</version> + <version>1.1.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3f536fe8..de516df2 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.18-SNAPSHOT</version> + <version>1.1.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index caf06437..d9075731 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.18-SNAPSHOT</version> + <version>1.1.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 8c6a202b..1eec53eb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.18-SNAPSHOT</version> + <version>1.1.18</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 4d785a42b948282c2880111b7625def1a68dae8a Merge: a20321f2 5d4f595c Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:48 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.18' into 'master-1.1.x' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 2 +- .../services/service/EmailServiceTest.java | 9 + .../src/test/resources/emails/test10029.eml | 644 +++++++++++++++++++++ faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/job/MailFilterJob.java | 6 +- pom.xml | 2 +- 9 files changed, 662 insertions(+), 9 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 331db98bfad8317690c6944e386c556dd42b6de7 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:50 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 06ef419c..1eb7a049 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.19-SNAPSHOT</version> + <version>1.1.18</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 588d8768..49089418 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.19-SNAPSHOT</version> + <version>1.1.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index d9300d27..de516df2 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.19-SNAPSHOT</version> + <version>1.1.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 160d35fc..d9075731 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.19-SNAPSHOT</version> + <version>1.1.18</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 4ceccf42..1eec53eb 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.19-SNAPSHOT</version> + <version>1.1.18</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 f54350c2e27c3dbbdea87dd1ddcd798b2535d290 Merge: 331db98b 4d785a42 Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:50 2018 +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 9d7168d89c90caab01392b14f0b88940410f735e Author: jcouteau <couteau@codelutin.com> Date: Thu Jul 12 16:44:54 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 1eb7a049..06ef419c 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.18</version> + <version>1.1.19-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 49089418..588d8768 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.18</version> + <version>1.1.19-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index de516df2..d9300d27 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.18</version> + <version>1.1.19-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d9075731..160d35fc 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.18</version> + <version>1.1.19-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1eec53eb..4ceccf42 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.18</version> + <version>1.1.19-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