Skip to content

Commit 2ec09c7

Browse files
mostroverkhovmostroverkhov
committed
Merge branch 'release/1.1.3'
2 parents b9ec539 + 344f95d commit 2ec09c7

File tree

5 files changed

+39
-53
lines changed

5 files changed

+39
-53
lines changed

Diff for: ‎.github/workflows/ci-build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/setup-java@v3
2626
with:
2727
java-version: ${{ matrix.jdk }}
28-
distribution: 'zulu'
28+
distribution: 'temurin'
2929
- name: Cache Gradle packages
3030
uses: actions/cache@v3
3131
with:

Diff for: ‎README.md

+5-19
Original file line numberDiff line numberDiff line change
@@ -42,21 +42,6 @@ java 9+
4242
./perf_server_run.sh
4343
./perf_client_run.sh
4444
```
45-
java 8
46-
```
47-
./gradlew clean build installDist
48-
./perf_server_java8_run.sh
49-
./perf_client_run.sh
50-
```
51-
52-
* non-encrypted
53-
54-
| payload size | this codec, million messages | netty's codec, million messages |
55-
| :--- | :---: | :---: |
56-
| 8 | 2.45 | 1.35 |
57-
| 64 | 2.35 | 1.25 |
58-
| 125 | 2.3 | 1.15 |
59-
| 1000 | 1.15 | 0.64 |
6045

6146
* encrypted
6247

@@ -72,8 +57,9 @@ java 8
7257
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)
7358

7459
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),
75-
[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):
76-
for 8, 125, 1000 byte payload frames over encrypted connection results are as follows:
60+
[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):
61+
62+
* encrypted
7763

7864
| payload size | this codec, million msgs | netty's codec, million msgs |
7965
| :---: | :---: | :---: |
@@ -144,7 +130,7 @@ server: `expectMasked: false, allowMaskMismatch: false, maxFramePayloadLength: 1
144130

145131
client: `mask: false, allowMaskMismatch: false, maxFramePayloadLength: 125`
146132

147-
### testing
133+
### tests
148134

