Fjerner workarounds

Author: henrikg

apps/etterlatte-proxy/build.gradle.kts

@@ -23,23 +23,9 @@ dependencies {
     implementation(libs.cxf.logging)
     implementation(libs.cxf.jax.ws)
     implementation(libs.cxf.transports.http)
-    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")
-    }
+    implementation(libs.cxf.ws.security)
     implementation(libs.micrometer.prometheus)
 
     testImplementation(libs.mockOauth2Server)
     testImplementation(libs.ktor.serverTests)
-
-    // Avhengigheter fra patching av sårbarheter i Apache CXF.
-    // 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)
 }

gradle/libs.versions.toml

@@ -1,9 +1,7 @@
 [versions]
 ktor-version = "2.3.13"
 jupiter-version = "5.11.4"
-cxf-version = "4.1.0" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden
-bcpkix-version = "1.80"
-angus-version = "1.1.0"
+cxf-version = "4.1.0"
 jackson-version = "2.18.2"
 
 [libraries]
@@ -59,11 +57,4 @@ test-kotest-assertionscore = { module = "io.kotest:kotest-assertions-core", vers
 cxf-logging = { module = "org.apache.cxf:cxf-rt-features-logging", version.ref = "cxf-version" }
 cxf-jax-ws = { module = "org.apache.cxf:cxf-rt-frontend-jaxws", version.ref = "cxf-version" }
 cxf-transports-http = { module = "org.apache.cxf:cxf-rt-transports-http", version.ref = "cxf-version" }
-cxf-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = "cxf-version" }
-
-#Cxf-workarounds
-guava = { module = "com.google.guava:guava", version = "33.4.0-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"}
+cxf-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = "cxf-version" }