Skip to content

Upgrade to Netty 4.1.5 #20222

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 2 commits into from
Aug 30, 2016
Merged

Upgrade to Netty 4.1.5 #20222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cf47d2
Upgrade to Netty 4.1.5
jasontedor Aug 30, 2016
dee8895
Update third-party audits for Netty 4.1.5
jasontedor Aug 30, 2016
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
24 changes: 14 additions & 10 deletions modules/transport-netty4/build.gradle
View file
Open in desktop
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.4.Final"
compile "io.netty:netty-codec:4.1.4.Final"
compile "io.netty:netty-codec-http:4.1.4.Final"
compile "io.netty:netty-common:4.1.4.Final"
compile "io.netty:netty-handler:4.1.4.Final"
compile "io.netty:netty-resolver:4.1.4.Final"
compile "io.netty:netty-transport:4.1.4.Final"
compile "io.netty:netty-buffer:4.1.5.Final"
compile "io.netty:netty-codec:4.1.5.Final"
compile "io.netty:netty-codec-http:4.1.5.Final"
compile "io.netty:netty-common:4.1.5.Final"
compile "io.netty:netty-handler:4.1.5.Final"
compile "io.netty:netty-resolver:4.1.5.Final"
compile "io.netty:netty-transport:4.1.5.Final"
}

integTest {
Expand Down Expand Up @@ -114,9 +114,9 @@ thirdPartyAudit.excludes = [
'com.ning.compress.lzf.LZFEncoder',
'com.ning.compress.lzf.util.ChunkDecoderFactory',
'com.ning.compress.lzf.util.ChunkEncoderFactory',
'javassist/ClassClassPath',
'javassist/ClassPath',
'javassist/ClassPool',
'javassist.ClassClassPath',
'javassist.ClassPath',
'javassist.ClassPool',
'javassist.CtClass',
'javassist.CtMethod',
'lzma.sdk.lzma.Encoder',
Expand All @@ -127,7 +127,9 @@ thirdPartyAudit.excludes = [
'net.jpountz.xxhash.XXHashFactory',
'org.apache.logging.log4j.LogManager',
'org.apache.logging.log4j.Logger',
'org.apache.tomcat.Apr',
'org.apache.tomcat.jni.CertificateRequestedCallback',
'org.apache.tomcat.jni.CertificateRequestedCallback$KeyMaterial',
'org.apache.tomcat.jni.CertificateVerifier',
'org.apache.tomcat.jni.SessionTicketKey',
'org.eclipse.jetty.alpn.ALPN$ClientProvider',
Expand All @@ -136,6 +138,8 @@ thirdPartyAudit.excludes = [

'io.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
'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',
Expand Down
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-buffer-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b5fb6bccda4d63d4a74c9faccdf32f77ab66abc1
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
66bbf9324fa36467d041083f89328e2a24ec4f67
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-codec-http-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
087bda1b9ec7e3f75ca721fc87735cbedad2aa1a
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-common-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
607f8433d8782445e72abe34e43a7e57e86a5e6c
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-handler-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6262900ee9487e62560030a136160df953b1cd6b
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-resolver-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5f367bedcdc185a727fda3296b9a18014cdc22c4
1 change: 0 additions & 1 deletion modules/transport-netty4/licenses/netty-transport-4.1.4.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.5.Final.jar.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
37126b370722ff9631ee13c91139aacec0a71d1d
2 changes: 1 addition & 1 deletion modules/transport-netty4/src/main/plugin-metadata/plugin-security.policy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

grant codeBase "${codebase.netty-transport-4.1.4.Final.jar}" {
grant codeBase "${codebase.netty-transport-4.1.5.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