Bump cxf-version from 4.0.2 to 4.0.3 (#163)

* Bump cxf-version from 4.0.2 to 4.0.3 Bumps `cxf-version` from 4.0.2 to 4.0.3. Updates `org.apache.cxf:cxf-rt-features-logging` from 4.0.2 to 4.0.3 Updates `org.apache.cxf:cxf-rt-frontend-jaxws` from 4.0.2 to 4.0.3 Updates `org.apache.cxf:cxf-rt-transports-http` from 4.0.2 to 4.0.3 Updates `org.apache.cxf:cxf-rt-ws-security` from 4.0.2 to 4.0.3 --- updated-dependencies: - dependency-name: org.apache.cxf:cxf-rt-features-logging dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-frontend-jaxws dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-transports-http dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.cxf:cxf-rt-ws-security dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Workaround for å fikse bygget * Litt meir ordentleg variant * Kommentar for å minne oss på workarounden til seinare --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mads Opheim <[email protected]>
navikt · Feb 21, 2024 · 34d254d · 34d254d
1 parent c15a510
commit 34d254d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/apps/etterlatte-proxy/build.gradle.kts b/apps/etterlatte-proxy/build.gradle.kts
@@ -27,10 +27,14 @@ dependencies {
     implementation(libs.cxf.logging)
     implementation(libs.cxf.jax.ws)
     implementation(libs.cxf.transports.http)
-    implementation(libs.cxf.ws.security)
+    implementation(libs.cxf.ws.security) {
+        exclude("com.google.guava:guava")
+    }
     implementation(libs.micrometer.prometheus)
     implementation(libs.jacksonDatatypejsr310)
 
     testImplementation(libs.mockOauth2Server)
     testImplementation(libs.ktor.serverTests)
+
+    implementation(libs.guava)
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.9.2" }
 navfelles-token-version = "4.1.3"
 ktor-version = "2.3.8"
 jupiter-version = "5.10.2"
-cxf-version = "4.0.2"
+cxf-version = "4.0.3" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden
 
 [libraries]
 
@@ -66,4 +66,5 @@ mockk = { module = "io.mockk:mockk", version = "1.13.9" }
 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-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = "cxf-version" }
+guava = { module = "com.google.guava:guava", version = "32.1.2-jre"} # workaround for å omgå https://github.com/google/guava/issues/6657