branch develop updated (d3d380b6 -> 51925370)
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 d3d380b6 [jgitflow-maven-plugin]updating poms for 2.4.30-SNAPSHOT development new 9563c79f [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e2e94268 [jgitflow-maven-plugin]updating poms for branch'release/2.4.29' with non-snapshot versions new 006ee278 [jgitflow-maven-plugin]merging 'release/2.4.29' into 'master' new b947cfe3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 51925370 [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 51925370bcb9e15d1666d40bf3ca4972eab0a8a9 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:42 2019 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b947cfe38711faad3ad2ef6949ae802919fd76cf Merge: 9563c79f 006ee278 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:42 2019 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 9563c79f4ee2a6bcd62fe42f3f41b3f2cad1c1c5 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:41 2019 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 006ee278f6a4b5f32adc8caadbd2a42d376cdaa2 Merge: ef179cb5 e2e94268 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:40 2019 +0200 [jgitflow-maven-plugin]merging 'release/2.4.29' into 'master' commit e2e942680e6702b7d44031ee12fb5243ba9a5a9e Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:14:27 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.29' 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 e2e942680e6702b7d44031ee12fb5243ba9a5a9e Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:14:27 2019 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.29' 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 4009975e..e55188de 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.29-SNAPSHOT</version> + <version>2.4.29</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 0645e24c..9c97d395 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.29-SNAPSHOT</version> + <version>2.4.29</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 607289df..e260e181 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.29-SNAPSHOT</version> + <version>2.4.29</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 3d742147..dccf9d28 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.29-SNAPSHOT</version> + <version>2.4.29</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index fb3e1f2c..d00fd66c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.29-SNAPSHOT</version> + <version>2.4.29</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 006ee278f6a4b5f32adc8caadbd2a42d376cdaa2 Merge: ef179cb5 e2e94268 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:40 2019 +0200 [jgitflow-maven-plugin]merging 'release/2.4.29' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/FaxToMailServiceUtils.java | 15 ++--- .../services/FaxToMailServiceUtilsTest.java | 77 +++++++++++++--------- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 9 +++ faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/job/MailFilterJob.java | 11 +--- pom.xml | 2 +- 9 files changed, 68 insertions(+), 54 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 9563c79f4ee2a6bcd62fe42f3f41b3f2cad1c1c5 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:41 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 b25d64e8..e55188de 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.29</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 9a269315..9c97d395 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.29</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 2dd234f5..e260e181 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.29</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index c1ef1c75..dccf9d28 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.29</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e6bac841..d00fd66c 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.29</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 b947cfe38711faad3ad2ef6949ae802919fd76cf Merge: 9563c79f 006ee278 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:42 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 51925370bcb9e15d1666d40bf3ca4972eab0a8a9 Author: Jean Couteau <couteau@codelutin.com> Date: Tue May 21 15:17:42 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 e55188de..b25d64e8 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.29</version> + <version>2.4.30-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 9c97d395..9a269315 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.29</version> + <version>2.4.30-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e260e181..2dd234f5 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.29</version> + <version>2.4.30-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index dccf9d28..c1ef1c75 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.29</version> + <version>2.4.30-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index d00fd66c..e6bac841 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.29</version> + <version>2.4.30-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