Skip to content
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

Jump to bottom

Update Netty to 4.1.16.Final #28345

Merged
merged 8 commits into from
Jan 25, 2018
Merged

Update Netty to 4.1.16.Final #28345

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
355964a
Update Netty to 4.1.18.Final
jaymode Jan 23, 2018
8ef7447
add netty issue
jaymode Jan 23, 2018
b073780
add comment about class init
jaymode Jan 23, 2018
20b346c
Merge branch 'master' into netty_update
jaymode Jan 24, 2018
dd5116b
Merge branch 'master' into netty_update
jaymode Jan 25, 2018
c157fd6
Go back to Netty 4.1.16 so we don't need more permissions or the hack
jaymode Jan 25, 2018
3b5a838
unnecessary change
jaymode Jan 25, 2018
d81c998
alphabetical order
jaymode Jan 25, 2018
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
30 changes: 15 additions & 15 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.13.Final"
compile "io.netty:netty-codec:4.1.13.Final"
compile "io.netty:netty-codec-http:4.1.13.Final"
compile "io.netty:netty-common:4.1.13.Final"
compile "io.netty:netty-handler:4.1.13.Final"
compile "io.netty:netty-resolver:4.1.13.Final"
compile "io.netty:netty-transport:4.1.13.Final"
compile "io.netty:netty-buffer:4.1.16.Final"
compile "io.netty:netty-codec:4.1.16.Final"
compile "io.netty:netty-codec-http:4.1.16.Final"
compile "io.netty:netty-common:4.1.16.Final"
compile "io.netty:netty-handler:4.1.16.Final"
compile "io.netty:netty-resolver:4.1.16.Final"
compile "io.netty:netty-transport:4.1.16.Final"
}

dependencyLicenses {
Expand Down Expand Up @@ -149,18 +149,18 @@ thirdPartyAudit.excludes = [
'io.netty.util.internal.PlatformDependent0$3',
'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.BaseMpscLinkedArrayQueue',
'io.netty.util.internal.shaded.org.jctools.queues.ConcurrentSequencedCircularArrayQueue',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueColdProducerFields',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueConsumerFields',
'io.netty.util.internal.shaded.org.jctools.queues.BaseMpscLinkedArrayQueueProducerFields',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerIndexField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueProducerLimitField',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like these got moved out of alphabetical order?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

'io.netty.util.internal.shaded.org.jctools.queues.LinkedQueueNode',
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueConsumerField',
'io.netty.util.internal.shaded.org.jctools.queues.MpmcArrayQueueProducerField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueConsumerField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueHeadLimitField',
'io.netty.util.internal.shaded.org.jctools.queues.MpscArrayQueueTailField',
'io.netty.util.internal.shaded.org.jctools.util.JvmInfo',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeAccess',
'io.netty.util.internal.shaded.org.jctools.util.UnsafeRefArrayAccess',

'org.conscrypt.Conscrypt$Engines',
'org.conscrypt.AllocatedBuffer',
'org.conscrypt.BufferAllocator',
'org.conscrypt.HandshakeListener'
]
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-buffer-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
63b5fa95c74785e16f2c30ce268bc222e35c8cb5
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d84a1f21768b7309c2954521cf5a1f46c2309eb1
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-http-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d64312378b438dfdad84267c599a053327c6f02a
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-common-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
177a6b30cca92f6f5f9873c9befd681377a4c328
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-handler-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fec0e63e7dd7f4eeef7ea8dc47a1ff32dfc7ebc2
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-resolver-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f6eb553b53fb3a90a8ac1170697093fed82eae28
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-transport-4.1.13.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.16.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3c8ee2c4d4a1cbb947a5c184c7aeb2204260958b