Fix IMAP connector when using IMAPS protocol

2020-02-03T15:02:12,013 ERROR [Quartz_Worker-1] [org.nuxeo.ecm.core.event.impl.EventServiceImpl] Exception during mailReceivedListener sync listener execution, continuing to run other listeners
org.nuxeo.ecm.core.api.NuxeoException: Unable to build/connect javax.mail.Store
	at org.nuxeo.mail.MailSessionBuilder$AbstractFrom.buildAndConnect(MailSessionBuilder.java:214) ~[nuxeo-mail-10.10-HF20.jar:?]
	at org.nuxeo.mail.MailSessionBuilder$FromProperties.buildAndConnect(MailSessionBuilder.java:134) ~[nuxeo-mail-10.10-HF20.jar:?]
	at org.nuxeo.ecm.platform.mail.utils.MailCoreHelper.doCheckMail(MailCoreHelper.java:212) ~[nuxeo-platform-mail-core-10.10-HF20.jar:?]
	at org.nuxeo.ecm.platform.mail.utils.MailCoreHelper.checkMail(MailCoreHelper.java:125) ~[nuxeo-platform-mail-core-10.10-HF20.jar:?]
	at org.nuxeo.ecm.platform.mail.listener.MailEventListener.doHandleEvent(MailEventListener.java:91) ~[nuxeo-platform-mail-core-10.10-HF20.jar:?]
	at org.nuxeo.ecm.platform.mail.listener.MailEventListener.handleEvent(MailEventListener.java:70) ~[nuxeo-platform-mail-core-10.10-HF20.jar:?]
	at org.nuxeo.ecm.core.event.impl.EventServiceImpl.fireEvent(EventServiceImpl.java:242) [nuxeo-core-event-10.10-HF18.jar:?]
	at org.nuxeo.ecm.core.scheduler.EventJob.execute(EventJob.java:119) [nuxeo-core-event-10.10-HF18.jar:?]
	at org.nuxeo.ecm.core.scheduler.EventJob.execute(EventJob.java:65) [nuxeo-core-event-10.10-HF18.jar:?]
	at org.quartz.core.JobRunShell.run(JobRunShell.java:202) [quartz-2.3.0.jar:?]
	at org.quartz.simpl.SimpleThreadPool$WorkerThread.run(SimpleThreadPool.java:573) [quartz-2.3.0.jar:?]
Caused by: javax.mail.MessagingException: Connection timed out (Connection timed out)
	at com.sun.mail.imap.IMAPStore.protocolConnect(IMAPStore.java:670) ~[mail-1.4.5.jar:1.4.5]
	at javax.mail.Service.connect(Service.java:295) ~[mail-1.4.5.jar:1.4.5]
	at javax.mail.Service.connect(Service.java:176) ~[mail-1.4.5.jar:1.4.5]
	at javax.mail.Service.connect(Service.java:196) ~[mail-1.4.5.jar:1.4.5]
	at org.nuxeo.mail.MailSessionBuilder$AbstractFrom.buildAndConnect(MailSessionBuilder.java:211) ~[nuxeo-mail-10.10-HF20.jar:?]
	... 10 more
Caused by: java.net.ConnectException: Connection timed out (Connection timed out)
	at java.net.PlainSocketImpl.socketConnect(Native Method) ~[?:1.8.0_181]
	at java.net.AbstractPlainSocketImpl.doConnect(AbstractPlainSocketImpl.java:350) ~[?:1.8.0_181]
	at java.net.AbstractPlainSocketImpl.connectToAddress(AbstractPlainSocketImpl.java:206) ~[?:1.8.0_181]
	at java.net.AbstractPlainSocketImpl.connect(AbstractPlainSocketImpl.java:188) ~[?:1.8.0_181]
	at java.net.SocksSocketImpl.connect(SocksSocketImpl.java:392) ~[?:1.8.0_181]
	at java.net.Socket.connect(Socket.java:589) ~[?:1.8.0_181]
	at sun.security.ssl.SSLSocketImpl.connect(SSLSocketImpl.java:673) ~[?:1.8.0_181]
	at sun.security.ssl.BaseSSLSocketImpl.connect(BaseSSLSocketImpl.java:173) ~[?:1.8.0_181]
	at com.sun.mail.util.SocketFetcher.createSocket(SocketFetcher.java:319) ~[mail-1.4.5.jar:1.4.5]
	at com.sun.mail.util.SocketFetcher.getSocket(SocketFetcher.java:207) ~[mail-1.4.5.jar:1.4.5]
	at com.sun.mail.iap.Protocol.<init>(Protocol.java:113) ~[mail-1.4.5.jar:1.4.5]
	at com.sun.mail.imap.protocol.IMAPProtocol.<init>(IMAPProtocol.java:111) ~[mail-1.4.5.jar:1.4.5]
	at com.sun.mail.imap.IMAPStore.protocolConnect(IMAPStore.java:637) ~[mail-1.4.5.jar:1.4.5]
	at javax.mail.Service.connect(Service.java:295) ~[mail-1.4.5.jar:1.4.5]
	at javax.mail.Service.connect(Service.java:176) ~[mail-1.4.5.jar:1.4.5]
	at javax.mail.Service.connect(Service.java:196) ~[mail-1.4.5.jar:1.4.5]
	at org.nuxeo.mail.MailSessionBuilder$AbstractFrom.buildAndConnect(MailSessionBuilder.java:211) ~[nuxeo-mail-10.10-HF20.jar:?]
	... 10 more

diff --git a/nuxeo-features/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/java/org/nuxeo/ecm/platform/mail/utils/MailCoreHelper.java b/nuxeo-features/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/java/org/nuxeo/ecm/platform/mail/utils/MailCoreHelper.java
index 8777b8b..08cac77 100644
--- a/nuxeo-features/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/java/org/nuxeo/ecm/platform/mail/utils/MailCoreHelper.java
+++ b/nuxeo-features/nuxeo-platform-mail/nuxeo-platform-mail-core/src/main/java/org/nuxeo/ecm/platform/mail/utils/MailCoreHelper.java
@@ -188,9 +188,6 @@ public final class MailCoreHelper {
                     properties.put("mail.imaps.port", port);
                     properties.put("mail.imaps.starttls.enable", starttlsEnable.toString());
                     properties.put("mail.imaps.ssl.protocols", sslProtocols);
-                    properties.put("mail.imaps.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
-                    properties.put("mail.imaps.socketFactory.fallback", socketFactoryFallback.toString());
-                    properties.put("mail.imaps.socketFactory.port", socketFactoryPort);
                     properties.put("mail.imap.partialfetch", "false");
                     properties.put("mail.imaps.partialfetch", "false");
                 } else if (POP3S.equals(protocolType)) {