bouncycastle 1.71, use OpenSSL on Fedora

This commit is contained in:
Jörg Prante 2022-05-19 22:09:24 +02:00
parent bf7e6da722
commit 7db113b9c8
3 changed files with 14 additions and 4 deletions

View file

@ -1,12 +1,12 @@
group = org.xbib group = org.xbib
name = netty-http name = netty-http
version = 4.1.76.0 version = 4.1.76.1
org.gradle.warning.mode = ALL org.gradle.warning.mode = ALL
gradle.wrapper.version = 7.3.2 gradle.wrapper.version = 7.3.2
netty.version = 4.1.76.Final netty.version = 4.1.76.Final
tcnative.version = 2.0.51.Final tcnative.version = 2.0.51.Final
bouncycastle.version = 1.71 bouncycastle.version = 1.70
conscrypt.version = 2.5.2 conscrypt.version = 2.5.2
javassist.version = 3.28.0-GA javassist.version = 3.28.0-GA
jackson.version = 2.12.6 jackson.version = 2.12.6

View file

@ -6,5 +6,10 @@ 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 (System.properties.get('os.name').toLowerCase().contains('linux') &&
System.properties.get('os.arch').toLowerCase().contains('amd64')) {
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}:linux-x86_64"
} else {
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
} }
}

View file

@ -6,7 +6,12 @@ dependencies {
testImplementation project(":netty-http-bouncycastle") testImplementation project(":netty-http-bouncycastle")
testRuntimeOnly "org.javassist:javassist:${project.property('javassist.version')}" 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 (System.properties.get('os.name').toLowerCase().contains('linux') &&
System.properties.get('os.arch').toLowerCase().contains('amd64')) {
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}:linux-x86_64"
} else {
testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}" testRuntimeOnly "io.netty:netty-tcnative-boringssl-static:${project.property('tcnative.version')}"
}
testRuntimeOnly project(":netty-http-epoll") testRuntimeOnly project(":netty-http-epoll")
testRuntimeOnly project(":netty-http-kqueue") testRuntimeOnly project(":netty-http-kqueue")
} }