branch develop-1.1.x updated (f19118a -> 6cdc310)
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 f19118a reset new version new 69d6243 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds bccfd8c [jgitflow-maven-plugin]updating poms for branch '1.1.6.1' with snapshot versions new 9e0c308 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6.1' with non-snapshot versions new 57900d7 Merge branch 'release/1.1.6.1' into master-1.1.x new f411083 Merge branch 'master-1.1.x' into develop-1.1.x new 6cdc310 [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 6cdc310953842bdf5d5a09e461a021e8ac146102 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:21 2015 +0100 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f4110839024b32179d4f9b706a1a56f567458367 Merge: 69d6243 57900d7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:21 2015 +0100 Merge branch 'master-1.1.x' into develop-1.1.x commit 69d624386bc47cc28fae89550a5c945ebe2684a3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:21 2015 +0100 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 57900d784fe604fb59093b36af418cfee2865be3 Merge: e1adac4 9e0c308 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:19 2015 +0100 Merge branch 'release/1.1.6.1' into master-1.1.x commit 9e0c30853a461e707ccb2260e18dcbb6ba08cc8a Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:24:23 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6.1' 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 9e0c30853a461e707ccb2260e18dcbb6ba08cc8a Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:24:23 2015 +0100 [jgitflow-maven-plugin]updating poms for branch'release/1.1.6.1' 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 dd2950b..a802eb0 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.1-SNAPSHOT</version> + <version>1.1.6.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 58406c4..14810c1 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.1-SNAPSHOT</version> + <version>1.1.6.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 00c07af..e978875 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.1-SNAPSHOT</version> + <version>1.1.6.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index f8dae67..e9a900e 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.1-SNAPSHOT</version> + <version>1.1.6.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index d809d75..5ee1e48 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.6.1-SNAPSHOT</version> + <version>1.1.6.1</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 57900d784fe604fb59093b36af418cfee2865be3 Merge: e1adac4 9e0c308 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:19 2015 +0100 Merge branch 'release/1.1.6.1' into master-1.1.x faxtomail-persistence/pom.xml | 2 +- faxtomail-persistence/src/main/resources/faxToMail.properties | 6 ++---- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/content/demande/DemandeUIModel.java | 2 ++ faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 7 files changed, 9 insertions(+), 9 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 69d624386bc47cc28fae89550a5c945ebe2684a3 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:21 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 af439e6..a802eb0 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.6.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 221376c..14810c1 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.6.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ccb41e1..e978875 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.6.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index ae27a3b..e9a900e 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.6.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1ae0401..5ee1e48 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.6.1</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 f4110839024b32179d4f9b706a1a56f567458367 Merge: 69d6243 57900d7 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:21 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 6cdc310953842bdf5d5a09e461a021e8ac146102 Author: Maven Release <maven-release@codelutin.com> Date: Thu Nov 12 18:26:21 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 a802eb0..af439e6 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.1</version> + <version>1.1.7-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 14810c1..221376c 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.1</version> + <version>1.1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e978875..ccb41e1 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.1</version> + <version>1.1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index e9a900e..ae27a3b 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.1</version> + <version>1.1.7-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 5ee1e48..1ae0401 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.6.1</version> + <version>1.1.7-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