branch develop-1.1.x updated (2f89cb99 -> dce8e116)
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 2f89cb99 [jgitflow-maven-plugin]updating poms for 1.1.15-SNAPSHOT development new 05d44182 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 211e4d83 [jgitflow-maven-plugin]updating poms for branch'release/1.1.14' with non-snapshot versions new b7145876 [jgitflow-maven-plugin]merging 'release/1.1.14' into 'master-1.1.x' new 344144c1 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new dce8e116 [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 dce8e116e77ee087adbb2fccac038cc24ccf8b69 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:02 2017 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 344144c170d709981a3f2088d3fd2d841abfcc06 Merge: 05d44182 b7145876 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:02 2017 +0100 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit 05d441821a5d908ed5a2feec87a902c37c8d2f32 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:02 2017 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b71458764fc9c3c84e84319220485d182ca60a69 Merge: 807c47bc 211e4d83 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:01 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.1.14' into 'master-1.1.x' commit 211e4d837b222a8000318537a8405194368b8ff2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:41:06 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.14' 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 211e4d837b222a8000318537a8405194368b8ff2 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:41:06 2017 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.14' 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 202889e7..4882548a 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.14-SNAPSHOT</version> + <version>1.1.14</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7c76ad2d..f47388db 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.14-SNAPSHOT</version> + <version>1.1.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 9be609bd..f04bd3c5 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.14-SNAPSHOT</version> + <version>1.1.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 255c3fa6..ff5d8dde 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.14-SNAPSHOT</version> + <version>1.1.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 29db7c67..a15b0a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.14-SNAPSHOT</version> + <version>1.1.14</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 b71458764fc9c3c84e84319220485d182ca60a69 Merge: 807c47bc 211e4d83 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:01 2017 +0100 [jgitflow-maven-plugin]merging 'release/1.1.14' into 'master-1.1.x' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../services/service/EmailServiceImpl.java | 22 +++++++--------------- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 12 insertions(+), 20 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 05d441821a5d908ed5a2feec87a902c37c8d2f32 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:02 2017 +0100 [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 e6929459..4882548a 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.15-SNAPSHOT</version> + <version>1.1.14</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 17e17464..f47388db 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.15-SNAPSHOT</version> + <version>1.1.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 03441c88..f04bd3c5 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.15-SNAPSHOT</version> + <version>1.1.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 3733fa72..ff5d8dde 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.15-SNAPSHOT</version> + <version>1.1.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a204da66..a15b0a6d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.15-SNAPSHOT</version> + <version>1.1.14</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 344144c170d709981a3f2088d3fd2d841abfcc06 Merge: 05d44182 b7145876 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:02 2017 +0100 [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 dce8e116e77ee087adbb2fccac038cc24ccf8b69 Author: Maven Release <maven-release@codelutin.com> Date: Fri Dec 15 10:43:02 2017 +0100 [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 4882548a..e6929459 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.14</version> + <version>1.1.15-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f47388db..17e17464 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.14</version> + <version>1.1.15-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index f04bd3c5..03441c88 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.14</version> + <version>1.1.15-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index ff5d8dde..3733fa72 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.14</version> + <version>1.1.15-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index a15b0a6d..a204da66 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.14</version> + <version>1.1.15-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