diff --git a/apps/etterlatte-proxy/build.gradle.kts b/apps/etterlatte-proxy/build.gradle.kts index c4a33ecf..3425c870 100644 --- a/apps/etterlatte-proxy/build.gradle.kts +++ b/apps/etterlatte-proxy/build.gradle.kts @@ -31,6 +31,7 @@ dependencies { implementation(libs.cxf.ws.security) { exclude("com.google.guava:guava") exclude("org.bouncycastle:bcpkix-jdk18on") + exclude("org.bouncycastle:bcprov-jdk18on") exclude("org.eclipse.angus:angus-core") exclude("org.eclipse.angus:angus-mail") } @@ -44,6 +45,7 @@ dependencies { // Vi bør kunne ta bort alle disse og exclude-lista for neste CXF-versjon implementation(libs.guava) implementation(libs.bcpkix) + implementation(libs.bcprov) implementation(libs.angus.core) implementation(libs.angus.mail) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3627c7e6..cb463311 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ navfelles-token-version = "4.1.4" ktor-version = "2.3.9" jupiter-version = "5.10.2" cxf-version = "4.0.4" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden -bcpkix-version = "1.74" +bcpkix-version = "1.78" angus-version = "1.1.0" [libraries] @@ -69,5 +69,6 @@ cxf-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = #Cxf-workarounds guava = { module = "com.google.guava:guava", version = "32.1.2-jre"} # workaround for å omgå https://github.com/google/guava/issues/6657 bcpkix = { module = "org.bouncycastle:bcpkix-jdk18on", version.ref = "bcpkix-version"} +bcprov = { module = "org.bouncycastle:bcprov-jdk18on", version.ref = "bcpkix-version"} angus-core = { module = "org.eclipse.angus:angus-core", version.ref="angus-version"} angus-mail = { module = "org.eclipse.angus:angus-mail", version.ref="angus-version"} \ No newline at end of file