Skip to content

Commit

Permalink
Merge branch 'release/1.1.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
mostroverkhov committed Sep 27, 2022
2 parents 59c7625 + 2c43fdb commit 273cbd0
Show file tree
Hide file tree
Showing 8 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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'
}
```

Expand Down
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
group=com.jauntsdn.netty
version=1.1.5
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
Expand Down
18 changes: 9 additions & 9 deletions netty-websocket-http2-example/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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(
Expand Down
22 changes: 11 additions & 11 deletions netty-websocket-http2-perftest/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
30 changes: 15 additions & 15 deletions netty-websocket-http2/gradle.lockfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 273cbd0

Please sign in to comment.