Skip to content

Commit

Permalink
Upgrade to Netty 4.1.7
Browse files Browse the repository at this point in the history
This commit upgrades the Netty dependency to version 4.1.7.Final,
picking up some important bug fixes.
  • Loading branch information
jasontedor committed Jan 12, 2017
1 parent b7995fb commit 07575eb
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ public class PreBuiltTransportClientTests extends RandomizedTest {

@Test
public void testPluginInstalled() {
// TODO: remove when Netty 4.1.6 is upgraded to Netty 4.1.7 including https://github.com/netty/netty/pull/6068
assumeFalse(Constants.JRE_IS_MINIMUM_JAVA9);
try (TransportClient client = new PreBuiltTransportClient(Settings.EMPTY)) {
Settings settings = client.settings();
assertEquals(Netty4Plugin.NETTY_TRANSPORT_NAME, NetworkModule.HTTP_DEFAULT_TYPE_SETTING.get(settings));
Expand Down
17 changes: 7 additions & 10 deletions modules/transport-netty4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr

dependencies {
// network stack
compile "io.netty:netty-buffer:4.1.6.Final"
compile "io.netty:netty-codec:4.1.6.Final"
compile "io.netty:netty-codec-http:4.1.6.Final"
compile "io.netty:netty-common:4.1.6.Final"
compile "io.netty:netty-handler:4.1.6.Final"
compile "io.netty:netty-resolver:4.1.6.Final"
compile "io.netty:netty-transport:4.1.6.Final"
compile "io.netty:netty-buffer:4.1.7.Final"
compile "io.netty:netty-codec:4.1.7.Final"
compile "io.netty:netty-codec-http:4.1.7.Final"
compile "io.netty:netty-common:4.1.7.Final"
compile "io.netty:netty-handler:4.1.7.Final"
compile "io.netty:netty-resolver:4.1.7.Final"
compile "io.netty:netty-transport:4.1.7.Final"
}

thirdPartyAudit.excludes = [
Expand Down Expand Up @@ -131,9 +131,6 @@ thirdPartyAudit.excludes = [
'io.netty.util.internal.PlatformDependent0',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.UnsafeAtomicIntegerFieldUpdater',
'io.netty.util.internal.UnsafeAtomicLongFieldUpdater',
'io.netty.util.internal.UnsafeAtomicReferenceFieldUpdater',
'io.netty.util.internal.chmv8.ConcurrentHashMapV8',
'io.netty.util.internal.chmv8.ConcurrentHashMapV8$1',
'io.netty.util.internal.chmv8.ConcurrentHashMapV8$TreeBin',
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
65e89b4d0737cf1ed3eac2916ebf365f5312294c

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b3ecd69e7ab0eb2054b26ad3efb13c34204ffe19

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9f957998c651e7b73d6dc878f704d81b4c085387

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
06766071efa0426fb33101d1758a8d0e09d16ac7

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6f7dfa01c1af4280c154213b6d548405df352df9

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
077734f94029b47887f6f9392d1fc62729e155aa

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
469e86d4dda1dca8b88d2b1faa8e0f078243ba12
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* under the License.
*/

grant codeBase "${codebase.netty-common-4.1.6.Final.jar}" {
grant codeBase "${codebase.netty-common-4.1.7.Final.jar}" {
// for reading the system-wide configuration for the backlog of established sockets
permission java.io.FilePermission "/proc/sys/net/core/somaxconn", "read";
};

grant codeBase "${codebase.netty-transport-4.1.6.Final.jar}" {
grant codeBase "${codebase.netty-transport-4.1.7.Final.jar}" {
// Netty NioEventLoop wants to change this, because of https://bugs.openjdk.java.net/browse/JDK-6427854
// the bug says it only happened rarely, and that its fixed, but apparently it still happens rarely!
permission java.util.PropertyPermission "sun.nio.ch.bugLevel", "write";
Expand Down

0 comments on commit 07575eb

Please sign in to comment.