branch develop-1.1.x updated (e79b6bd0 -> 1e0127ff)
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 e79b6bd0 [jgitflow-maven-plugin]updating poms for 1.1.20-SNAPSHOT development new f57f9a40 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 83ec3927 [jgitflow-maven-plugin]updating poms for branch'release/1.1.19' with non-snapshot versions new ac3fdefc [jgitflow-maven-plugin]merging 'release/1.1.19' into 'master-1.1.x' new 71614000 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new 1e0127ff [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 1e0127ffddaf2e82cb7e9702609951b3839972bb Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:38 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 716140004e01b0eb9b5a7851d6bbaed46e9c9514 Merge: f57f9a40 ac3fdefc Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:38 2018 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit f57f9a407d07d58fcc3d46e3f26535e181fd3b22 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:37 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit ac3fdefcfc1fb8b6d69777e409010b73e10bfd93 Merge: 4d785a42 83ec3927 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:36 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.19' into 'master-1.1.x' commit 83ec392717269651377a3eaed5de0deb2a85e606 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:56:31 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.19' 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 83ec392717269651377a3eaed5de0deb2a85e606 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:56:31 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.19' 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 06ef419c..ac120e00 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.19</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 588d8768..b5e4b349 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.19</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index d9300d27..d8cce08c 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.19</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 160d35fc..5b79922a 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.19</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 4ceccf42..fa0b737b 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.19</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 ac3fdefcfc1fb8b6d69777e409010b73e10bfd93 Merge: 4d785a42 83ec3927 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:36 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.19' into 'master-1.1.x' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../faxtomail/services/service/EmailServiceImpl.java | 17 ++++++++++++++--- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../faxtomail/FaxToMailApplicationContext.java | 1 + pom.xml | 2 +- 7 files changed, 20 insertions(+), 8 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 f57f9a407d07d58fcc3d46e3f26535e181fd3b22 Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:37 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 38ca9689..ac120e00 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.20-SNAPSHOT</version> + <version>1.1.19</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1d76f569..b5e4b349 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.20-SNAPSHOT</version> + <version>1.1.19</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index dfcff335..d8cce08c 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.20-SNAPSHOT</version> + <version>1.1.19</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 3882ff4d..5b79922a 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.20-SNAPSHOT</version> + <version>1.1.19</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index b4bbcdf9..fa0b737b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.20-SNAPSHOT</version> + <version>1.1.19</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 716140004e01b0eb9b5a7851d6bbaed46e9c9514 Merge: f57f9a40 ac3fdefc Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:38 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 1e0127ffddaf2e82cb7e9702609951b3839972bb Author: jcouteau <couteau@codelutin.com> Date: Tue Aug 28 10:58:38 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 ac120e00..38ca9689 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</version> + <version>1.1.20-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b5e4b349..1d76f569 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</version> + <version>1.1.20-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index d8cce08c..dfcff335 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</version> + <version>1.1.20-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 5b79922a..3882ff4d 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</version> + <version>1.1.20-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index fa0b737b..b4bbcdf9 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.19</version> + <version>1.1.20-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