From 92fcd3f6b13046b4dae17c3f4c2dca93cc981b22 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Sat, 20 Aug 2022 10:24:34 +0300 Subject: [PATCH 1/2] next development iteration --- README.md | 4 ++-- gradle.properties | 2 +- .../codec/http2/websocketx/example/channelclient/Main.java | 2 +- .../codec/http2/websocketx/example/lwsclient/Main.java | 2 +- .../http2/websocketx/example/multiprotocolclient/Main.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index af306f1..4b5e468 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ EchoWebSocketHandler http1WebSocketHandler = new EchoWebSocketHandler(); Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel); Http2Headers headers = - new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.4"); + new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.5"); ChannelFuture handshakeFuture = /*http1 websocket handler*/ handShaker.handshake("/echo", headers, new EchoWebSocketHandler()); @@ -270,7 +270,7 @@ repositories { } dependencies { - implementation 'com.jauntsdn.netty:netty-websocket-http2:1.1.4' + implementation 'com.jauntsdn.netty:netty-websocket-http2:1.1.5' } ``` diff --git a/gradle.properties b/gradle.properties index 9644871..40def7d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group=com.jauntsdn.netty -version=1.1.5 +version=1.1.6 googleJavaFormatPluginVersion=0.9 dependencyManagementPluginVersion=1.0.13.RELEASE diff --git a/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/channelclient/Main.java b/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/channelclient/Main.java index e708019..500137f 100644 --- a/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/channelclient/Main.java +++ b/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/channelclient/Main.java @@ -93,7 +93,7 @@ protected void initChannel(SocketChannel ch) { Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel); Http2Headers headers = - new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.4"); + new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.5"); ChannelFuture handshake = handShaker.handshake("/echo", "echo.jauntsdn.com", headers, new EchoWebSocketHandler()); diff --git a/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/lwsclient/Main.java b/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/lwsclient/Main.java index d5b0941..3105f53 100644 --- a/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/lwsclient/Main.java +++ b/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/lwsclient/Main.java @@ -90,7 +90,7 @@ protected void initChannel(SocketChannel ch) { Http2WebSocketClientHandshaker handShaker = Http2WebSocketClientHandshaker.create(channel); Http2Headers headers = - new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.4"); + new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.5"); ChannelFuture handshake = handShaker.handshake( "/", "dumb-increment-protocol", headers, new WebSocketDumbIncrementHandler()); diff --git a/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/multiprotocolclient/Main.java b/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/multiprotocolclient/Main.java index c076456..af2796f 100644 --- a/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/multiprotocolclient/Main.java +++ b/netty-websocket-http2-example/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/example/multiprotocolclient/Main.java @@ -100,7 +100,7 @@ protected void initChannel(SocketChannel ch) { Http2WebSocketClientHandshaker.create(http2Channel); Http2Headers http2Headers = - new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.4"); + new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.1.5"); ChannelFuture http2WebSocketHandshake = http2WebSocketHandShaker.handshake( "/echo", "echo.jauntsdn.com", http2Headers, echoWebSocketHandler); @@ -119,7 +119,7 @@ protected void initChannel(SocketChannel ch) { TimeUnit.MILLISECONDS); HttpHeaders http1Headers = - new DefaultHttpHeaders().set("user-agent", "jauntsdn-websocket-http1-client/1.1.4"); + new DefaultHttpHeaders().set("user-agent", "jauntsdn-websocket-http1-client/1.1.5"); Http1WebSocketHandshaker http1WebSocketHandshaker = new Http1WebSocketHandshaker( From 2c43fdbdbbce009fa45f7b0f160c9edd891d4802 Mon Sep 17 00:00:00 2001 From: Maksym Ostroverkhov Date: Tue, 27 Sep 2022 13:00:08 +0300 Subject: [PATCH 2/2] update dependencies --- gradle.properties | 6 ++-- netty-websocket-http2-example/gradle.lockfile | 18 +++++------ .../gradle.lockfile | 22 +++++++------- netty-websocket-http2/gradle.lockfile | 30 +++++++++---------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/gradle.properties b/gradle.properties index 40def7d..18bddaf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,17 +4,17 @@ version=1.1.6 googleJavaFormatPluginVersion=0.9 dependencyManagementPluginVersion=1.0.13.RELEASE gitPluginVersion=0.13.0 -osDetectorPluginVersion=1.7.0 +osDetectorPluginVersion=1.7.1 versionsPluginVersion=0.42.0 -nettyVersion=4.1.79.Final +nettyVersion=4.1.82.Final nettyTcnativeVersion=2.0.54.Final hdrHistogramVersion=2.1.12 slf4jVersion=1.7.36 logbackVersion=1.2.11 jsr305Version=3.0.2 -junitVersion=5.9.0 +junitVersion=5.9.1 assertjVersion=3.23.1 org.gradle.parallel=true diff --git a/netty-websocket-http2-example/gradle.lockfile b/netty-websocket-http2-example/gradle.lockfile index f54071d..1a974f7 100644 --- a/netty-websocket-http2-example/gradle.lockfile +++ b/netty-websocket-http2-example/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.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec-http2:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec-http:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-common:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-resolver:4.1.79.Final=compileClasspath,runtimeClasspath +io.netty:netty-buffer:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec-http2:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec-http:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-common:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-handler:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-resolver:4.1.82.Final=compileClasspath,runtimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.54.Final=runtimeClasspath io.netty:netty-tcnative-classes:2.0.54.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-transport:4.1.79.Final=compileClasspath,runtimeClasspath +io.netty:netty-transport-native-unix-common:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-transport:4.1.82.Final=compileClasspath,runtimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath empty=annotationProcessor diff --git a/netty-websocket-http2-perftest/gradle.lockfile b/netty-websocket-http2-perftest/gradle.lockfile index 0b813f0..443d485 100644 --- a/netty-websocket-http2-perftest/gradle.lockfile +++ b/netty-websocket-http2-perftest/gradle.lockfile @@ -9,19 +9,19 @@ 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.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec-http2:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec-http:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-codec:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-common:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-handler:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-resolver:4.1.79.Final=compileClasspath,runtimeClasspath +io.netty:netty-buffer:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec-http2:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec-http:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-codec:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-common:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-handler:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-resolver:4.1.82.Final=compileClasspath,runtimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.54.Final=runtimeClasspath io.netty:netty-tcnative-classes:2.0.54.Final=runtimeClasspath -io.netty:netty-transport-classes-epoll:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-transport-native-epoll:4.1.79.Final=runtimeClasspath -io.netty:netty-transport-native-unix-common:4.1.79.Final=compileClasspath,runtimeClasspath -io.netty:netty-transport:4.1.79.Final=compileClasspath,runtimeClasspath +io.netty:netty-transport-classes-epoll:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-transport-native-epoll:4.1.82.Final=runtimeClasspath +io.netty:netty-transport-native-unix-common:4.1.82.Final=compileClasspath,runtimeClasspath +io.netty:netty-transport:4.1.82.Final=compileClasspath,runtimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 org.hdrhistogram:HdrHistogram:2.1.12=compileClasspath,runtimeClasspath org.slf4j:slf4j-api:1.7.36=compileClasspath,runtimeClasspath diff --git a/netty-websocket-http2/gradle.lockfile b/netty-websocket-http2/gradle.lockfile index d812c22..a6cb03d 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.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http2:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec-http:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-codec:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-common:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-handler:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-resolver:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-tcnative-boringssl-static:2.0.54.Final=testRuntimeClasspath io.netty:netty-tcnative-classes:2.0.54.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.1.79.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.82.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.12.10=testCompileClasspath,testRuntimeClasspath org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath org.assertj:assertj-core:3.23.1=testCompileClasspath,testRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6 -org.junit.jupiter:junit-jupiter-api:5.9.0=testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.9.0=testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.9.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.9.0=testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.9.0=testRuntimeClasspath -org.junit:junit-bom:5.9.0=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.9.1=testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.9.1=testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.9.1=testRuntimeClasspath +org.junit:junit-bom:5.9.1=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.36=compileClasspath,testCompileClasspath,testRuntimeClasspath empty=annotationProcessor,testAnnotationProcessor