Merge branch 'release/1.1.1'

.github/workflows/ci-build.yml

@@ -2,7 +2,7 @@ name: Build
 
 on:
   push:
-    branches: [ "develop" ]
+    branches: [ "develop", "feature/**" ]
   pull_request:
     branches: [ "develop" ]
 

README.md

@@ -173,7 +173,7 @@ repositories {
 }
 
 dependencies {
-    implementation "com.jauntsdn.netty:netty-websocket-http1:1.0.0"
+    implementation "com.jauntsdn.netty:netty-websocket-http1:1.1.0"
 }
 ```
 

gradle.properties

@@ -1,20 +1,20 @@
 group=com.jauntsdn.netty
-version=1.1.0
+version=1.1.1
 
 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
 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

netty-websocket-http1-perftest/build.gradle

@@ -61,6 +61,33 @@ task clientScripts(type: CreateStartScripts) {
 startScripts.dependsOn serverScripts
 startScripts.dependsOn clientScripts
 
+task runBulkServer(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.server.Main"
+}
+
+task runBulkClient(type: JavaExec) {
+    classpath = sourceSets.main.runtimeClasspath
+    mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.client.Main"
+}
+
+task serverBulkScripts(type: CreateStartScripts) {
+    mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.server.Main"
+    applicationName = "${project.name}-bulkserver"
+    classpath = startScripts.classpath
+    outputDir = startScripts.outputDir
+}
+
+task clientBulkScripts(type: CreateStartScripts) {
+    mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.client.Main"
+    applicationName = "${project.name}-bulkclient"
+    classpath = startScripts.classpath
+    outputDir = startScripts.outputDir
+}
+
+startScripts.dependsOn serverBulkScripts
+startScripts.dependsOn clientBulkScripts
+
 tasks.named("startScripts") {
     enabled = false
 }