branch develop updated (84547cc -> 2684527)
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 84547cc [jgitflow-maven-plugin]updating poms for 2.0-SNAPSHOT development new 56facbb [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 3951b09 [jgitflow-maven-plugin]updating poms for 1.6.2 branch with snapshot versions new 607b099 [jgitflow-maven-plugin]updating poms for branch'release/1.6.2' with non-snapshot versions new d7f968d [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' new 6e95594 [jgitflow-maven-plugin]merging 'master' into 'develop' new 2684527 [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 26845277f4c354084f260bfd7f580dbeb05b7126 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:05 2015 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6e95594663a2de943c73639315c490feb7458091 Merge: 56facbb d7f968d Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:05 2015 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 56facbbaae94caef2a5478ffb3f39f735fa360bf Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:04 2015 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit d7f968db6eb4912faaae93712a396d7bff502467 Merge: 6b873cd 607b099 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:02 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' commit 607b09934e6ccf8eac326f10fd38b770330250e2 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:27:47 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6.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 607b09934e6ccf8eac326f10fd38b770330250e2 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:27:47 2015 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6.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 1e6919b..3040d2a 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.6.2-SNAPSHOT</version> + <version>1.6.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index f345467..8199693 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.6.2-SNAPSHOT</version> + <version>1.6.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index aa93ea3..a5d7d00 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.6.2-SNAPSHOT</version> + <version>1.6.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index b2b4f41..7fec3d9 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.6.2-SNAPSHOT</version> + <version>1.6.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 22c315b..08ad537 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.6.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 d7f968db6eb4912faaae93712a396d7bff502467 Merge: 6b873cd 607b099 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:02 2015 +0200 [jgitflow-maven-plugin]merging 'release/1.6.2' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 3 +++ faxtomail-ui-swing/pom.xml | 2 +- faxtomail-ui-web/pom.xml | 2 +- .../WEB-INF/content/admin/configuration-input.jsp | 13 +++++++--- .../src/main/webapp/js/configuration.js | 30 +++++++++++++++++++--- pom.xml | 2 +- 8 files changed, 43 insertions(+), 13 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 56facbbaae94caef2a5478ffb3f39f735fa360bf Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:04 2015 +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 aaa9083..3040d2a 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-SNAPSHOT</version> + <version>1.6.2</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index d8828b2..8199693 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-SNAPSHOT</version> + <version>1.6.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index a995ce8..a5d7d00 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-SNAPSHOT</version> + <version>1.6.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 0c9bb52..7fec3d9 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-SNAPSHOT</version> + <version>1.6.2</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 276ac59..08ad537 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.6.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 6e95594663a2de943c73639315c490feb7458091 Merge: 56facbb d7f968d Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:05 2015 +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 http://git.codelutin.com/faxtomail.git commit 26845277f4c354084f260bfd7f580dbeb05b7126 Author: Maven Release <maven-release@codelutin.com> Date: Thu Sep 3 15:31:05 2015 +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 3040d2a..aaa9083 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.6.2</version> + <version>2.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 8199693..d8828b2 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.6.2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index a5d7d00..a995ce8 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.6.2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 7fec3d9..0c9bb52 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.6.2</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 08ad537..276ac59 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.6.2</version> + <version>2.0-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