Merge pull request #784 from jooby-project/782

Netty upgrade 4.1.11 fix #782

Author: jknack

jooby-netty/pom.xml

@@ -14,7 +14,7 @@
   <name>netty module</name>
 
   <properties>
-    <boringssl.version>1.1.33.Fork25</boringssl.version>
+    <boringssl.version>1.1.33.Fork26</boringssl.version>
   </properties>
 
   <build>

jooby-netty/src/test/java/io/netty/channel/epoll/Epoll.java

@@ -0,0 +1,25 @@
+package io.netty.channel.epoll;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * Hack for Epoll test.
+ *
+ * @author edgar
+ *
+ */
+public class Epoll {
+
+  public static final AtomicBoolean available = new AtomicBoolean(false);
+
+  public static boolean isAvailable() {
+    return available.get();
+  }
+
+  public static void ensureAvailability() {
+  }
+
+  public static Throwable unavailabilityCause() {
+    return null;
+  }
+}

jooby-netty/src/test/java/org/jooby/internal/netty/NettyServerTest.java

@@ -178,13 +178,10 @@ private Block parentThreadFactory(final String name) {
   @SuppressWarnings({"unchecked", "rawtypes" })
   @Test
   public void epollServer() throws Exception {
+    Epoll.available.set(true);
     new MockUnit(HttpHandler.class)
         .expect(parentThreadFactory("epoll-boss"))
         .expect(unit -> {
-
-          unit.mockStatic(Epoll.class);
-          expect(Epoll.isAvailable()).andReturn(true);
-
           EpollEventLoopGroup eventLoop = unit.constructor(EpollEventLoopGroup.class)
               .args(int.class, ThreadFactory.class)
               .build(1, unit.get(ThreadFactory.class));
@@ -215,6 +212,7 @@ public void epollServer() throws Exception {
             server.stop();
           }
         });
+    Epoll.available.set(false);
   }
 
   @Test

pom.xml

@@ -2961,7 +2961,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
     <undertow.version>1.4.9.Final</undertow.version>
     <servlet.version>3.1.0</servlet.version>
     <jetty.version>9.4.3.v20170317</jetty.version>
-    <netty.version>4.1.9.Final</netty.version>
+    <netty.version>4.1.11.Final</netty.version>
     <javassist.version>3.20.0-GA</javassist.version>
     <javax.ws.rs-api.version>2.0</javax.ws.rs-api.version>
     <slf4j-api.version>1.7.21</slf4j-api.version>