149135
* 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):
150136
control & data frames of all allowed sizes, jauntsdn/netty-websocket-http1 client, netty websocket server.
@@ -173,7 +159,7 @@ repositories {
173159
}
174160
175161
dependencies {
176-
implementation "com.jauntsdn.netty:netty-websocket-http1:1.1.1"
162+
implementation "com.jauntsdn.netty:netty-websocket-http1:1.1.2"
177163
}
178164
```
179165

Diff for: ‎gradle.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
group=com.jauntsdn.netty
2-
version=1.1.2
2+
version=1.1.3
33

44
googleJavaFormatPluginVersion=0.9
55
dependencyManagementPluginVersion=1.1.0
66
gitPluginVersion=0.13.0
77
osDetectorPluginVersion=1.7.3
88
versionsPluginVersion=0.45.0
99

10-
nettyVersion=4.1.101.Final
10+
nettyVersion=4.1.106.Final
1111
nettyTcnativeVersion=2.0.62.Final
1212
hdrHistogramVersion=2.1.12
1313
slf4jVersion=1.7.36
14-
logbackVersion=1.2.12
14+
logbackVersion=1.2.13
1515
jsr305Version=3.0.2
1616

17-
junitVersion=5.10.1
18-
assertjVersion=3.24.2
17+
junitVersion=5.10.2
18+
assertjVersion=3.25.3
1919

2020
org.gradle.parallel=true
2121
org.gradle.configureondemand=true

Diff for: ‎netty-websocket-http1-test/gradle.lockfile

+20-20
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
ch.qos.logback:logback-classic:1.2.12=testRuntimeClasspath
5-
ch.qos.logback:logback-core:1.2.12=testRuntimeClasspath
4+
ch.qos.logback:logback-classic:1.2.13=testRuntimeClasspath
5+
ch.qos.logback:logback-core:1.2.13=testRuntimeClasspath
66
com.google.code.findbugs:jsr305:3.0.2=googleJavaFormat1.6
77
com.google.errorprone:error_prone_annotations:2.0.18=googleJavaFormat1.6
88
com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
99
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
1010
com.google.guava:guava:22.0=googleJavaFormat1.6
1111
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
12-
io.netty:netty-buffer:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
13-
io.netty:netty-codec-http:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
14-
io.netty:netty-codec:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
15-
io.netty:netty-common:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
16-
io.netty:netty-handler:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
17-
io.netty:netty-resolver:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
18-
io.netty:netty-transport-classes-epoll:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
19-
io.netty:netty-transport-classes-kqueue:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
20-
io.netty:netty-transport-native-unix-common:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
21-
io.netty:netty-transport:4.1.101.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
22-
net.bytebuddy:byte-buddy:1.12.21=testCompileClasspath,testRuntimeClasspath
12+
io.netty:netty-buffer:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
13+
io.netty:netty-codec-http:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
14+
io.netty:netty-codec:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
15+
io.netty:netty-common:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
16+
io.netty:netty-handler:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
17+
io.netty:netty-resolver:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
18+
io.netty:netty-transport-classes-epoll:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
19+
io.netty:netty-transport-classes-kqueue:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
20+
io.netty:netty-transport-native-unix-common:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
21+
io.netty:netty-transport:4.1.106.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath
22+
net.bytebuddy:byte-buddy:1.14.11=testCompileClasspath,testRuntimeClasspath
2323
org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
24-
org.assertj:assertj-core:3.24.2=testCompileClasspath,testRuntimeClasspath
24+
org.assertj:assertj-core:3.25.3=testCompileClasspath,testRuntimeClasspath
2525
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
26-
org.junit.jupiter:junit-jupiter-api:5.10.1=testCompileClasspath,testRuntimeClasspath
27-
org.junit.jupiter:junit-jupiter-engine:5.10.1=testRuntimeClasspath
28-
org.junit.jupiter:junit-jupiter-params:5.10.1=testCompileClasspath,testRuntimeClasspath
29-
org.junit.platform:junit-platform-commons:1.10.1=testCompileClasspath,testRuntimeClasspath
30-
org.junit.platform:junit-platform-engine:1.10.1=testRuntimeClasspath
31-
org.junit:junit-bom:5.10.1=testCompileClasspath,testRuntimeClasspath
26+
org.junit.jupiter:junit-jupiter-api:5.10.2=testCompileClasspath,testRuntimeClasspath
27+
org.junit.jupiter:junit-jupiter-engine:5.10.2=testRuntimeClasspath
28+
org.junit.jupiter:junit-jupiter-params:5.10.2=testCompileClasspath,testRuntimeClasspath
29+
org.junit.platform:junit-platform-commons:1.10.2=testCompileClasspath,testRuntimeClasspath
30+
org.junit.platform:junit-platform-engine:1.10.2=testRuntimeClasspath
31+
org.junit:junit-bom:5.10.2=testCompileClasspath,testRuntimeClasspath
3232
org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath
3333
org.slf4j:slf4j-api:1.7.36=compileClasspath,testCompileClasspath,testRuntimeClasspath
3434
empty=annotationProcessor,testAnnotationProcessor

Diff for: ‎netty-websocket-http1/gradle.lockfile

+8-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ com.google.errorprone:javac-shaded:9+181-r4173-1=googleJavaFormat1.6
77
com.google.googlejavaformat:google-java-format:1.6=googleJavaFormat1.6
88
com.google.guava:guava:22.0=googleJavaFormat1.6
99
com.google.j2objc:j2objc-annotations:1.1=googleJavaFormat1.6
10-
io.netty:netty-buffer:4.1.101.Final=compileClasspath
11-
io.netty:netty-codec-http:4.1.101.Final=compileClasspath
12-
io.netty:netty-codec:4.1.101.Final=compileClasspath
13-
io.netty:netty-common:4.1.101.Final=compileClasspath
14-
io.netty:netty-handler:4.1.101.Final=compileClasspath
15-
io.netty:netty-resolver:4.1.101.Final=compileClasspath
16-
io.netty:netty-transport-native-unix-common:4.1.101.Final=compileClasspath
17-
io.netty:netty-transport:4.1.101.Final=compileClasspath
10+
io.netty:netty-buffer:4.1.106.Final=compileClasspath
11+
io.netty:netty-codec-http:4.1.106.Final=compileClasspath
12+
io.netty:netty-codec:4.1.106.Final=compileClasspath
13+
io.netty:netty-common:4.1.106.Final=compileClasspath
14+
io.netty:netty-handler:4.1.106.Final=compileClasspath
15+
io.netty:netty-resolver:4.1.106.Final=compileClasspath
16+
io.netty:netty-transport-native-unix-common:4.1.106.Final=compileClasspath
17+
io.netty:netty-transport:4.1.106.Final=compileClasspath
1818
org.codehaus.mojo:animal-sniffer-annotations:1.14=googleJavaFormat1.6
1919
empty=annotationProcessor

0 commit comments

Comments
 (0)