Skip to content

Commit c5cc179

Browse files
committed
Merge branch 'release/1.1.1'
2 parents 3400442 + b958cba commit c5cc179

File tree

11 files changed

+659
-48
lines changed

11 files changed

+659
-48
lines changed

.github/workflows/ci-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Build
22

33
on:
44
push:
5-
branches: [ "develop" ]
5+
branches: [ "develop", "feature/**" ]
66
pull_request:
77
branches: [ "develop" ]
88

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ repositories {
173173
}
174174
175175
dependencies {
176-
implementation "com.jauntsdn.netty:netty-websocket-http1:1.0.0"
176+
implementation "com.jauntsdn.netty:netty-websocket-http1:1.1.0"
177177
}
178178
```
179179

gradle.properties

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
group=com.jauntsdn.netty
2-
version=1.1.0
2+
version=1.1.1
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.93.Final
10+
nettyVersion=4.1.96.Final
1111
nettyTcnativeVersion=2.0.61.Final
1212
hdrHistogramVersion=2.1.12
1313
slf4jVersion=1.7.36
14-
logbackVersion=1.2.11
14+
logbackVersion=1.2.12
1515
jsr305Version=3.0.2
1616

17-
junitVersion=5.9.3
17+
junitVersion=5.10.0
1818
assertjVersion=3.24.2
1919

2020
org.gradle.parallel=true

netty-websocket-http1-perftest/build.gradle

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,33 @@ task clientScripts(type: CreateStartScripts) {
6161
startScripts.dependsOn serverScripts
6262
startScripts.dependsOn clientScripts
6363

64+
task runBulkServer(type: JavaExec) {
65+
classpath = sourceSets.main.runtimeClasspath
66+
mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.server.Main"
67+
}
68+
69+
task runBulkClient(type: JavaExec) {
70+
classpath = sourceSets.main.runtimeClasspath
71+
mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.client.Main"
72+
}
73+
74+
task serverBulkScripts(type: CreateStartScripts) {
75+
mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.server.Main"
76+
applicationName = "${project.name}-bulkserver"
77+
classpath = startScripts.classpath
78+
outputDir = startScripts.outputDir
79+
}
80+
81+
task clientBulkScripts(type: CreateStartScripts) {
82+
mainClass = "com.jauntsdn.netty.handler.codec.http.websocketx.perftest.bulkencoder.client.Main"
83+
applicationName = "${project.name}-bulkclient"
84+
classpath = startScripts.classpath
85+
outputDir = startScripts.outputDir
86+
}
87+
88+
startScripts.dependsOn serverBulkScripts
89+
startScripts.dependsOn clientBulkScripts
90+
6491
tasks.named("startScripts") {
6592
enabled = false
6693
}

0 commit comments

Comments
 (0)