branch develop updated (3eec092 -> 25a2cc7)
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 3eec092 [jgitflow-maven-plugin]updating poms for 2.1.4-SNAPSHOT development new 6452ea2 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 1b4c8ff [jgitflow-maven-plugin]updating poms for branch'release/2.1.3' with non-snapshot versions new 31ae081 [jgitflow-maven-plugin]merging 'release/2.1.3' into 'master' new eed5d32 [jgitflow-maven-plugin]merging 'master' into 'develop' new 25a2cc7 [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 25a2cc7bc9d9992d5e94c28e365fe4d4f8330c01 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:18 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit eed5d323cff826dc03ec49c6df5bdc28422dda65 Merge: 6452ea2 31ae081 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:17 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 6452ea2a6ed17877728abd7a68bc489ee996dcb0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:17 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit 31ae08192b0f9f8ae4e8d7bfa653cae2eca1fdda Merge: 7cc8a67 1b4c8ff Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:16 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.1.3' into 'master' commit 1b4c8ff2e032c52340842a92365360a774ea1942 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 14:59:25 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.1.3' 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 1b4c8ff2e032c52340842a92365360a774ea1942 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 14:59:25 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.1.3' 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 be13f19..e99133c 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.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index c11bbcd..87ba508 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.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index e36ff35..7f25797 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.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 62849bc..1619921 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.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index b38eee6..1ce442f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.3</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 31ae08192b0f9f8ae4e8d7bfa653cae2eca1fdda Merge: 7cc8a67 1b4c8ff Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:16 2016 +0200 [jgitflow-maven-plugin]merging 'release/2.1.3' into 'master' faxtomail-persistence/pom.xml | 6 +-- .../faxtomail/FaxToMailConfiguration.java | 2 +- .../faxtomail/persistence/ProgressionModel.java | 48 ---------------------- faxtomail-service/pom.xml | 2 +- .../V2_1_3_160425__add_index_on_company_name.sql | 1 + .../V2_1_3_160425__add_index_on_company_name.sql | 3 ++ faxtomail-ui-swing/pom.xml | 2 +- .../ui/swing/actions/AbstractFaxToMailAction.java | 22 +++++++--- .../attachment/actions/EditAttachmentAction.java | 2 +- .../OpenMailFolderChooserFromListAction.java | 2 +- .../demande/actions/OpenReplyFormAction.java | 2 +- .../actions/SaveAndOpenModalFrameAction.java | 2 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 21 +++++----- 14 files changed, 42 insertions(+), 75 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 6452ea2a6ed17877728abd7a68bc489ee996dcb0 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:17 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 6e3cc59..e99133c 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.4-SNAPSHOT</version> + <version>2.1.3</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index b6fedf2..87ba508 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.4-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 12982f2..7f25797 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.4-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index a16de42..1619921 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.4-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1c5ad2e..1ce442f 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.4-SNAPSHOT</version> + <version>2.1.3</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 eed5d323cff826dc03ec49c6df5bdc28422dda65 Merge: 6452ea2 31ae081 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:17 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 25a2cc7bc9d9992d5e94c28e365fe4d4f8330c01 Author: Maven Release <maven-release@codelutin.com> Date: Tue Apr 26 15:01:18 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 e99133c..6e3cc59 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.3</version> + <version>2.1.4-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 87ba508..b6fedf2 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.3</version> + <version>2.1.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 7f25797..12982f2 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.3</version> + <version>2.1.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 1619921..a16de42 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.3</version> + <version>2.1.4-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 1ce442f..1c5ad2e 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.1.3</version> + <version>2.1.4-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