branch develop updated (64ee3e2e -> 0bc14725)
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 64ee3e2e [jgitflow-maven-plugin]updating poms for 2.4.22-SNAPSHOT development new da1c8155 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 4acaa418 [jgitflow-maven-plugin]updating poms for branch'release/2.4.21' with non-snapshot versions new b327202c [jgitflow-maven-plugin]merging 'release/2.4.21' into 'master' new da0f44fb [jgitflow-maven-plugin]merging 'master' into 'develop' new 0bc14725 [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 0bc14725ba2b36c3c681a7b2f8a116b15b449f54 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:07 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit da0f44fbc5baae4a7d68f11267350b2c2bdc65f5 Merge: da1c8155 b327202c Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:07 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit da1c8155e387bcbda05de5068896336eb9ebb755 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:07 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b327202c05ed98b892422d282cd3fcc4c25d3adc Merge: a0b8e451 4acaa418 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:06 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.21' into 'master' commit 4acaa4189f7cb46478ebe54fa3631aaf30cd7e62 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:34:03 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.21' 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 4acaa4189f7cb46478ebe54fa3631aaf30cd7e62 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:34:03 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.21' 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 02248500..e30174d0 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.21-SNAPSHOT</version> + <version>2.4.21</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 9485faa2..8569a7f1 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.21-SNAPSHOT</version> + <version>2.4.21</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 393d7c5b..b4489332 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.21-SNAPSHOT</version> + <version>2.4.21</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 0ffe09ed..b5b95e91 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.21-SNAPSHOT</version> + <version>2.4.21</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 2019f9a1..ad7c8403 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.21-SNAPSHOT</version> + <version>2.4.21</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 b327202c05ed98b892422d282cd3fcc4c25d3adc Merge: a0b8e451 4acaa418 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:06 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.21' into 'master' faxtomail-persistence/pom.xml | 7 +++++- .../persistence/entities/EmailTopiaDao.java | 8 +++++-- .../src/main/xmi/faxtomail.properties | 8 ++++++- faxtomail-persistence/src/main/xmi/faxtomail.zargo | Bin 36986 -> 36985 bytes faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 8 ++----- .../services/service/EmailServiceTest.java | 4 ++-- faxtomail-ui-swing/pom.xml | 2 +- .../swing/content/demande/QuantitiesByRangeUI.jaxx | 6 ++++- .../demande/QuantitiesByRangeUIHandler.java | 26 +++++++++++++++++---- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 20 +++++++--------- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 9 ++++++- 13 files changed, 69 insertions(+), 33 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 da1c8155e387bcbda05de5068896336eb9ebb755 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:07 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 b5fc7846..e30174d0 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.22-SNAPSHOT</version> + <version>2.4.21</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index d9c10747..8569a7f1 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.22-SNAPSHOT</version> + <version>2.4.21</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 4d8b254f..b4489332 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.22-SNAPSHOT</version> + <version>2.4.21</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index a75091fd..b5b95e91 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.22-SNAPSHOT</version> + <version>2.4.21</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 65723860..ad7c8403 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.22-SNAPSHOT</version> + <version>2.4.21</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 da0f44fbc5baae4a7d68f11267350b2c2bdc65f5 Merge: da1c8155 b327202c Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:07 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 0bc14725ba2b36c3c681a7b2f8a116b15b449f54 Author: jcouteau <couteau@codelutin.com> Date: Mon Jun 18 11:36:07 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 e30174d0..b5fc7846 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.21</version> + <version>2.4.22-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 8569a7f1..d9c10747 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.21</version> + <version>2.4.22-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index b4489332..4d8b254f 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.21</version> + <version>2.4.22-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index b5b95e91..a75091fd 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.21</version> + <version>2.4.22-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index ad7c8403..65723860 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.21</version> + <version>2.4.22-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