branch develop updated (70011fd3 -> c52a10e3)
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 70011fd3 [jgitflow-maven-plugin]updating poms for 2.4.31-SNAPSHOT development new dd802a78 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 24c8f07b [jgitflow-maven-plugin]updating poms for branch'release/2.4.30' with non-snapshot versions new 361a82c1 [jgitflow-maven-plugin]merging 'release/2.4.30' into 'master' new c908d82e [jgitflow-maven-plugin]merging 'master' into 'develop' new c52a10e3 [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 c52a10e3aa8f6a64ad5a6c0c56e6e5e5f8d15b17 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:25 2019 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c908d82e7e1a4142290246789a731e53e04b34e9 Merge: dd802a78 361a82c1 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:24 2019 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit dd802a785998d10b7f032da84222f62c27e3173a Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:24 2019 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 361a82c160747ce6b7fa00759324810e5c596ca7 Merge: 006ee278 24c8f07b Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:22 2019 +0200 [jgitflow-maven-plugin]merging 'release/2.4.30' into 'master' commit 24c8f07b4f44552196eb3a793fd7199369778ac1 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:18:56 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.30' 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 24c8f07b4f44552196eb3a793fd7199369778ac1 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:18:56 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.30' 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 b25d64e8..978c2fa2 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.30-SNAPSHOT</version> + <version>2.4.30</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 9a269315..c603b48e 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.30-SNAPSHOT</version> + <version>2.4.30</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 2dd234f5..2319a4a2 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.30-SNAPSHOT</version> + <version>2.4.30</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index c1ef1c75..13dd7b22 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.30-SNAPSHOT</version> + <version>2.4.30</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e6bac841..e1a902b2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.30-SNAPSHOT</version> + <version>2.4.30</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 361a82c160747ce6b7fa00759324810e5c596ca7 Merge: 006ee278 24c8f07b Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:22 2019 +0200 [jgitflow-maven-plugin]merging 'release/2.4.30' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 24 ++++++++++++++--- .../faxtomail/services/service/EmailService.java | 2 +- .../services/service/EmailServiceImpl.java | 30 +++++++++++++++++++--- .../services/FaxToMailServiceUtilsTest.java | 3 +++ .../services/service/EmailServiceTest.java | 9 +++---- faxtomail-ui-swing/pom.xml | 2 +- .../attachment/AttachmentEditorUIHandler.java | 8 ++++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 25 +++++++++++++----- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 12 files changed, 85 insertions(+), 26 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 dd802a785998d10b7f032da84222f62c27e3173a Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:24 2019 +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 d8a526e3..978c2fa2 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.31-SNAPSHOT</version> + <version>2.4.30</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 753c68d4..c603b48e 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.31-SNAPSHOT</version> + <version>2.4.30</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index c0f88925..2319a4a2 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.31-SNAPSHOT</version> + <version>2.4.30</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d09ea9c0..13dd7b22 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.31-SNAPSHOT</version> + <version>2.4.30</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 39ef53b7..e1a902b2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.31-SNAPSHOT</version> + <version>2.4.30</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 c908d82e7e1a4142290246789a731e53e04b34e9 Merge: dd802a78 361a82c1 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:24 2019 +0200 [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 c52a10e3aa8f6a64ad5a6c0c56e6e5e5f8d15b17 Author: Jean Couteau <couteau@codelutin.com> Date: Thu Sep 5 15:22:25 2019 +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 978c2fa2..d8a526e3 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.30</version> + <version>2.4.31-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index c603b48e..753c68d4 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.30</version> + <version>2.4.31-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 2319a4a2..c0f88925 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.30</version> + <version>2.4.31-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 13dd7b22..d09ea9c0 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.30</version> + <version>2.4.31-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e1a902b2..39ef53b7 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.30</version> + <version>2.4.31-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