Skip to content

Commit 34d254d

Browse files
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]>
1 parent c15a510 commit 34d254d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

apps/etterlatte-proxy/build.gradle.kts

+5-1
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,14 @@ dependencies {
2727
implementation(libs.cxf.logging)
2828
implementation(libs.cxf.jax.ws)
2929
implementation(libs.cxf.transports.http)
30-
implementation(libs.cxf.ws.security)
30+
implementation(libs.cxf.ws.security) {
31+
exclude("com.google.guava:guava")
32+
}
3133
implementation(libs.micrometer.prometheus)
3234
implementation(libs.jacksonDatatypejsr310)
3335

3436
testImplementation(libs.mockOauth2Server)
3537
testImplementation(libs.ktor.serverTests)
38+
39+
implementation(libs.guava)
3640
}

gradle/libs.versions.toml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.9.2" }
66
navfelles-token-version = "4.1.3"
77
ktor-version = "2.3.8"
88
jupiter-version = "5.10.2"
9-
cxf-version = "4.0.2"
9+
cxf-version = "4.0.3" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden
1010

1111
[libraries]
1212

@@ -66,4 +66,5 @@ mockk = { module = "io.mockk:mockk", version = "1.13.9" }
6666
cxf-logging = { module = "org.apache.cxf:cxf-rt-features-logging", version.ref = "cxf-version" }
6767
cxf-jax-ws = { module = "org.apache.cxf:cxf-rt-frontend-jaxws", version.ref = "cxf-version" }
6868
cxf-transports-http = { module = "org.apache.cxf:cxf-rt-transports-http", version.ref = "cxf-version" }
69-
cxf-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = "cxf-version" }
69+
cxf-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = "cxf-version" }
70+
guava = { module = "com.google.guava:guava", version = "32.1.2-jre"} # workaround for å omgå https://github.com/google/guava/issues/6657

0 commit comments

Comments
 (0)