Merge branch 'release/1.2.4'

jauntsdn · Jul 30, 2023 · f52c769 · f52c769
2 parents 039841c + b6615d5
commit f52c769
Show file tree

Hide file tree

Showing 14 changed files with 995 additions and 249 deletions.
diff --git 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.2");
+   new DefaultHttp2Headers().set("user-agent", "jauntsdn-websocket-http2-client/1.2.3");
 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.2'
+    implementation 'com.jauntsdn.netty:netty-websocket-http2:1.2.3'
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,21 @@
 group=com.jauntsdn.netty
-version=1.2.3
+version=1.2.4
 
 googleJavaFormatPluginVersion=0.9
 dependencyManagementPluginVersion=1.1.0
 gitPluginVersion=0.13.0
 osDetectorPluginVersion=1.7.3
 versionsPluginVersion=0.45.0
 
-nettyVersion=4.1.93.Final
+nettyVersion=4.1.96.Final
 jauntNettyWebsocketHttp1=1.1.0
 nettyTcnativeVersion=2.0.61.Final
 hdrHistogramVersion=2.1.12
 slf4jVersion=1.7.36
-logbackVersion=1.2.11
+logbackVersion=1.2.12
 jsr305Version=3.0.2
 
-junitVersion=5.9.3
+junitVersion=5.10.0
 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
@@ -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.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
+io.netty:netty-buffer:4.1.96.Final=compileClasspath
+io.netty:netty-codec-http2:4.1.96.Final=compileClasspath
+io.netty:netty-codec-http:4.1.96.Final=compileClasspath
+io.netty:netty-codec:4.1.96.Final=compileClasspath
+io.netty:netty-common:4.1.96.Final=compileClasspath
+io.netty:netty-handler:4.1.96.Final=compileClasspath
+io.netty:netty-resolver:4.1.96.Final=compileClasspath
+io.netty:netty-transport-native-unix-common:4.1.96.Final=compileClasspath
+io.netty:netty-transport:4.1.96.Final=compileClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor
diff --git a/netty-websocket-http2-perftest/build.gradle b/netty-websocket-http2-perftest/build.gradle
@@ -57,6 +57,16 @@ task runClientCallbacks(type: JavaExec) {
     mainClass = "com.jauntsdn.netty.handler.codec.http2.websocketx.perftest.callbackscodec.client.Main"
 }
 
+task runServerBulk(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "com.jauntsdn.netty.handler.codec.http2.websocketx.perftest.bulkcodec.server.Main"
+}
+
+task runClientBulk(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "com.jauntsdn.netty.handler.codec.http2.websocketx.perftest.bulkcodec.client.Main"
+}
+
 task serverMessagesScripts(type: CreateStartScripts) {
     mainClass = "com.jauntsdn.netty.handler.codec.http2.websocketx.perftest.messagecodec.server.Main"
     applicationName = "${project.name}-messages-server"
@@ -85,10 +95,26 @@ task clientCallbacksScripts(type: CreateStartScripts) {
     outputDir = startScripts.outputDir
 }
 
+task serverBulkScripts(type: CreateStartScripts) {
+    mainClass = "com.jauntsdn.netty.handler.codec.http2.websocketx.perftest.bulkcodec.server.Main"
+    applicationName = "${project.name}-bulk-server"
+    classpath = startScripts.classpath
+    outputDir = startScripts.outputDir
+}
+
+task clientBulkScripts(type: CreateStartScripts) {
+    mainClass = "com.jauntsdn.netty.handler.codec.http2.websocketx.perftest.bulkcodec.client.Main"
+    applicationName = "${project.name}-bulk-client"
+    classpath = startScripts.classpath
+    outputDir = startScripts.outputDir
+}
+
 startScripts.dependsOn serverMessagesScripts
 startScripts.dependsOn clientMessagesScripts
 startScripts.dependsOn serverCallbacksScripts
 startScripts.dependsOn clientCallbacksScripts
+startScripts.dependsOn serverBulkScripts
+startScripts.dependsOn clientBulkScripts
 
 tasks.named("startScripts") {
     enabled = false