branch develop-1.1.x updated (fb5757bb -> ce2a5d7b)
This is an automated email from the git hooks/post-receive script. New change to branch develop-1.1.x in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from fb5757bb [jgitflow-maven-plugin]updating poms for 1.1.18-SNAPSHOT development new 0a0a8d43 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new 4d2250ca Fix release ... new c82ff3f1 [jgitflow-maven-plugin]updating poms for branch'release/1.1.17' with non-snapshot versions new a20321f2 [jgitflow-maven-plugin]merging 'release/1.1.17' into 'master-1.1.x' new 7749d582 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' new ce2a5d7b [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 ce2a5d7b995942305ab5238e40169683b5c8b2c5 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit 7749d582c507a93cd432209bc6738f24d8d83313 Merge: 0a0a8d43 a20321f2 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' commit 0a0a8d43a3d0f0e39deca3c31659508111ea1a45 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit a20321f2a6bb70cc89ea78560c6eb632379062be Merge: 3c50e270 c82ff3f1 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:41 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.17' into 'master-1.1.x' commit c82ff3f151925c5c7e4edb24c25a403401f00ea5 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:56:56 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.17' with non-snapshot versions commit 4d2250ca0b724a805075fddd8d471119ac6bbed2 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:56:46 2018 +0200 Fix release ... Summary of changes: .../java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 4d2250ca0b724a805075fddd8d471119ac6bbed2 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:56:46 2018 +0200 Fix release ... --- .../java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java index 2cbcf07c..ce5c72a9 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java @@ -98,7 +98,10 @@ public class JImagePanel extends JPanel { try { bufferedImage = ImageIO.read(img); - } catch (IOException | CMMException e) { + } catch (IOException e) { + log.error("error while reading image " + img.getAbsolutePath(), e); + bufferedImage = null; + } catch (CMMException e) { log.error("error while reading image " + img.getAbsolutePath(), e); bufferedImage = null; } -- 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit c82ff3f151925c5c7e4edb24c25a403401f00ea5 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:56:56 2018 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.1.17' 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 90b9956e..ed3315bf 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.17-SNAPSHOT</version> + <version>1.1.17</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index ac90e47c..e6ec024f 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.17-SNAPSHOT</version> + <version>1.1.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index ecb3dd3c..78bf15c7 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.17-SNAPSHOT</version> + <version>1.1.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index dd7590e0..4fdb2727 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.17-SNAPSHOT</version> + <version>1.1.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index b0c0dc82..65f0a7a3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.17-SNAPSHOT</version> + <version>1.1.17</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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit a20321f2a6bb70cc89ea78560c6eb632379062be Merge: 3c50e270 c82ff3f1 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:41 2018 +0200 [jgitflow-maven-plugin]merging 'release/1.1.17' into 'master-1.1.x' faxtomail-persistence/pom.xml | 2 +- faxtomail-service/pom.xml | 2 +- faxtomail-ui-swing/pom.xml | 2 +- .../faxtomail/ui/swing/util/JImagePanel.java | 4 ++++ faxtomail-ui-web/pom.xml | 21 ++++++++++++++++++++- .../faxtomail/web/job/MailFilterJob.java | 5 +++-- pom.xml | 2 +- 7 files changed, 31 insertions(+), 7 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 0a0a8d43a3d0f0e39deca3c31659508111ea1a45 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 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 a701e426..ed3315bf 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.18-SNAPSHOT</version> + <version>1.1.17</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index 8d281d57..e6ec024f 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.18-SNAPSHOT</version> + <version>1.1.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 3f536fe8..78bf15c7 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.18-SNAPSHOT</version> + <version>1.1.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index caf06437..4fdb2727 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.18-SNAPSHOT</version> + <version>1.1.17</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 8c6a202b..65f0a7a3 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.18-SNAPSHOT</version> + <version>1.1.17</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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 7749d582c507a93cd432209bc6738f24d8d83313 Merge: 0a0a8d43 a20321f2 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 2018 +0200 [jgitflow-maven-plugin]merging 'master-1.1.x' into 'develop-1.1.x' .../java/com/franciaflex/faxtomail/ui/swing/util/JImagePanel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit ce2a5d7b995942305ab5238e40169683b5c8b2c5 Author: jcouteau <couteau@codelutin.com> Date: Wed May 23 15:58:43 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 ed3315bf..a701e426 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.17</version> + <version>1.1.18-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> diff --git a/faxtomail-service/pom.xml b/faxtomail-service/pom.xml index e6ec024f..8d281d57 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.17</version> + <version>1.1.18-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-swing/pom.xml b/faxtomail-ui-swing/pom.xml index 78bf15c7..3f536fe8 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.17</version> + <version>1.1.18-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/faxtomail-ui-web/pom.xml b/faxtomail-ui-web/pom.xml index 4fdb2727..caf06437 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.17</version> + <version>1.1.18-SNAPSHOT</version> </parent> <groupId>com.franciaflex.faxtomail</groupId> diff --git a/pom.xml b/pom.xml index 65f0a7a3..8c6a202b 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ <groupId>com.franciaflex</groupId> <artifactId>faxtomail</artifactId> - <version>1.1.17</version> + <version>1.1.18-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