Skip to content

NETWORKING: Upgrade Netty to 4.1.30 #34417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 12, 2018
Merged

NETWORKING: Upgrade Netty to 4.1.30 #34417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions buildSrc/version.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ slf4j = 1.6.2
# when updating the JNA version, also update the version in buildSrc/build.gradle
jna = 4.5.1

netty = 4.1.30.Final

# test dependencies
randomizedrunner = 2.7.0
junit = 4.12
Expand Down
16 changes: 9 additions & 7 deletions modules/transport-netty4/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr

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

dependencyLicenses {
Expand Down Expand Up @@ -111,6 +111,7 @@ thirdPartyAudit.excludes = [
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
'org.slf4j.Logger',
'org.slf4j.LoggerFactory',
'org.slf4j.spi.LocationAwareLogger',

'com.google.protobuf.ExtensionRegistryLite',
'com.google.protobuf.MessageLiteOrBuilder',
Expand Down Expand Up @@ -145,6 +146,7 @@ thirdPartyAudit.excludes = [
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-buffer-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-buffer-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
597adb653306470fb3ec1af3c0f3f30a37b1310a
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-codec-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
515c8f609aaca28a94f984d89a9667dd3359c1b1
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-http-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-codec-http-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1384c630e8a0eeef33ad12a28791dce6e1d8767c
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-common-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-common-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5dca0c34d8f38af51a2398614e81888f51cf811a
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-handler-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-handler-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecc076332ed103411347f4806a44ee32d9d9cb5f
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-resolver-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-resolver-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5106fd687066ffd712e5295d32af4e2ac6482613
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-transport-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions modules/transport-netty4/licenses/netty-transport-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d27bb432a3b125167ac161b26415ad29ec17f02
16 changes: 9 additions & 7 deletions plugins/transport-nio/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ dependencies {
compile "org.elasticsearch:elasticsearch-nio:${version}"

// network stack
compile "io.netty:netty-buffer:4.1.29.Final"
compile "io.netty:netty-codec:4.1.29.Final"
compile "io.netty:netty-codec-http:4.1.29.Final"
compile "io.netty:netty-common:4.1.29.Final"
compile "io.netty:netty-handler:4.1.29.Final"
compile "io.netty:netty-resolver:4.1.29.Final"
compile "io.netty:netty-transport:4.1.29.Final"
compile "io.netty:netty-buffer:${versions.netty}"
compile "io.netty:netty-codec:${versions.netty}"
compile "io.netty:netty-codec-http:${versions.netty}"
compile "io.netty:netty-common:${versions.netty}"
compile "io.netty:netty-handler:${versions.netty}"
compile "io.netty:netty-resolver:${versions.netty}"
compile "io.netty:netty-transport:${versions.netty}"
}

dependencyLicenses {
Expand Down Expand Up @@ -90,6 +90,7 @@ thirdPartyAudit.excludes = [
// from io.netty.util.internal.logging.InternalLoggerFactory (netty) - it's optional
'org.slf4j.Logger',
'org.slf4j.LoggerFactory',
'org.slf4j.spi.LocationAwareLogger',

'com.google.protobuf.ExtensionRegistryLite',
'com.google.protobuf.MessageLiteOrBuilder',
Expand Down Expand Up @@ -124,6 +125,7 @@ thirdPartyAudit.excludes = [
'io.netty.util.internal.PlatformDependent0$1',
'io.netty.util.internal.PlatformDependent0$2',
'io.netty.util.internal.PlatformDependent0$3',
'io.netty.util.internal.PlatformDependent0$5',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueConsumerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseLinkedQueueProducerNodeRef',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
Expand Down
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-buffer-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-buffer-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
597adb653306470fb3ec1af3c0f3f30a37b1310a
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-codec-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-codec-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
515c8f609aaca28a94f984d89a9667dd3359c1b1
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-codec-http-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-codec-http-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1384c630e8a0eeef33ad12a28791dce6e1d8767c
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-common-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-common-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5dca0c34d8f38af51a2398614e81888f51cf811a
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-handler-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-handler-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ecc076332ed103411347f4806a44ee32d9d9cb5f
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-resolver-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-resolver-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5106fd687066ffd712e5295d32af4e2ac6482613
1 change: 0 additions & 1 deletion plugins/transport-nio/licenses/netty-transport-4.1.29.Final.jar.sha1
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions plugins/transport-nio/licenses/netty-transport-4.1.30.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3d27bb432a3b125167ac161b26415ad29ec17f02