branch develop updated (742f68a2 -> 4c7ceaa8)
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 742f68a2 [jgitflow-maven-plugin]updating poms for 2.4.25-SNAPSHOT development new d77e08d1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 3909c4e5 [jgitflow-maven-plugin]updating poms for branch'release/2.4.24' with non-snapshot versions new 45d439a2 [jgitflow-maven-plugin]merging 'release/2.4.24' into 'master' new 608b9df3 [jgitflow-maven-plugin]merging 'master' into 'develop' new 4c7ceaa8 [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 4c7ceaa8c3db3e77530ab68bb1e76db87aa6ddf4 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:46 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 608b9df33364f4be9c79462bf0a7cf982013ecae Merge: d77e08d1 45d439a2 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:45 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit d77e08d1bc12e6dba53d555fafde989d60ad7f74 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:45 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 45d439a2bf481dc75417ab5d0efd14fd252308fa Merge: 7b39667c 3909c4e5 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:44 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.24' into 'master' commit 3909c4e565123d3fed4417764c04198825ef0d8c Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:40:20 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.24' 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 3909c4e565123d3fed4417764c04198825ef0d8c Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:40:20 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.24' 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 7eb7db9a..14d9ebbf 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.24-SNAPSHOT</version> + <version>2.4.24</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ba383fb9..faa8838a 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.24-SNAPSHOT</version> + <version>2.4.24</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 53b6b42f..9920bc29 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.24-SNAPSHOT</version> + <version>2.4.24</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 80ef0ab5..63401b11 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.24-SNAPSHOT</version> + <version>2.4.24</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 979d38a1..2ab6c8a1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.24-SNAPSHOT</version> + <version>2.4.24</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 45d439a2bf481dc75417ab5d0efd14fd252308fa Merge: 7b39667c 3909c4e5 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:44 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.24' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 8 ++++++-- .../services/service/EmailServiceTest.java | 8 ++++++++ faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 22 +++++++++++++++++++--- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/web/job/MailFilterJob.java | 2 +- pom.xml | 2 +- 9 files changed, 39 insertions(+), 11 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 d77e08d1bc12e6dba53d555fafde989d60ad7f74 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:45 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 f85b5f55..14d9ebbf 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.25-SNAPSHOT</version> + <version>2.4.24</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 6de7ded1..faa8838a 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.25-SNAPSHOT</version> + <version>2.4.24</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 090f8c7b..9920bc29 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.25-SNAPSHOT</version> + <version>2.4.24</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 46369fcf..63401b11 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.25-SNAPSHOT</version> + <version>2.4.24</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 2088bb31..2ab6c8a1 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.25-SNAPSHOT</version> + <version>2.4.24</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 608b9df33364f4be9c79462bf0a7cf982013ecae Merge: d77e08d1 45d439a2 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:45 2018 +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 4c7ceaa8c3db3e77530ab68bb1e76db87aa6ddf4 Author: jcouteau <couteau@codelutin.com> Date: Fri Jul 13 17:42:46 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 14d9ebbf..f85b5f55 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.24</version> + <version>2.4.25-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index faa8838a..6de7ded1 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.24</version> + <version>2.4.25-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 9920bc29..090f8c7b 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.24</version> + <version>2.4.25-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 63401b11..46369fcf 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.24</version> + <version>2.4.25-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 2ab6c8a1..2088bb31 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.24</version> + <version>2.4.25-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