branch develop updated (e1bede0 -> b82b2c1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from e1bede0 [jgitflow-maven-plugin]updating poms for 2.1.2-SNAPSHOT development new 149672d [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 1cacc61 [jgitflow-maven-plugin]updating poms for 2.1.1 branch with snapshot versions new 79d1ec3 [jgitflow-maven-plugin]updating poms for branch'release/2.1.1' with non-snapshot versions new 9267ba9 [jgitflow-maven-plugin]merging 'release/2.1.1' into 'master' new 6f468b6 [jgitflow-maven-plugin]merging 'master' into 'develop' new b82b2c1 [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 b82b2c137c49c06edd61de67452cbc8978a2a7ea Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:55 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 6f468b68c141dda6bdb4d263815606cb6ed7e4f0 Merge: 149672d 9267ba9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:55 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 149672d47f7b4050f7e7601238a41293193c8189 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:55 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 9267ba9eb8c3b7c724c054c079f3058b3c5b063e Merge: 86bf18c 79d1ec3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:53 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.1.1' into 'master' commit 79d1ec3387d6873e1cae19f1945f2fc044f87da3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:16:51 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.1.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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 79d1ec3387d6873e1cae19f1945f2fc044f87da3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:16:51 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.1.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 cb7e5ba..cc6bec5 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.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 41a769a..c4116b8 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.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index d152b1a..8eabd9e 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.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index e8650ec..fd14149 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.1.1-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index fe558c8..fc75057 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.1-SNAPSHOT</version> + <version>2.1.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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 9267ba9eb8c3b7c724c054c079f3058b3c5b063e Merge: 86bf18c 79d1ec3 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:53 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.1.1' into 'master' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../demande/replies/DemandRepliesUIHandler.java | 24 ++++++++----- .../ui/swing/content/reply/ReplyFormUIHandler.java | 40 +++++++++++++--------- .../content/reply/actions/SenderChangedAction.java | 7 ++-- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 9 +++++ .../i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 2 +- 10 files changed, 58 insertions(+), 34 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 149672d47f7b4050f7e7601238a41293193c8189 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:55 2016 +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 4998eb0..cc6bec5 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.1.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 064dc56..c4116b8 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.1.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e372eb7..8eabd9e 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.1.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index edd5c2e..fd14149 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.1.2-SNAPSHOT</version> + <version>2.1.1</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 9bb124d..fc75057 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.2-SNAPSHOT</version> + <version>2.1.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 in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 6f468b68c141dda6bdb4d263815606cb6ed7e4f0 Merge: 149672d 9267ba9 Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:55 2016 +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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit b82b2c137c49c06edd61de67452cbc8978a2a7ea Author: Maven Release <maven-release@codelutin.com> Date: Mon Apr 18 17:19:55 2016 +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 cc6bec5..4998eb0 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.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index c4116b8..064dc56 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.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 8eabd9e..e372eb7 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.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index fd14149..edd5c2e 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.1.1</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index fc75057..9bb124d 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.1</version> + <version>2.1.2-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