Skip to content

Commit 92fa76a

Browse files
committed
Upgrade to Netty 4.1.25.Final
This commit upgrades us to Netty 4.1.25. This upgrade is more challenging than past upgrades, all because of a new object cleaner thread that they have added. This thread requires an additional security permission (set context class loader, needed to avoid leaks in certain scenarios). Additionally, there is not a clean way to shutdown this thread which means that the thread can fail thread leak control during tests. As such, we have to filter this thread from thread leak control.
1 parent aa8aa0d commit 92fa76a

File tree

61 files changed

+221
-79
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+221
-79
lines changed

modules/transport-netty4/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ compileTestJava.options.compilerArgs << "-Xlint:-cast,-deprecation,-rawtypes,-tr
3434

3535
dependencies {
3636
// network stack
37-
compile "io.netty:netty-buffer:4.1.16.Final"
38-
compile "io.netty:netty-codec:4.1.16.Final"
39-
compile "io.netty:netty-codec-http:4.1.16.Final"
40-
compile "io.netty:netty-common:4.1.16.Final"
41-
compile "io.netty:netty-handler:4.1.16.Final"
42-
compile "io.netty:netty-resolver:4.1.16.Final"
43-
compile "io.netty:netty-transport:4.1.16.Final"
37+
compile "io.netty:netty-buffer:4.1.25.Final"
38+
compile "io.netty:netty-codec:4.1.25.Final"
39+
compile "io.netty:netty-codec-http:4.1.25.Final"
40+
compile "io.netty:netty-common:4.1.25.Final"
41+
compile "io.netty:netty-handler:4.1.25.Final"
42+
compile "io.netty:netty-resolver:4.1.25.Final"
43+
compile "io.netty:netty-transport:4.1.25.Final"
4444
}
4545

4646
dependencyLicenses {
@@ -161,6 +161,6 @@ thirdPartyAudit.excludes = [
161161

162162
'org.conscrypt.AllocatedBuffer',
163163
'org.conscrypt.BufferAllocator',
164-
'org.conscrypt.Conscrypt$Engines',
164+
'org.conscrypt.Conscrypt',
165165
'org.conscrypt.HandshakeListener'
166166
]

modules/transport-netty4/licenses/netty-buffer-4.1.16.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f366d0cc87b158ca064d27507127e3cc4eb2f089

modules/transport-netty4/licenses/netty-codec-4.1.16.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3e465c75bead40d06b5b9c0612b37cf77c548887

modules/transport-netty4/licenses/netty-codec-http-4.1.16.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
70888d3f2a829541378f68503ddd52c3193df35a

modules/transport-netty4/licenses/netty-common-4.1.16.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e17d5c05c101fe14536ce3fb34b36c54e04791f6

modules/transport-netty4/licenses/netty-handler-4.1.16.Final.jar.sha1

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)