branch develop updated (e760992 -> 1faf774)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from e760992 [jgitflow-maven-plugin]updating poms for 2.0.3-SNAPSHOT development new cde27db [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 0865995 [jgitflow-maven-plugin]updating poms for branch'release/2.0.2' with non-snapshot versions new b9703f2 [jgitflow-maven-plugin]merging 'release/2.0.2' into 'master' new e4358e7 [jgitflow-maven-plugin]merging 'master' into 'develop' new 1faf774 [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 1faf774c880c8dcc12c9286fb9cd231017b3d10b Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:18 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit e4358e70a11fe74f884cb39ff2bf1e3252c59ef4 Merge: cde27db b9703f2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:17 2015 +0100 [jgitflow-maven-plugin]merging 'master' into 'develop' commit cde27dbff0f6d749a0b368830b2ed519ec5fc0fa Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:17 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit b9703f275e0cc740abdaf2c8a5141df7c76b9ac1 Merge: 3355de3 0865995 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:14 2015 +0100 [jgitflow-maven-plugin]merging 'release/2.0.2' into 'master' commit 086599567435524e99d09f337472f081aee573ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:26:55 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0.2' 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 http://git.codelutin.com/faxtomail.git commit 086599567435524e99d09f337472f081aee573ed Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:26:55 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/2.0.2' 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 92c6973..fb82e99 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.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index fc258c6..e045f4b 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.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index c822751..c64e8a2 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.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 4f7078d..d5c5b06 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.0.2-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e9c387f..5039c3c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0.2-SNAPSHOT</version> + <version>2.0.2</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 http://git.codelutin.com/faxtomail.git commit b9703f275e0cc740abdaf2c8a5141df7c76b9ac1 Merge: 3355de3 0865995 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:14 2015 +0100 [jgitflow-maven-plugin]merging 'release/2.0.2' into 'master' .gitignore | 2 + faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/pom.xml.orig | 169 ---- faxtomail-service/pom.xml | 2 +- faxtomail-service/pom.xml.orig | 259 ------ .../services/service/ClientServiceImpl.java | 12 + .../services/service/EmailServiceTest.java | 50 +- .../services/service/InitTestDataImpl.java | 19 +- faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-swing/pom.xml.orig | 792 ---------------- .../ui/swing/content/search/SearchUIHandler.java | 1 - .../util/AbstractFaxToMailDemandListHandler.java | 9 +- .../ui/swing/util/AbstractFaxToMailUIHandler.java | 7 + faxtomail-ui-web/pom.xml | 2 +- faxtomail-ui-web/pom.xml.orig | 398 -------- pom.xml | 4 +- pom.xml.orig | 999 --------------------- 17 files changed, 76 insertions(+), 2653 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 http://git.codelutin.com/faxtomail.git commit cde27dbff0f6d749a0b368830b2ed519ec5fc0fa Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:17 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 570076a..fb82e99 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.0.3-SNAPSHOT</version> + <version>2.0.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 3d21749..e045f4b 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.0.3-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 030e0b5..c64e8a2 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.0.3-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index b88897a..d5c5b06 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.0.3-SNAPSHOT</version> + <version>2.0.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 27ef9cc..5039c3c 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0.3-SNAPSHOT</version> + <version>2.0.2</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 http://git.codelutin.com/faxtomail.git commit e4358e70a11fe74f884cb39ff2bf1e3252c59ef4 Merge: cde27db b9703f2 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:17 2015 +0100 [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 http://git.codelutin.com/faxtomail.git commit 1faf774c880c8dcc12c9286fb9cd231017b3d10b Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 2 15:29:18 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 fb82e99..570076a 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.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e045f4b..3d21749 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.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index c64e8a2..030e0b5 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.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index d5c5b06..b88897a 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.0.2</version> + <version>2.0.3-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 5039c3c..27ef9cc 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0.2</version> + <version>2.0.3-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