update netty

.idea/libraries/Netty.xml

@@ -1,11 +1,11 @@
 <component name="libraryTable">
   <library name="Netty">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/lib/netty-all-15.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/netty-all-5.0.0.Alpha1-9.12.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-sources.jar!/" />
+      <root url="jar://$PROJECT_DIR$/lib/src/netty-all-5.0.0.Alpha1-sources.jar!/" />
     </SOURCES>
   </library>
 </component>

build/scripts/libLicenses.gant

@@ -253,7 +253,7 @@ libraryLicense(name: "XML-RPC", libraryName: "XmlRPC", version: "2.0", license:
 libraryLicense(name: "XStream", version: "1.4.3", license: "BSD", url: "http://xstream.codehaus.org/", licenseUrl: "http://xstream.codehaus.org/license.html")
 libraryLicense(name: "YourKit Java Profiler", libraryName: "yjp-controller-api-redist.jar", version: "8.0.x", license: "link (commercial license)", url: "http://yourkit.com/", licenseUrl: "http://www.yourkit.com/purchase/license.html")
 libraryLicense(name: "protobuf", version: "2.5.0", license: "New BSD", url: "http://code.google.com/p/protobuf/", licenseUrl: "http://code.google.com/p/protobuf/source/browse/trunk/COPYING.txt?r=367")
-libraryLicense(name: "Netty", libraryName: "Netty", version: "4.1.0.Alpha1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
+libraryLicense(name: "Netty", libraryName: "Netty", version: "5.0.0.Alpha1", license: "Apache 2.0", url: "http://netty.io", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Kryo", libraryName: "Kryo", version: "1.04", license: "New BSD License", url: "http://code.google.com/p/kryo/", licenseUrl: "http://www.opensource.org/licenses/bsd-license.php")
 libraryLicense(name: "Snappy-Java", libraryName: "Snappy-Java", version: "1.0.5", license: "Apache 2.0", url: "http://code.google.com/p/snappy-java/", licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0")
 libraryLicense(name: "Cucumber-Java", libraryName: "cucumber-java", version: "1.0.14", license: "MIT License", url: "https://github.com/cucumber/cucumber-jvm/", licenseUrl: "http://www.opensource.org/licenses/mit-license.html")

jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java

@@ -31,8 +31,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.api.CanceledStatus;
 import org.jetbrains.jps.service.SharedThreadPool;
 
-import javax.tools.Diagnostic;
-import javax.tools.JavaFileObject;
+import javax.tools.*;
 import java.io.File;
 import java.util.*;
 
@@ -262,7 +261,7 @@ public class JavacServer {
   }
 
   @ChannelHandler.Sharable
-  private static final class ChannelRegistrar extends ChannelInboundHandlerAdapter {
+  private static final class ChannelRegistrar extends ChannelHandlerAdapter {
     private final ChannelGroup openChannels = new DefaultChannelGroup(ImmediateEventExecutor.INSTANCE);
 
     public boolean isEmpty() {

lib/required_for_dist.txt

@@ -34,7 +34,7 @@ microba.jar
 miglayout-swing.jar
 nanoxml-2.2.3.jar
 nekohtml-1.9.14.jar
-netty-all-15.13.jar
+netty-all-5.0.0.Alpha1-9.12.jar
 oromatcher.jar
 picocontainer.jar
 protobuf-2.5.0.jar

platform/platform-api/src/org/jetbrains/ide/BinaryRequestHandler.java

@@ -16,7 +16,7 @@
 package org.jetbrains.ide;
 
 import com.intellij.openapi.extensions.ExtensionPointName;
-import io.netty.channel.ChannelInboundHandler;
+import io.netty.channel.ChannelHandler;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.UUID;
@@ -30,5 +30,5 @@ public abstract class BinaryRequestHandler {
    */
   public abstract UUID getId();
 
-  public abstract ChannelInboundHandler getInboundHandler();
+  public abstract ChannelHandler getInboundHandler();
 }

platform/platform-impl/src/org/jetbrains/io/ChannelExceptionHandler.java

@@ -17,22 +17,21 @@ package org.jetbrains.io;
 
 import com.intellij.openapi.diagnostic.Logger;
 import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandler;
-import io.netty.channel.ChannelInboundHandlerAdapter;
 
 import java.net.ConnectException;
 
 @ChannelHandler.Sharable
-public final class ChannelExceptionHandler extends ChannelInboundHandlerAdapter {
+public final class ChannelExceptionHandler extends ChannelHandlerAdapter {
   private static final Logger LOG = Logger.getInstance(ChannelExceptionHandler.class);
 
-  private static final ChannelInboundHandler INSTANCE = new ChannelExceptionHandler();
+  private static final ChannelHandler INSTANCE = new ChannelExceptionHandler();
 
   private ChannelExceptionHandler() {
   }
 
-  public static ChannelInboundHandler getInstance() {
+  public static ChannelHandler getInstance() {
     return INSTANCE;
   }
 

platform/platform-impl/src/org/jetbrains/io/ChannelRegistrar.java

@@ -7,7 +7,7 @@ import io.netty.util.concurrent.ImmediateEventExecutor;
 import org.jetbrains.annotations.NotNull;
 
 @ChannelHandler.Sharable
-public final class ChannelRegistrar extends ChannelInboundHandlerAdapter {
+public final class ChannelRegistrar extends ChannelHandlerAdapter {
   private final ChannelGroup openChannels = new DefaultChannelGroup(ImmediateEventExecutor.INSTANCE);
 
   public boolean isEmpty() {

platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java

@@ -136,7 +136,7 @@ class PortUnificationServerHandler extends Decoder {
   }
 
   private static void ensureThatExceptionHandlerIsLast(ChannelPipeline pipeline) {
-    ChannelInboundHandler exceptionHandler = ChannelExceptionHandler.getInstance();
+    ChannelHandler exceptionHandler = ChannelExceptionHandler.getInstance();
     if (pipeline.last() != exceptionHandler || pipeline.context(exceptionHandler) == null) {
       return;
     }

platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java

@@ -8,8 +8,8 @@ import io.netty.bootstrap.Bootstrap;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
+import io.netty.channel.ChannelHandler;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandler;
 import io.netty.channel.ChannelInitializer;
 import io.netty.util.CharsetUtil;
 import org.jetbrains.annotations.NotNull;
@@ -87,7 +87,7 @@ public class BinaryRequestHandlerTest extends LightPlatformTestCase {
     }
 
     @Override
-    public ChannelInboundHandler getInboundHandler() {
+    public ChannelHandler getInboundHandler() {
       return new MyDecoder();
     }