diff --git a/gradle.properties b/gradle.properties index 4131209..0e8c535 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,19 @@ group = org.xbib name = netty-http -version = 4.1.50.3 +version = 4.1.51.0 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-legacy-macosx.version = 2.0.31.Final xbib.net.version = 2.1.0 -bouncycastle.version = 1.64 +bouncycastle.version = 1.66 reactivestreams.version = 1.0.2 xbib-guice.version = 4.0.4 reactivex.version = 1.3.8 -conscrypt.version = 2.2.1 -jackson.version = 2.11.0 -mockito.version = 3.3.3 -asciidoclet.version = 1.5.6 +conscrypt.version = 2.4.0 +javassist.version = 3.27.0-GA +jackson.version = 2.11.1 +mockito.version = 3.4.4 # uuhh, too many tests to update to jupiter in rx... junit.version = 5.6.2 junit4.version = 4.13 diff --git a/netty-http-client/build.gradle b/netty-http-client/build.gradle index 92c4019..3f92b9f 100644 --- a/netty-http-client/build.gradle +++ b/netty-http-client/build.gradle @@ -1,4 +1,3 @@ -import org.apache.tools.ant.taskdefs.condition.Os dependencies { api project(":netty-http-client-api") @@ -6,9 +5,5 @@ dependencies { testImplementation "com.fasterxml.jackson.core:jackson-databind:${project.property('jackson.version')}" testImplementation "org.conscrypt:conscrypt-openjdk-uber:${project.property('conscrypt.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-legacy-macosx.version')}" - } else if (Os.isFamily(Os.FAMILY_UNIX)) { - testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" - } + testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" } diff --git a/netty-http-server/build.gradle b/netty-http-server/build.gradle index d90f9c1..e887bcf 100644 --- a/netty-http-server/build.gradle +++ b/netty-http-server/build.gradle @@ -1,13 +1,9 @@ -import org.apache.tools.ant.taskdefs.condition.Os dependencies { api project(":netty-http-server-api") testImplementation project(":netty-http-client") testImplementation project(":netty-http-bouncycastle") + testRuntimeOnly "org.javassist:javassist:${project.property('javassist.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-legacy-macosx.version')}" - } else if (Os.isFamily(Os.FAMILY_UNIX)) { - testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" - } + testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" }