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

[all] upgrade to Netty 4.1.71 #1148

Merged
merged 1 commit into from Dec 9, 2021
Merged

[all] upgrade to Netty 4.1.71 #1148

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
@@ -1,5 +1,5 @@
versions_groovy=3.0.9
versions_ribbon=2.4.4
versions_netty=4.1.69.Final
versions_netty=4.1.71.Final
release.scope=patch
release.version=2.3.1-SNAPSHOT
21 changes: 10 additions & 11 deletions zuul-core/build.gradle
View file
Open in desktop
Expand Up @@ -23,19 +23,18 @@ dependencies {
api "com.netflix.eureka:eureka-client:1.9.18"
api "io.reactivex:rxjava:1.3.8"

api platform("io.netty:netty-bom:${versions_netty}")
// TODO(carl-mastrangelo): some of these could probably be implementation. Do a deeper check.
api "io.netty:netty-common"
api "io.netty:netty-buffer"
api "io.netty:netty-codec-http"
api "io.netty:netty-codec-http2"
api "io.netty:netty-handler"
api "io.netty:netty-transport"
api "io.netty:netty-common:${versions_netty}"
api "io.netty:netty-buffer:${versions_netty}"
api "io.netty:netty-codec-http:${versions_netty}"
api "io.netty:netty-codec-http2:${versions_netty}"
api "io.netty:netty-handler:${versions_netty}"
api "io.netty:netty-transport:${versions_netty}"

implementation "io.netty:netty-codec-haproxy"
implementation "io.netty:netty-transport-native-epoll"
implementation "io.netty:netty-transport-native-kqueue"
runtimeOnly "io.netty:netty-tcnative-boringssl-static"
implementation "io.netty:netty-codec-haproxy:${versions_netty}"
implementation "io.netty:netty-transport-native-epoll:${versions_netty}:linux-x86_64"
implementation "io.netty:netty-transport-native-kqueue:${versions_netty}:osx-x86_64"
runtimeOnly "io.netty:netty-tcnative-boringssl-static:2.0.46.Final"

implementation 'io.perfmark:perfmark-api:0.24.0'
implementation 'javax.inject:javax.inject:1'
Expand Down
156 changes: 69 additions & 87 deletions zuul-core/dependencies.lock
View file
Open in desktop
Expand Up @@ -30,35 +30,32 @@
"com.netflix.zuul:zuul-discovery": {
"project": true
},
"io.netty:netty-bom": {
"locked": "4.1.69.Final"
},
"io.netty:netty-buffer": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-haproxy": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http2": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-common": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-handler": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-epoll": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-kqueue": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.perfmark:perfmark-api": {
"locked": "0.24.0"
Expand All @@ -69,10 +66,10 @@
"javax.inject:javax.inject": {
"locked": "1"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
},
"org.slf4j:slf4j-api": {
Expand Down Expand Up @@ -121,35 +118,32 @@
"com.netflix.zuul:zuul-discovery": {
"project": true
},
"io.netty:netty-bom": {
"locked": "4.1.69.Final"
},
"io.netty:netty-buffer": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-haproxy": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http2": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-common": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-handler": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-epoll": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-kqueue": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.perfmark:perfmark-api": {
"locked": "0.24.0"
Expand All @@ -160,10 +154,10 @@
"javax.inject:javax.inject": {
"locked": "1"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
},
"org.openjdk.jmh:jmh-core": {
Expand Down Expand Up @@ -237,38 +231,35 @@
"com.netflix.zuul:zuul-discovery": {
"project": true
},
"io.netty:netty-bom": {
"locked": "4.1.69.Final"
},
"io.netty:netty-buffer": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-haproxy": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http2": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-common": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-handler": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-tcnative-boringssl-static": {
"locked": "2.0.44.Final"
"locked": "2.0.46.Final"
},
"io.netty:netty-transport": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-epoll": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-kqueue": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.perfmark:perfmark-api": {
"locked": "0.24.0"
Expand All @@ -282,10 +273,10 @@
"junit:junit": {
"locked": "4.13.2"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
},
"org.mockito:mockito-core": {
Expand Down Expand Up @@ -365,38 +356,35 @@
"com.netflix.zuul:zuul-discovery": {
"project": true
},
"io.netty:netty-bom": {
"locked": "4.1.69.Final"
},
"io.netty:netty-buffer": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-haproxy": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http2": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-common": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-handler": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-tcnative-boringssl-static": {
"locked": "2.0.44.Final"
"locked": "2.0.46.Final"
},
"io.netty:netty-transport": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-epoll": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-kqueue": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.perfmark:perfmark-api": {
"locked": "0.24.0"
Expand All @@ -407,10 +395,10 @@
"javax.inject:javax.inject": {
"locked": "1"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
},
"org.slf4j:slf4j-api": {
Expand Down Expand Up @@ -454,35 +442,32 @@
"com.netflix.zuul:zuul-discovery": {
"project": true
},
"io.netty:netty-bom": {
"locked": "4.1.69.Final"
},
"io.netty:netty-buffer": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-haproxy": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http2": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-common": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-handler": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-epoll": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-kqueue": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.perfmark:perfmark-api": {
"locked": "0.24.0"
Expand All @@ -496,10 +481,10 @@
"junit:junit": {
"locked": "4.13.2"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
},
"org.mockito:mockito-core": {
Expand Down Expand Up @@ -567,38 +552,35 @@
"com.netflix.zuul:zuul-discovery": {
"project": true
},
"io.netty:netty-bom": {
"locked": "4.1.69.Final"
},
"io.netty:netty-buffer": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-haproxy": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-codec-http2": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-common": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-handler": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-tcnative-boringssl-static": {
"locked": "2.0.44.Final"
"locked": "2.0.46.Final"
},
"io.netty:netty-transport": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-epoll": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.netty:netty-transport-native-kqueue": {
"locked": "4.1.69.Final"
"locked": "4.1.71.Final"
},
"io.perfmark:perfmark-api": {
"locked": "0.24.0"
Expand All @@ -612,10 +594,10 @@
"junit:junit": {
"locked": "4.13.2"
},
"org.bouncycastle:bcprov-jdk15on": {
"org.bouncycastle:bcpkix-jdk15on": {
"locked": "1.70"
},
"org.bouncycastle:bcpkix-jdk15on": {
"org.bouncycastle:bcprov-jdk15on": {
"locked": "1.70"
},
"org.mockito:mockito-core": {
Expand Down