branch develop updated (7e778e93 -> c32ccace)
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 7e778e93 [jgitflow-maven-plugin]updating poms for 2.4.12-SNAPSHOT development new bb3b5c48 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 43791552 Fix release ... new 1ade89f6 [jgitflow-maven-plugin]updating poms for branch'release/2.4.11' with non-snapshot versions new c57e0252 [jgitflow-maven-plugin]merging 'release/2.4.11' into 'master' new c9c23807 [jgitflow-maven-plugin]merging 'master' into 'develop' new c32ccace [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 c32ccace33cbdf562f075c1ede1132d48124bcbd Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:15 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit c9c2380744cff651be7ca07fe184d77e700c7028 Merge: bb3b5c48 c57e0252 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:14 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit bb3b5c48dc71918ffa325e018d8ae3fcd0d1aee8 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:14 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit c57e0252f4e703abbbbb8675dd14065918159efe Merge: b5effd0a 1ade89f6 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.11' into 'master' commit 1ade89f6462007e4ad8ddf326c7984116df4be75 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:12:44 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.11' with non-snapshot versions commit 43791552ac7b0f7c72444a977e9d282b288e3dfe Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:12:07 2018 +0200 Fix release ... Summary of changes: pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 43791552ac7b0f7c72444a977e9d282b288e3dfe Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:12:07 2018 +0200 Fix release ... --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d4276511..966eae25 100644 --- a/pom.xml +++ b/pom.xml @@ -101,7 +101,7 @@ <nuitonConfigVersion>3.4</nuitonConfigVersion> <nuitonCsvVersion>3.0-rc-6</nuitonCsvVersion> <nuitonDecoratorVersion>3.0</nuitonDecoratorVersion> - <nuitonUtilsVersion>3.0</nuitonUtilsVersion> + <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion> <nuitonValidatorVersion>3.2</nuitonValidatorVersion> <nuitonWebVersion>1.18</nuitonWebVersion> @@ -119,11 +119,11 @@ <jqueryPluginVersion>3.7.1</jqueryPluginVersion> <bootstrapPluginVersion>2.0.0</bootstrapPluginVersion> <slf4jVersion>1.7.7</slf4jVersion> - <log4jVersion>2.11.0</log4jVersion> + <log4jVersion>2.3</log4jVersion> <postgresqlDriverVersion>9.3-1102-jdbc41</postgresqlDriverVersion> <commonsIoVersion>2.6</commonsIoVersion> - <commonsEmailVersion>1.5</commonsEmailVersion> + <commonsEmailVersion>1.3.3</commonsEmailVersion> <commonsCollections4Version>4.1</commonsCollections4Version> <commonsLang3Version>3.7</commonsLang3Version> <commonsHttpClientVersion>3.1</commonsHttpClientVersion> -- 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 1ade89f6462007e4ad8ddf326c7984116df4be75 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:12:44 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/2.4.11' 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 6027f42f..dc5a12d3 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.4.11-SNAPSHOT</version> + <version>2.4.11</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 211bec49..6eec5e51 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.4.11-SNAPSHOT</version> + <version>2.4.11</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ac46531b..f22a7afb 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.4.11-SNAPSHOT</version> + <version>2.4.11</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index e972ec98..02fcad6f 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.4.11-SNAPSHOT</version> + <version>2.4.11</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 966eae25..b31cddee 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.11-SNAPSHOT</version> + <version>2.4.11</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 c57e0252f4e703abbbbb8675dd14065918159efe Merge: b5effd0a 1ade89f6 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:13 2018 +0200 [jgitflow-maven-plugin]merging 'release/2.4.11' into 'master' faxtomail-persistence/pom.xml | 2 +- .../persistence/entities/EmailTopiaDao.java | 38 +++- faxtomail-service/pom.xml | 2 +- .../services/service/ConfigurationServiceImpl.java | 9 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/util/FaxToMailUIUtil.java | 236 ++++++++++----------- .../faxtomail/ui/swing/util/JImagePanel.java | 3 +- .../i18n/faxtomail-ui-swing_fr_FR.properties | 4 +- faxtomail-ui-web/pom.xml | 2 +- pom.xml | 16 +- 10 files changed, 172 insertions(+), 142 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 bb3b5c48dc71918ffa325e018d8ae3fcd0d1aee8 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:14 2018 +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 8f7fdabd..dc5a12d3 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.4.12-SNAPSHOT</version> + <version>2.4.11</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 61dd51fd..6eec5e51 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.4.12-SNAPSHOT</version> + <version>2.4.11</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3e2722a4..f22a7afb 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.4.12-SNAPSHOT</version> + <version>2.4.11</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index c338cd9e..02fcad6f 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.4.12-SNAPSHOT</version> + <version>2.4.11</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index e2795669..7f0938b3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.12-SNAPSHOT</version> + <version>2.4.11</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 c9c2380744cff651be7ca07fe184d77e700c7028 Merge: bb3b5c48 c57e0252 Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:14 2018 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 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 c32ccace33cbdf562f075c1ede1132d48124bcbd Author: jcouteau <couteau@codelutin.com> Date: Tue May 15 15:15:15 2018 +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 dc5a12d3..8f7fdabd 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.4.11</version> + <version>2.4.12-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 6eec5e51..61dd51fd 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.4.11</version> + <version>2.4.12-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index f22a7afb..3e2722a4 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.4.11</version> + <version>2.4.12-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 02fcad6f..c338cd9e 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.4.11</version> + <version>2.4.12-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index b31cddee..758dbb8b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>2.4.11</version> + <version>2.4.12-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