upgrade netty to 4.1.110

pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.hubspot</groupId>
     <artifactId>basepom</artifactId>
-    <version>59.9</version>
+    <version>59.10-SNAPSHOT</version>
   </parent>
 
   <artifactId>NioImapClient</artifactId>
@@ -50,8 +50,7 @@
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
-      <artifactId>netty-transport-native-epoll</artifactId>
-      <classifier>${dep.netty.epoll.classifier}</classifier>
+      <artifactId>netty-transport-classes-epoll</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -155,6 +154,16 @@
       <artifactId>greenmail</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.icegreen</groupId>
+      <artifactId>greenmail-junit4</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.datatype</groupId>
+      <artifactId>jackson-datatype-guava</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -181,19 +190,4 @@
     <url>[email protected]:HubSpot/NioImapClient.git</url>
     <tag>HEAD</tag>
   </scm>
-
-  <profiles>
-    <profile>
-      <id>linux</id>
-      <activation>
-        <os>
-          <name>Linux</name>
-          <family>unix</family>
-        </os>
-      </activation>
-      <properties>
-        <dep.netty.epoll.classifier>${os.detected.classifier}</dep.netty.epoll.classifier>
-      </properties>
-    </profile>
-  </profiles>
 </project>

src/test/java/com/hubspot/imap/BaseGreenMailServerTest.java

@@ -2,10 +2,12 @@
 
 import com.google.common.net.HostAndPort;
 import com.hubspot.imap.client.ImapClient;
-import com.icegreen.greenmail.junit.GreenMailRule;
+import com.icegreen.greenmail.junit4.GreenMailRule;
 import com.icegreen.greenmail.user.GreenMailUser;
 import com.icegreen.greenmail.util.GreenMailUtil;
 import com.icegreen.greenmail.util.ServerSetup;
+import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
+import java.util.Optional;
 import java.util.concurrent.ThreadLocalRandom;
 import org.junit.Before;
 import org.junit.Rule;
@@ -14,14 +16,13 @@ public class BaseGreenMailServerTest {
 
   protected static final String DEFAULT_FOLDER = "INBOX";
 
-  protected final ServerSetup serverSetup = new ServerSetup(
-    ThreadLocalRandom.current().nextInt(10000, 20000),
-    null,
-    "imap"
-  );
-
   @Rule
-  public final GreenMailRule greenMail = new GreenMailRule(serverSetup);
+  public final GreenMailRule greenMail = new GreenMailRule(
+    new ServerSetup[] {
+      new ServerSetup(ThreadLocalRandom.current().nextInt(10000, 20000), null, "imap"),
+      new ServerSetup(ThreadLocalRandom.current().nextInt(10000, 20000), null, "imaps"),
+    }
+  );
 
   protected GreenMailUser currentUser;
 
@@ -33,8 +34,9 @@ public void setUp() throws Exception {
   protected ImapClientConfiguration getImapConfig() {
     return ImapClientConfiguration
       .builder()
-      .hostAndPort(HostAndPort.fromParts("localhost", greenMail.getImap().getPort()))
-      .useSsl(false)
+      .hostAndPort(HostAndPort.fromParts("localhost", greenMail.getImaps().getPort()))
+      .useSsl(true)
+      .trustManagerFactory(Optional.of(InsecureTrustManagerFactory.INSTANCE))
       .connectTimeoutMillis(1000)
       .tracingEnabled(true)
       .noopKeepAliveIntervalSec(1)
@@ -67,7 +69,7 @@ protected void deliverRandomMessages(int n) {
           GreenMailUtil.random() + "@localhost.com",
           GreenMailUtil.random(),
           GreenMailUtil.random(),
-          greenMail.getImap().getServerSetup()
+          greenMail.getImaps().getServerSetup()
         )
       );
     }

src/test/java/com/hubspot/imap/ImapMultiServerTest.java

@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import com.fasterxml.jackson.datatype.guava.GuavaModule;
 import com.hubspot.imap.client.ImapClient;
 import com.hubspot.imap.protocol.exceptions.ConnectionClosedException;
 import java.io.IOException;
@@ -25,12 +26,10 @@ private static List<TestServerConfig> getTestConfigs() throws IOException {
       .getContextClassLoader()
       .getResourceAsStream("profiles.yaml");
 
-    ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory());
+    ObjectMapper objectMapper = new ObjectMapper(new YAMLFactory())
+      .registerModule(new GuavaModule());
 
-    return objectMapper.readValue(
-      inputStream,
-      new TypeReference<List<TestServerConfig>>() {}
-    );
+    return objectMapper.readValue(inputStream, new TypeReference<>() {});
   }
 
   @Parameters(name = "{0}")

src/test/java/com/hubspot/imap/client/ImapClientTest.java

@@ -579,7 +579,7 @@ public void testAppend() throws Exception {
       )
       .get();
     assertThat(appendResponse.getCode()).isEqualTo(ResponseCode.OK);
-    long uid = Long.parseLong(appendResponse.getMessage().substring(25, 26));
+    long uid = Long.parseLong(appendResponse.getMessage().substring(22, 23));
 
     FetchResponse postAppendFetchAll = client
       .fetch(

src/test/resources/profiles.yaml

@@ -1,3 +1,4 @@
+[ ]
 #- host: imap.gmail.com
 #  port: 993
 #  user: [email protected]