From f93011cfcd34d8b99ab4ae8d74bda0cf7f89f532 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Mon, 30 Jan 2023 21:09:41 +0200 Subject: [PATCH 1/7] next development iteration --- README.md | 4 ++-- gradle.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2357437..01615ef 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ EchoWebSocketHandler http1WebSocketHandler = new EchoWebSocketHandler(); Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel); Http2Headers headers = - new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.2.1"); + new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.2.2"); ChannelFuture handshakeFuture = /*http1 websocket handler*/ handShaker.handshake("/echo", headers, new EchoWebSocketHandler()); @@ -286,7 +286,7 @@ repositories { } dependencies { - implementation 'com.jauntsdn.netty:netty-websocket-http2:1.2.1' + implementation 'com.jauntsdn.netty:netty-websocket-http2:1.2.2' } ``` diff --git a/gradle.properties b/gradle.properties index 2bd7df0..0713b27 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.jauntsdn.netty -version=1.2.2 +version=1.2.3 googleJavaFormatPluginVersion=0.9 dependencyManagementPluginVersion=1.1.0 From 9dba6180fccc2abb3e11eb293b55b5ce6c5e1cfd Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Mon, 20 Feb 2023 21:18:25 +0200 Subject: [PATCH 2/7] update dependencies --- gradle.properties | 8 +++---- .../gradle.lockfile | 20 ++++++++--------- netty-websocket-http2/gradle.lockfile | 22 +++++++++---------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0713b27..86a4f76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,11 +5,11 @@ googleJavaFormatPluginVersion=0.9 dependencyManagementPluginVersion=1.1.0 gitPluginVersion=0.13.0 osDetectorPluginVersion=1.7.1 -versionsPluginVersion=0.44.0 +versionsPluginVersion=0.45.0 -nettyVersion=4.1.87.Final -jauntNettyWebsocketHttp1=0.9.1 -nettyTcnativeVersion=2.0.56.Final +nettyVersion=4.1.89.Final +jauntNettyWebsocketHttp1=0.9.2 +nettyTcnativeVersion=2.0.59.Final hdrHistogramVersion=2.1.12 slf4jVersion=1.7.36 logbackVersion=1.2.11 diff --git a/netty-websocket-http2-callbacks-codec/gradle.lockfile b/netty-websocket-http2-callbacks-codec/gradle.lockfile index 7bbdd12..ed87f9d 100644 --- a/netty-websocket-http2-callbacks-codec/gradle.lockfile +++ b/netty-websocket-http2-callbacks-codec/gradle.lockfile @@ -7,15 +7,15 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -com.jauntsdn.netty:netty-websocket-http1:0.9.1=compileClasspath -io.netty:netty-buffer:4.1.87.Final=compileClasspath -io.netty:netty-codec-http2:4.1.87.Final=compileClasspath -io.netty:netty-codec-http:4.1.87.Final=compileClasspath -io.netty:netty-codec:4.1.87.Final=compileClasspath -io.netty:netty-common:4.1.87.Final=compileClasspath -io.netty:netty-handler:4.1.87.Final=compileClasspath -io.netty:netty-resolver:4.1.87.Final=compileClasspath -io.netty:netty-transport-native-unix-common:4.1.87.Final=compileClasspath -io.netty:netty-transport:4.1.87.Final=compileClasspath +com.jauntsdn.netty:netty-websocket-http1:0.9.2=compileClasspath +io.netty:netty-buffer:4.1.89.Final=compileClasspath +io.netty:netty-codec-http2:4.1.89.Final=compileClasspath +io.netty:netty-codec-http:4.1.89.Final=compileClasspath +io.netty:netty-codec:4.1.89.Final=compileClasspath +io.netty:netty-common:4.1.89.Final=compileClasspath +io.netty:netty-handler:4.1.89.Final=compileClasspath +io.netty:netty-resolver:4.1.89.Final=compileClasspath +io.netty:netty-transport-native-unix-common:4.1.89.Final=compileClasspath +io.netty:netty-transport:4.1.89.Final=compileClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 empty=annotationProcessor diff --git a/netty-websocket-http2/gradle.lockfile b/netty-websocket-http2/gradle.lockfile index 21e625c..e04ac7f 100644 --- a/netty-websocket-http2/gradle.lockfile +++ b/netty-websocket-http2/gradle.lockfile @@ -9,17 +9,17 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -io.netty:netty-buffer:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.56.Final=testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.56.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.87.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.59.Final=testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.59.Final=testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath From a5f620030600739fcf409166f1d4cd78819671c8 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Mon, 20 Feb 2023 21:23:00 +0200 Subject: [PATCH 3/7] perf-server script: make runnable on jre 17 --- perf_server_callbacks_run.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/perf_server_callbacks_run.sh b/perf_server_callbacks_run.sh index 36168ed..9b2277c 100755 --- a/perf_server_callbacks_run.sh +++ b/perf_server_callbacks_run.sh @@ -1,3 +1,5 @@ #!/bin/sh +export NETTY_WEBSOCKET_HTTP2_PERFTEST_CALLBACKS_SERVER_OPTS='--add-exports java.base/sun.security.x509=ALL-UNNAMED' + cd netty-websocket-http2-perftest/build/install/netty-websocket-http2-perftest/bin && ./netty-websocket-http2-perftest-callbacks-server \ No newline at end of file From 4b5139166736715618e9ed89ba41f565efa803a2 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Sun, 26 Mar 2023 14:18:19 +0300 Subject: [PATCH 4/7] update dependencies --- gradle.properties | 4 ++-- .../gradle.lockfile | 18 +++++++++--------- netty-websocket-http2/gradle.lockfile | 18 +++++++++--------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/gradle.properties b/gradle.properties index 86a4f76..ec68300 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ version=1.2.3 googleJavaFormatPluginVersion=0.9 dependencyManagementPluginVersion=1.1.0 gitPluginVersion=0.13.0 -osDetectorPluginVersion=1.7.1 +osDetectorPluginVersion=1.7.3 versionsPluginVersion=0.45.0 -nettyVersion=4.1.89.Final +nettyVersion=4.1.90.Final jauntNettyWebsocketHttp1=0.9.2 nettyTcnativeVersion=2.0.59.Final hdrHistogramVersion=2.1.12 diff --git a/netty-websocket-http2-callbacks-codec/gradle.lockfile b/netty-websocket-http2-callbacks-codec/gradle.lockfile index ed87f9d..77f5843 100644 --- a/netty-websocket-http2-callbacks-codec/gradle.lockfile +++ b/netty-websocket-http2-callbacks-codec/gradle.lockfile @@ -8,14 +8,14 @@ com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 com.jauntsdn.netty:netty-websocket-http1:0.9.2=compileClasspath -io.netty:netty-buffer:4.1.89.Final=compileClasspath -io.netty:netty-codec-http2:4.1.89.Final=compileClasspath -io.netty:netty-codec-http:4.1.89.Final=compileClasspath -io.netty:netty-codec:4.1.89.Final=compileClasspath -io.netty:netty-common:4.1.89.Final=compileClasspath -io.netty:netty-handler:4.1.89.Final=compileClasspath -io.netty:netty-resolver:4.1.89.Final=compileClasspath -io.netty:netty-transport-native-unix-common:4.1.89.Final=compileClasspath -io.netty:netty-transport:4.1.89.Final=compileClasspath +io.netty:netty-buffer:4.1.90.Final=compileClasspath +io.netty:netty-codec-http2:4.1.90.Final=compileClasspath +io.netty:netty-codec-http:4.1.90.Final=compileClasspath +io.netty:netty-codec:4.1.90.Final=compileClasspath +io.netty:netty-common:4.1.90.Final=compileClasspath +io.netty:netty-handler:4.1.90.Final=compileClasspath +io.netty:netty-resolver:4.1.90.Final=compileClasspath +io.netty:netty-transport-native-unix-common:4.1.90.Final=compileClasspath +io.netty:netty-transport:4.1.90.Final=compileClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 empty=annotationProcessor diff --git a/netty-websocket-http2/gradle.lockfile b/netty-websocket-http2/gradle.lockfile index e04ac7f..20a0797 100644 --- a/netty-websocket-http2/gradle.lockfile +++ b/netty-websocket-http2/gradle.lockfile @@ -9,17 +9,17 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -io.netty:netty-buffer:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.59.Final=testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.59.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.89.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath From 38fb7fe58f6ebb1aa3afb499a4531837b9aef717 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Mon, 27 Mar 2023 18:05:55 +0300 Subject: [PATCH 5/7] update dependencies --- gradle.properties | 2 +- netty-websocket-http2-callbacks-codec/gradle.lockfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index ec68300..a937dc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ osDetectorPluginVersion=1.7.3 versionsPluginVersion=0.45.0 nettyVersion=4.1.90.Final -jauntNettyWebsocketHttp1=0.9.2 +jauntNettyWebsocketHttp1=1.0.0 nettyTcnativeVersion=2.0.59.Final hdrHistogramVersion=2.1.12 slf4jVersion=1.7.36 diff --git a/netty-websocket-http2-callbacks-codec/gradle.lockfile b/netty-websocket-http2-callbacks-codec/gradle.lockfile index 77f5843..7c97bfa 100644 --- a/netty-websocket-http2-callbacks-codec/gradle.lockfile +++ b/netty-websocket-http2-callbacks-codec/gradle.lockfile @@ -7,7 +7,7 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -com.jauntsdn.netty:netty-websocket-http1:0.9.2=compileClasspath +com.jauntsdn.netty:netty-websocket-http1:1.0.0=compileClasspath io.netty:netty-buffer:4.1.90.Final=compileClasspath io.netty:netty-codec-http2:4.1.90.Final=compileClasspath io.netty:netty-codec-http:4.1.90.Final=compileClasspath From 403fc5cb277440f3a82b8cbe965750fff3b882ba Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Sun, 30 Apr 2023 09:29:04 +0300 Subject: [PATCH 6/7] update dependencies tests: disable netty's reintroduced headers validation in favor of provided by this library --- gradle.properties | 6 ++-- .../gradle.lockfile | 18 +++++----- netty-websocket-http2/gradle.lockfile | 34 +++++++++---------- .../websocketx/HeadersValidatorTest.java | 6 ++-- .../websocketx/ProtocolHandshakeTest.java | 8 ++--- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/gradle.properties b/gradle.properties index a937dc5..440feb5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,15 +7,15 @@ gitPluginVersion=0.13.0 osDetectorPluginVersion=1.7.3 versionsPluginVersion=0.45.0 -nettyVersion=4.1.90.Final +nettyVersion=4.1.92.Final jauntNettyWebsocketHttp1=1.0.0 -nettyTcnativeVersion=2.0.59.Final +nettyTcnativeVersion=2.0.60.Final hdrHistogramVersion=2.1.12 slf4jVersion=1.7.36 logbackVersion=1.2.11 jsr305Version=3.0.2 -junitVersion=5.9.2 +junitVersion=5.9.3 assertjVersion=3.24.2 org.gradle.parallel=true diff --git a/netty-websocket-http2-callbacks-codec/gradle.lockfile b/netty-websocket-http2-callbacks-codec/gradle.lockfile index 7c97bfa..81a6006 100644 --- a/netty-websocket-http2-callbacks-codec/gradle.lockfile +++ b/netty-websocket-http2-callbacks-codec/gradle.lockfile @@ -8,14 +8,14 @@ com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 com.jauntsdn.netty:netty-websocket-http1:1.0.0=compileClasspath -io.netty:netty-buffer:4.1.90.Final=compileClasspath -io.netty:netty-codec-http2:4.1.90.Final=compileClasspath -io.netty:netty-codec-http:4.1.90.Final=compileClasspath -io.netty:netty-codec:4.1.90.Final=compileClasspath -io.netty:netty-common:4.1.90.Final=compileClasspath -io.netty:netty-handler:4.1.90.Final=compileClasspath -io.netty:netty-resolver:4.1.90.Final=compileClasspath -io.netty:netty-transport-native-unix-common:4.1.90.Final=compileClasspath -io.netty:netty-transport:4.1.90.Final=compileClasspath +io.netty:netty-buffer:4.1.92.Final=compileClasspath +io.netty:netty-codec-http2:4.1.92.Final=compileClasspath +io.netty:netty-codec-http:4.1.92.Final=compileClasspath +io.netty:netty-codec:4.1.92.Final=compileClasspath +io.netty:netty-common:4.1.92.Final=compileClasspath +io.netty:netty-handler:4.1.92.Final=compileClasspath +io.netty:netty-resolver:4.1.92.Final=compileClasspath +io.netty:netty-transport-native-unix-common:4.1.92.Final=compileClasspath +io.netty:netty-transport:4.1.92.Final=compileClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 empty=annotationProcessor diff --git a/netty-websocket-http2/gradle.lockfile b/netty-websocket-http2/gradle.lockfile index 20a0797..42d5ba3 100644 --- a/netty-websocket-http2/gradle.lockfile +++ b/netty-websocket-http2/gradle.lockfile @@ -9,27 +9,27 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -io.netty:netty-buffer:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.59.Final=testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.59.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.90.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.60.Final=testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.60.Final=testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 -org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.2=testRuntimeClasspath -org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.3=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.3=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.3=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.3=testRuntimeClasspath +org.junit:junit-bom:5.9.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor diff --git a/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/HeadersValidatorTest.java b/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/HeadersValidatorTest.java index 3d2c60c..c688c79 100644 --- a/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/HeadersValidatorTest.java +++ b/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/HeadersValidatorTest.java @@ -260,7 +260,7 @@ private static CharSequence asciiString(String s) { } private static Http2Headers validWebSocketRequestHeaders() { - return new DefaultHttp2Headers() + return new DefaultHttp2Headers(false) .method(asciiString("connect")) .set(asciiString(":protocol"), asciiString("websocket")) .scheme(asciiString("https")) @@ -269,7 +269,7 @@ private static Http2Headers validWebSocketRequestHeaders() { } private static Http2Headers validHttpRequestHeaders() { - return new DefaultHttp2Headers() + return new DefaultHttp2Headers(false) .method(asciiString("get")) .scheme(asciiString("https")) .authority(asciiString("localhost")) @@ -277,7 +277,7 @@ private static Http2Headers validHttpRequestHeaders() { } private static Http2Headers validResponseHeaders() { - return new DefaultHttp2Headers() + return new DefaultHttp2Headers(false) .status(asciiString("200")) .set(asciiString("user-agent"), asciiString("test")); } diff --git a/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/ProtocolHandshakeTest.java b/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/ProtocolHandshakeTest.java index 994cd26..ceee1e6 100644 --- a/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/ProtocolHandshakeTest.java +++ b/netty-websocket-http2/src/test/java/com/jauntsdn/netty/handler/codec/http2/websocketx/ProtocolHandshakeTest.java @@ -196,7 +196,7 @@ void invalidWebSocketRequestRejected(Http2Headers invalidHttp2RequestHeaders) th static Stream invalidWebSocketRequests() { Http2Headers emptyPath = - Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers()) + Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false)) .scheme("https") .authority("localhost") .path("") @@ -206,7 +206,7 @@ static Stream invalidWebSocketRequests() { Http2WebSocketProtocol.HEADER_WEBSOCKET_VERSION_VALUE); Http2Headers emptyAuthority = - Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers()) + Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false)) .scheme("https") .authority("") .path("path") @@ -216,7 +216,7 @@ static Stream invalidWebSocketRequests() { Http2WebSocketProtocol.HEADER_WEBSOCKET_VERSION_VALUE); Http2Headers emptyScheme = - Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers()) + Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false)) .scheme("") .authority("localhost") .path("path") @@ -226,7 +226,7 @@ static Stream invalidWebSocketRequests() { Http2WebSocketProtocol.HEADER_WEBSOCKET_VERSION_VALUE); Http2Headers nonHttpScheme = - Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers()) + Http2WebSocketProtocol.extendedConnect(new DefaultHttp2Headers(false)) .scheme("ftp") .authority("localhost") .path("path") From 359096b603455999e72518f0a1f7000030f24df0 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Tue, 30 May 2023 19:15:55 +0300 Subject: [PATCH 7/7] update dependencies --- gradle.properties | 6 ++--- .../gradle.lockfile | 20 ++++++++--------- netty-websocket-http2/gradle.lockfile | 22 +++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gradle.properties b/gradle.properties index 440feb5..ae346a6 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,9 +7,9 @@ gitPluginVersion=0.13.0 osDetectorPluginVersion=1.7.3 versionsPluginVersion=0.45.0 -nettyVersion=4.1.92.Final -jauntNettyWebsocketHttp1=1.0.0 -nettyTcnativeVersion=2.0.60.Final +nettyVersion=4.1.93.Final +jauntNettyWebsocketHttp1=1.1.0 +nettyTcnativeVersion=2.0.61.Final hdrHistogramVersion=2.1.12 slf4jVersion=1.7.36 logbackVersion=1.2.11 diff --git a/netty-websocket-http2-callbacks-codec/gradle.lockfile b/netty-websocket-http2-callbacks-codec/gradle.lockfile index 81a6006..a2d6dd4 100644 --- a/netty-websocket-http2-callbacks-codec/gradle.lockfile +++ b/netty-websocket-http2-callbacks-codec/gradle.lockfile @@ -7,15 +7,15 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -com.jauntsdn.netty:netty-websocket-http1:1.0.0=compileClasspath -io.netty:netty-buffer:4.1.92.Final=compileClasspath -io.netty:netty-codec-http2:4.1.92.Final=compileClasspath -io.netty:netty-codec-http:4.1.92.Final=compileClasspath -io.netty:netty-codec:4.1.92.Final=compileClasspath -io.netty:netty-common:4.1.92.Final=compileClasspath -io.netty:netty-handler:4.1.92.Final=compileClasspath -io.netty:netty-resolver:4.1.92.Final=compileClasspath -io.netty:netty-transport-native-unix-common:4.1.92.Final=compileClasspath -io.netty:netty-transport:4.1.92.Final=compileClasspath +com.jauntsdn.netty:netty-websocket-http1:1.1.0=compileClasspath +io.netty:netty-buffer:4.1.93.Final=compileClasspath +io.netty:netty-codec-http2:4.1.93.Final=compileClasspath +io.netty:netty-codec-http:4.1.93.Final=compileClasspath +io.netty:netty-codec:4.1.93.Final=compileClasspath +io.netty:netty-common:4.1.93.Final=compileClasspath +io.netty:netty-handler:4.1.93.Final=compileClasspath +io.netty:netty-resolver:4.1.93.Final=compileClasspath +io.netty:netty-transport-native-unix-common:4.1.93.Final=compileClasspath +io.netty:netty-transport:4.1.93.Final=compileClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 empty=annotationProcessor diff --git a/netty-websocket-http2/gradle.lockfile b/netty-websocket-http2/gradle.lockfile index 42d5ba3..988f18a 100644 --- a/netty-websocket-http2/gradle.lockfile +++ b/netty-websocket-http2/gradle.lockfile @@ -9,17 +9,17 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6 com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6 com.google.guava:guava:22.0=googleJavaFormat1.6 com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6 -io.netty:netty-buffer:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-boringssl-static:2.0.60.Final=testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.60.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.92.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-tcnative-boringssl-static:2.0.61.Final=testRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.61.Final=testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.93.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath