Skip to content

Commit 0b95702

Browse files
authored
Test netty 4.2 (#9635)
1 parent 40ebe1b commit 0b95702

File tree

2 files changed

+20
-11
lines changed

2 files changed

+20
-11
lines changed

dd-java-agent/instrumentation/netty/netty-4.1/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,11 @@ dependencies {
4949
testImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.1.0'
5050

5151
// latest async-http-client incompatable with 5.0+ netty
52-
latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http', version: '(,5.0)'
52+
latestDepTestImplementation group: 'io.netty', name: 'netty-codec', version: '4.+'
53+
latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http', version: '4.+'
54+
latestDepTestImplementation group: 'io.netty', name: 'netty-codec-http2', version: '4.+'
55+
latestDepTestImplementation group: 'io.netty', name: 'netty-codec-socks', version: '4.+'
56+
5357
latestDepTestImplementation group: 'org.asynchttpclient', name: 'async-http-client', version: '2.+'
5458
}
5559

dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,38 +53,43 @@ info.picocli:picocli:4.6.3=latestDepTestRuntimeClasspath,testRuntimeClasspath
5353
io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath
5454
io.netty:netty-buffer:4.1.0.Final=compileClasspath
5555
io.netty:netty-buffer:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
56-
io.netty:netty-buffer:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
56+
io.netty:netty-buffer:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
57+
io.netty:netty-codec-base:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
58+
io.netty:netty-codec-compression:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
5759
io.netty:netty-codec-dns:4.1.19.Final=testCompileClasspath,testRuntimeClasspath
5860
io.netty:netty-codec-http2:4.1.0.Final=compileClasspath
59-
io.netty:netty-codec-http2:4.1.29.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
61+
io.netty:netty-codec-http2:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
62+
io.netty:netty-codec-http2:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6063
io.netty:netty-codec-http:4.1.0.Final=compileClasspath
6164
io.netty:netty-codec-http:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
62-
io.netty:netty-codec-http:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
65+
io.netty:netty-codec-http:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
66+
io.netty:netty-codec-marshalling:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
67+
io.netty:netty-codec-protobuf:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6368
io.netty:netty-codec-socks:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
64-
io.netty:netty-codec-socks:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
69+
io.netty:netty-codec-socks:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6570
io.netty:netty-codec:4.1.0.Final=compileClasspath
6671
io.netty:netty-codec:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
67-
io.netty:netty-codec:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
72+
io.netty:netty-codec:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
6873
io.netty:netty-common:4.1.0.Final=compileClasspath
6974
io.netty:netty-common:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
70-
io.netty:netty-common:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
75+
io.netty:netty-common:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7176
io.netty:netty-handler-proxy:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
7277
io.netty:netty-handler-proxy:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7378
io.netty:netty-handler:4.1.0.Final=compileClasspath
7479
io.netty:netty-handler:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
75-
io.netty:netty-handler:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
80+
io.netty:netty-handler:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
7681
io.netty:netty-resolver-dns:4.1.19.Final=testCompileClasspath,testRuntimeClasspath
7782
io.netty:netty-resolver:4.1.0.Final=compileClasspath
7883
io.netty:netty-resolver:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
79-
io.netty:netty-resolver:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
84+
io.netty:netty-resolver:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8085
io.netty:netty-transport-native-epoll:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
8186
io.netty:netty-transport-native-epoll:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8287
io.netty:netty-transport-native-kqueue:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8388
io.netty:netty-transport-native-unix-common:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
84-
io.netty:netty-transport-native-unix-common:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
89+
io.netty:netty-transport-native-unix-common:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8590
io.netty:netty-transport:4.1.0.Final=compileClasspath
8691
io.netty:netty-transport:4.1.29.Final=testCompileClasspath,testRuntimeClasspath
87-
io.netty:netty-transport:4.1.60.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
92+
io.netty:netty-transport:4.2.6.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
8893
io.projectreactor.netty:reactor-netty:0.8.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
8994
io.projectreactor:reactor-core:3.2.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
9095
io.sqreen:libsqreen:16.0.0=latestDepTestRuntimeClasspath,testRuntimeClasspath

0 commit comments

Comments
 (0)