branch develop updated (92f1437e -> 64360fdc)
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 92f1437e [jgitflow-maven-plugin]updating poms for 2.4.15-SNAPSHOT development new 5cf8d101 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new cb174d58 [jgitflow-maven-plugin]updating poms for branch'release/2.4.14' with non-snapshot versions new cbb77cef [jgitflow-maven-plugin]merging 'release/2.4.14' into 'master' new 3e88cd7f [jgitflow-maven-plugin]merging 'master' into 'develop' new 64360fdc [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 64360fdcd65f2e37c1882f8c3a39623dd386b55f Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:19 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 3e88cd7f2802f9f33ae80410126ee1217bafcf63 Merge: 5cf8d101 cbb77cef Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:19 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 5cf8d1019e7f6d0a16935c67fd746f0266da4f5e Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:19 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit cbb77cefed73731b6c742e1216b2dac84de96af5 Merge: 242721e5 cb174d58 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:18 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.14' into 'master' commit cb174d585ea5c7c621b6c3c804bd0b77092bedde Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:50:31 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit cb174d585ea5c7c621b6c3c804bd0b77092bedde Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:50:31 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.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 0ca9789a..794ba8c2 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.14-SNAPSHOT</version> + <version>2.4.14</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 5dafcfcb..b7df360b 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.14-SNAPSHOT</version> + <version>2.4.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 5f6b7832..e8fbaa7b 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.14-SNAPSHOT</version> + <version>2.4.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9cc38962..9b578b27 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.14-SNAPSHOT</version> + <version>2.4.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 03bb34a8..f8f520ab 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.14-SNAPSHOT</version> + <version>2.4.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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit cbb77cefed73731b6c742e1216b2dac84de96af5 Merge: 242721e5 cb174d58 Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:18 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.14' into 'master' faxtomail-persistence/pom.xml | 2 +- .../faxtomail/persistence/entities/EmailTopiaDao.java | 10 +++++++--- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 6 files changed, 12 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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 5cf8d1019e7f6d0a16935c67fd746f0266da4f5e Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:19 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 3685ce8c..794ba8c2 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.15-SNAPSHOT</version> + <version>2.4.14</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 1da78cb8..b7df360b 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.15-SNAPSHOT</version> + <version>2.4.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index fc39586c..e8fbaa7b 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.15-SNAPSHOT</version> + <version>2.4.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 36dd96d7..9b578b27 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.15-SNAPSHOT</version> + <version>2.4.14</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index f91e9139..f8f520ab 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.15-SNAPSHOT</version> + <version>2.4.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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 3e88cd7f2802f9f33ae80410126ee1217bafcf63 Merge: 5cf8d101 cbb77cef Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:19 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 64360fdcd65f2e37c1882f8c3a39623dd386b55f Author: jcouteau <couteau@codelutin.com> Date: Wed Jun 6 14:52:19 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 794ba8c2..3685ce8c 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.14</version> + <version>2.4.15-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b7df360b..1da78cb8 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.14</version> + <version>2.4.15-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e8fbaa7b..fc39586c 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.14</version> + <version>2.4.15-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 9b578b27..36dd96d7 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.14</version> + <version>2.4.15-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index f8f520ab..f91e9139 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.14</version> + <version>2.4.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