update to Netty 4.1.51

This commit is contained in:
Jörg Prante 2020-07-22 12:14:43 +02:00
parent ad3fd4fcac
commit e329bfff46
3 changed files with 10 additions and 20 deletions

View file

@ -1,20 +1,19 @@
group = org.xbib group = org.xbib
name = netty-http name = netty-http
version = 4.1.50.3 version = 4.1.51.0
gradle.wrapper.version = 6.4.1 gradle.wrapper.version = 6.4.1
netty.version = 4.1.50.Final netty.version = 4.1.51.Final
tcnative.version = 2.0.31.Final tcnative.version = 2.0.31.Final
tcnative-legacy-macosx.version = 2.0.31.Final
xbib.net.version = 2.1.0 xbib.net.version = 2.1.0
bouncycastle.version = 1.64 bouncycastle.version = 1.66
reactivestreams.version = 1.0.2 reactivestreams.version = 1.0.2
xbib-guice.version = 4.0.4 xbib-guice.version = 4.0.4
reactivex.version = 1.3.8 reactivex.version = 1.3.8
conscrypt.version = 2.2.1 conscrypt.version = 2.4.0
jackson.version = 2.11.0 javassist.version = 3.27.0-GA
mockito.version = 3.3.3 jackson.version = 2.11.1
asciidoclet.version = 1.5.6 mockito.version = 3.4.4
# uuhh, too many tests to update to jupiter in rx... # uuhh, too many tests to update to jupiter in rx...
junit.version = 5.6.2 junit.version = 5.6.2
junit4.version = 4.13 junit4.version = 4.13

View file

@ -1,4 +1,3 @@
import org.apache.tools.ant.taskdefs.condition.Os
dependencies { dependencies {
api project(":netty-http-client-api") api project(":netty-http-client-api")
@ -6,9 +5,5 @@ dependencies {
testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}" testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}"
testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}" testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.version')}"
testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}" testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}"
if (Os.isFamily(Os.FAMILY_MAC)) { testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative-legacy-macosx.version')}"
} else if (Os.isFamily(Os.FAMILY_UNIX)) {
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
}
} }

View file

@ -1,13 +1,9 @@
import org.apache.tools.ant.taskdefs.condition.Os
dependencies { dependencies {
api project(":netty-http-server-api") api project(":netty-http-server-api")
testImplementation project(":netty-http-client") testImplementation project(":netty-http-client")
testImplementation project(":netty-http-bouncycastle") testImplementation project(":netty-http-bouncycastle")
testRuntimeOnly "org.javassist:javassist:${project.property('javassist.version')}"
testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}" testRuntimeOnly "org.bouncycastle:bcpkix-jdk15on:${project.property('bouncycastle.version')}"
if (Os.isFamily(Os.FAMILY_MAC)) { testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative-legacy-macosx.version')}"
} else if (Os.isFamily(Os.FAMILY_UNIX)) {
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
}
} }