Merge branch 'release/1.1.3'

jauntsdn · Feb 8, 2024 · 2ec09c7 · 2ec09c7
2 parents b9ec539 + 344f95d
commit 2ec09c7
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 53 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
-          distribution: 'zulu'
+          distribution: 'temurin'
       - name: Cache Gradle packages
         uses: actions/cache@v3
         with:

diff --git a/README.md b/README.md
@@ -42,21 +42,6 @@ java 9+
 ./perf_server_run.sh
 ./perf_client_run.sh
 ```
-java 8
-```
-./gradlew clean build installDist
-./perf_server_java8_run.sh
-./perf_client_run.sh
-```
-
-* non-encrypted
-
-| payload size | this codec, million messages | netty's codec, million messages |
-| :---         |     :---:      |         :---: |
-| 8            | 2.45 | 1.35 |
-| 64           | 2.35 | 1.25 |
-| 125          | 2.3  | 1.15 |
-| 1000         | 1.15 | 0.64 |
 
 * encrypted
 
@@ -72,8 +57,9 @@ java 8
 Library may be combined with [jauntsdn/websocket-http2](https://github.com/jauntsdn/netty-websocket-http2) using [http1 codec](https://github.com/jauntsdn/netty-websocket-http2/blob/develop/netty-websocket-http2-callbacks-codec/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/WebSocketCallbacksCodec.java) 
 
 for significantly improved per-core throughput [this codec perf-test](https://github.com/jauntsdn/netty-websocket-http2/tree/develop/netty-websocket-http2-perftest/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/perftest/callbackscodec), 
-[netty built-in codec perf-test](https://github.com/jauntsdn/netty-websocket-http2/tree/develop/netty-websocket-http2-perftest/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/perftest/messagecodec): 
-for 8, 125, 1000 byte payload frames over encrypted connection results are as follows:  
+[netty built-in codec perf-test](https://github.com/jauntsdn/netty-websocket-http2/tree/develop/netty-websocket-http2-perftest/src/main/java/com/jauntsdn/netty/handler/codec/http2/websocketx/perftest/messagecodec):  
+
+* encrypted
 
 | payload size | this codec, million msgs  | netty's codec, million msgs |
 | :---:        |     :---:     |        :---: |
@@ -144,7 +130,7 @@ server: `expectMasked: false, allowMaskMismatch: false, maxFramePayloadLength: 1
 
 client: `mask: false, allowMaskMismatch: false, maxFramePayloadLength: 125` 
 
-### testing
+### tests
 
 * WebSocket frames [integration test](https://github.com/jauntsdn/netty-websocket-http1/blob/develop/netty-websocket-http1-test/src/test/java/com/jauntsdn/netty/handler/codec/http/websocketx/WebSocketCodecTest.java): 
 control & data frames of all allowed sizes, jauntsdn/netty-websocket-http1 client, netty websocket server. 
@@ -173,7 +159,7 @@ repositories {
 }
 
 dependencies {
-    implementation "com.jauntsdn.netty:netty-websocket-http1:1.1.1"
+    implementation "com.jauntsdn.netty:netty-websocket-http1:1.1.2"
 }
 ```
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,21 @@
 group=com.jauntsdn.netty
-version=1.1.2
+version=1.1.3
 
 googleJavaFormatPluginVersion=0.9
 dependencyManagementPluginVersion=1.1.0
 gitPluginVersion=0.13.0
 osDetectorPluginVersion=1.7.3
 versionsPluginVersion=0.45.0
 
-nettyVersion=4.1.101.Final
+nettyVersion=4.1.106.Final
 nettyTcnativeVersion=2.0.62.Final
 hdrHistogramVersion=2.1.12
 slf4jVersion=1.7.36
-logbackVersion=1.2.12
+logbackVersion=1.2.13
 jsr305Version=3.0.2
 
-junitVersion=5.10.1
-assertjVersion=3.24.2
+junitVersion=5.10.2
+assertjVersion=3.25.3
 
 org.gradle.parallel=true
 org.gradle.configureondemand=true
diff --git a/netty-websocket-http1-test/gradle.lockfile b/netty-websocket-http1-test/gradle.lockfile
@@ -1,34 +1,34 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-ch.qos.logback:logback-classic:1.2.12=testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.12=testRuntimeClasspath
+ch.qos.logback:logback-classic:1.2.13=testRuntimeClasspath
+ch.qos.logback:logback-core:1.2.13=testRuntimeClasspath
 com.google.code.findbugs:jsr305:3.0.2=googleJavaFormat1.6
 com.google.errorprone:error_prone_annotations:2.0.18=googleJavaFormat1.6
 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.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-codec-http:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-codec:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-common:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-handler:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-resolver:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-transport-classes-epoll:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-transport-classes-kqueue:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-transport-native-unix-common:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-io.netty:netty-transport:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath
+io.netty:netty-buffer:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-codec-http:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-codec:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-common:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-handler:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-resolver:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-transport-classes-epoll:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-transport-classes-kqueue:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-transport-native-unix-common:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+io.netty:netty-transport:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
+net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testRuntimeClasspath
 org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath
+org.assertj:assertj-core:3.25.3=testCompileClasspath,testRuntimeClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
-org.junit.jupiter:junit-jupiter-api:5.10.1=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-params:5.10.1=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.10.1=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath
-org.junit:junit-bom:5.10.1=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-engine:5.10.2=testRuntimeClasspath
+org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
+org.junit.platform:junit-platform-engine:1.10.2=testRuntimeClasspath
+org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
 org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
 org.slf4j:slf4j-api:1.7.36=compileClasspath,testCompileClasspath,testRuntimeClasspath
 empty=annotationProcessor,testAnnotationProcessor
diff --git a/netty-websocket-http1/gradle.lockfile b/netty-websocket-http1/gradle.lockfile
@@ -7,13 +7,13 @@ 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.101.Final=compileClasspath
-io.netty:netty-codec-http:4.1.101.Final=compileClasspath
-io.netty:netty-codec:4.1.101.Final=compileClasspath
-io.netty:netty-common:4.1.101.Final=compileClasspath
-io.netty:netty-handler:4.1.101.Final=compileClasspath
-io.netty:netty-resolver:4.1.101.Final=compileClasspath
-io.netty:netty-transport-native-unix-common:4.1.101.Final=compileClasspath
-io.netty:netty-transport:4.1.101.Final=compileClasspath
+io.netty:netty-buffer:4.1.106.Final=compileClasspath
+io.netty:netty-codec-http:4.1.106.Final=compileClasspath
+io.netty:netty-codec:4.1.106.Final=compileClasspath
+io.netty:netty-common:4.1.106.Final=compileClasspath
+io.netty:netty-handler:4.1.106.Final=compileClasspath
+io.netty:netty-resolver:4.1.106.Final=compileClasspath
+io.netty:netty-transport-native-unix-common:4.1.106.Final=compileClasspath
+io.netty:netty-transport:4.1.106.Final=compileClasspath
 org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
 empty=annotationProcessor