diff --git a/.idea/libraries/Netty.xml b/.idea/libraries/Netty.xml index 48a94941324f..d38372396ae2 100644 --- a/.idea/libraries/Netty.xml +++ b/.idea/libraries/Netty.xml @@ -1,11 +1,11 @@ - + - + \ No newline at end of file diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant index 3b44981e2783..d76abb76a4d6 100644 --- a/build/scripts/libLicenses.gant +++ b/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") diff --git a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java b/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java index 41d85eae1781..b5dc9bad44fb 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/javac/JavacServer.java +++ b/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() { diff --git a/lib/netty-all-15.13.jar b/lib/netty-all-5.0.0.Alpha1-9.12.jar similarity index 60% rename from lib/netty-all-15.13.jar rename to lib/netty-all-5.0.0.Alpha1-9.12.jar index 452445ecb42e..3740e2619525 100644 Binary files a/lib/netty-all-15.13.jar and b/lib/netty-all-5.0.0.Alpha1-9.12.jar differ diff --git a/lib/required_for_dist.txt b/lib/required_for_dist.txt index dee9fc0ce5db..b0217c47de06 100644 --- a/lib/required_for_dist.txt +++ b/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 diff --git a/lib/src/netty-all-sources.jar b/lib/src/netty-all-5.0.0.Alpha1-sources.jar similarity index 64% rename from lib/src/netty-all-sources.jar rename to lib/src/netty-all-5.0.0.Alpha1-sources.jar index 8153f818c108..f3f2fab1c46f 100644 Binary files a/lib/src/netty-all-sources.jar and b/lib/src/netty-all-5.0.0.Alpha1-sources.jar differ diff --git a/platform/platform-api/src/org/jetbrains/ide/BinaryRequestHandler.java b/platform/platform-api/src/org/jetbrains/ide/BinaryRequestHandler.java index f8e2f4c5d8c7..c15d162d1f18 100644 --- a/platform/platform-api/src/org/jetbrains/ide/BinaryRequestHandler.java +++ b/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(); } \ No newline at end of file diff --git a/platform/platform-impl/src/org/jetbrains/io/ChannelExceptionHandler.java b/platform/platform-impl/src/org/jetbrains/io/ChannelExceptionHandler.java index 748d2228e88b..478a3fa35de7 100644 --- a/platform/platform-impl/src/org/jetbrains/io/ChannelExceptionHandler.java +++ b/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; } diff --git a/platform/platform-impl/src/org/jetbrains/io/ChannelRegistrar.java b/platform/platform-impl/src/org/jetbrains/io/ChannelRegistrar.java index 96bb850d0899..42efe6a2667f 100644 --- a/platform/platform-impl/src/org/jetbrains/io/ChannelRegistrar.java +++ b/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() { diff --git a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java b/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java index 0ec8badee8d1..ecf36b796290 100644 --- a/platform/platform-impl/src/org/jetbrains/io/PortUnificationServerHandler.java +++ b/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; } diff --git a/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java b/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java index 082348efc359..98d5d270a48c 100644 --- a/platform/platform-tests/testSrc/com/intellij/ide/BinaryRequestHandlerTest.java +++ b/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(); }