branch develop-1.1.x updated (9adf0df -> 2df133a)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 9adf0df [jgitflow-maven-plugin]updating poms for 1.1.6-SNAPSHOT development new e9df563 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new d65d656 [jgitflow-maven-plugin]updating poms for branch'release/1.1.5' with non-snapshot versions new 1e33e6c Merge branch 'release/1.1.5' into master-1.1.x new c6ce0aa Merge branch 'master-1.1.x' into develop-1.1.x new 2df133a [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 2df133aae3caade1c26efe8b177d3d385b2d3de0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:57 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c6ce0aa2ef00d9d49a065390223ba75cd350f0ae Merge: e9df563 1e33e6c Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:56 2015 +0100 Merge branch 'master-1.1.x' into develop-1.1.x commit e9df56396da005b7b0774814466cf2335104acdf Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:56 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 1e33e6c87ad328f524959df6d2485d1a58698d7e Merge: e76f3bc d65d656 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:55 2015 +0100 Merge branch 'release/1.1.5' into master-1.1.x commit d65d6567d7d172c55ed4370fcf3c451ab455802e Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:39:20 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.5' 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 http://git.codelutin.com/faxtomail.git commit d65d6567d7d172c55ed4370fcf3c451ab455802e Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:39:20 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.5' 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 fd7e510..efc6817 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.5-SNAPSHOT</version> + <version>1.1.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 80f92f3..7d9ad3d 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.5-SNAPSHOT</version> + <version>1.1.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 5a04cac..6c30722 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.5-SNAPSHOT</version> + <version>1.1.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index f2b630f..65dbccc 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.5-SNAPSHOT</version> + <version>1.1.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index af427bb..2d93351 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.5-SNAPSHOT</version> + <version>1.1.5</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 http://git.codelutin.com/faxtomail.git commit 1e33e6c87ad328f524959df6d2485d1a58698d7e Merge: e76f3bc d65d656 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:55 2015 +0100 Merge branch 'release/1.1.5' into master-1.1.x faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailTopiaDao.java | 1 - .../persistence/entities/MailFolderTopiaDao.java | 9 +----- faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 6 ---- .../services/service/EmailServiceImpl.java | 29 +++++++++++++++++- .../services/service/MailFolderService.java | 2 -- .../services/service/MailFolderServiceImpl.java | 12 ++------ .../services/service/InitTestDataImpl.java | 35 ++++++++-------------- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../src/main/webapp/js/configuration.js | 14 --------- pom.xml | 2 +- 13 files changed, 50 insertions(+), 68 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 http://git.codelutin.com/faxtomail.git commit e9df56396da005b7b0774814466cf2335104acdf Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:56 2015 +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 89e9afa..efc6817 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.6-SNAPSHOT</version> + <version>1.1.5</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 6efb6bf..7d9ad3d 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.6-SNAPSHOT</version> + <version>1.1.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index b28ef8c..6c30722 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.6-SNAPSHOT</version> + <version>1.1.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 34ac334..65dbccc 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.6-SNAPSHOT</version> + <version>1.1.5</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 74fe516..2d93351 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.6-SNAPSHOT</version> + <version>1.1.5</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 http://git.codelutin.com/faxtomail.git commit c6ce0aa2ef00d9d49a065390223ba75cd350f0ae Merge: e9df563 1e33e6c Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:56 2015 +0100 Merge branch '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 http://git.codelutin.com/faxtomail.git commit 2df133aae3caade1c26efe8b177d3d385b2d3de0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Nov 10 12:41:57 2015 +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 efc6817..89e9afa 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.5</version> + <version>1.1.6-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7d9ad3d..6efb6bf 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.5</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 6c30722..b28ef8c 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.5</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 65dbccc..34ac334 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.5</version> + <version>1.1.6-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 2d93351..74fe516 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.5</version> + <version>1.1.6-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