branch develop-1.1.x updated (d137253 -> e7ac102)
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 d137253 [jgitflow-maven-plugin]updating poms for 1.1.8-SNAPSHOT development new b09a9f1 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new f2bc2c4 [jgitflow-maven-plugin]updating poms for branch'release/1.1.7' with non-snapshot versions new 730e308 Merge branch 'release/1.1.7' into master-1.1.x new 53b7db2 Merge branch 'master-1.1.x' into develop-1.1.x new e7ac102 [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 e7ac102581dec25e9d978e97ea5e5f23745f123b Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:51 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 53b7db2296e9843e590a1276fa8750db9b2444f8 Merge: b09a9f1 730e308 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:50 2015 +0100 Merge branch 'master-1.1.x' into develop-1.1.x commit b09a9f17005460672e4d66208978f1a09b65d599 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:50 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 730e308a8a9c09a4361b3f365c9befa5a527151b Merge: 57900d7 f2bc2c4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:49 2015 +0100 Merge branch 'release/1.1.7' into master-1.1.x commit f2bc2c432e1d315c2dfe188f1ac30d473955c79c Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:20:29 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.7' 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 f2bc2c432e1d315c2dfe188f1ac30d473955c79c Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:20:29 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.7' 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 af439e6..61cf54f 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.7-SNAPSHOT</version> + <version>1.1.7</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 221376c..dd02dba 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.7-SNAPSHOT</version> + <version>1.1.7</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ccb41e1..ff2e492 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.7-SNAPSHOT</version> + <version>1.1.7</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index ae27a3b..1391e42 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.7-SNAPSHOT</version> + <version>1.1.7</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1ae0401..eda48c0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.7-SNAPSHOT</version> + <version>1.1.7</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 730e308a8a9c09a4361b3f365c9befa5a527151b Merge: 57900d7 f2bc2c4 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:49 2015 +0100 Merge branch 'release/1.1.7' into master-1.1.x faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../services/service/InitFaxToMailServiceImpl.java | 48 +++++++--------------- faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 43 ++++++++++++++----- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 8 files changed, 53 insertions(+), 50 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 b09a9f17005460672e4d66208978f1a09b65d599 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:50 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 3a0191b..61cf54f 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.8-SNAPSHOT</version> + <version>1.1.7</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 7c069cb..dd02dba 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.8-SNAPSHOT</version> + <version>1.1.7</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index cac1981..ff2e492 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.8-SNAPSHOT</version> + <version>1.1.7</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 0b29feb..1391e42 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.8-SNAPSHOT</version> + <version>1.1.7</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 7b9216b..eda48c0 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.8-SNAPSHOT</version> + <version>1.1.7</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 53b7db2296e9843e590a1276fa8750db9b2444f8 Merge: b09a9f1 730e308 Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:50 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 e7ac102581dec25e9d978e97ea5e5f23745f123b Author: Maven Release <maven-release@codelutin.com> Date: Mon Nov 16 15:22:51 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 61cf54f..3a0191b 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.7</version> + <version>1.1.8-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index dd02dba..7c069cb 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.7</version> + <version>1.1.8-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ff2e492..cac1981 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.7</version> + <version>1.1.8-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 1391e42..0b29feb 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.7</version> + <version>1.1.8-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index eda48c0..7b9216b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.7</version> + <version>1.1.8-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