From 2bcfabbfdeac4ffe142607bcfd3faf974b95b2ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Jan 2024 13:00:01 +0000 Subject: [PATCH 1/4] 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] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 010a3680..3728ec80 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ cutterslade-analyze = { id = "ca.cutterslade.analyze", version = "1.9.1" } navfelles-token-version = "3.2.0" ktor-version = "2.3.7" jupiter-version = "5.10.1" -cxf-version = "4.0.2" +cxf-version = "4.0.3" [libraries] From 7c2fac4fbbf9f16a992c090290f36d2e6a4f2fa8 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Tue, 16 Jan 2024 16:15:18 +0100 Subject: [PATCH 2/4] =?UTF-8?q?Workaround=20for=20=C3=A5=20fikse=20bygget?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/etterlatte-proxy/build.gradle.kts | 2 ++ gradle/libs.versions.toml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/etterlatte-proxy/build.gradle.kts b/apps/etterlatte-proxy/build.gradle.kts index e60fa534..4935a16c 100644 --- a/apps/etterlatte-proxy/build.gradle.kts +++ b/apps/etterlatte-proxy/build.gradle.kts @@ -33,4 +33,6 @@ dependencies { testImplementation(libs.mockOauth2Server) testImplementation(libs.ktor.serverTests) + + implementation(libs.guava) } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3728ec80..cdce2312 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -66,4 +66,5 @@ mockk = { module = "io.mockk:mockk", version = "1.13.8" } 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" } \ No newline at end of file +cxf-ws-security = { module = "org.apache.cxf:cxf-rt-ws-security", version.ref = "cxf-version" } +guava = { module = "com.google.guava:guava", version = "32.1.1-jre"} # workaround for å omgå https://github.com/google/guava/issues/6657 \ No newline at end of file From 57b10dd3847e9d9413fb70d9f2d92ffff3e0ad10 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 21 Feb 2024 08:59:14 +0100 Subject: [PATCH 3/4] Litt meir ordentleg variant --- apps/etterlatte-proxy/build.gradle.kts | 4 +++- gradle/libs.versions.toml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/etterlatte-proxy/build.gradle.kts b/apps/etterlatte-proxy/build.gradle.kts index 4935a16c..4cc82aec 100644 --- a/apps/etterlatte-proxy/build.gradle.kts +++ b/apps/etterlatte-proxy/build.gradle.kts @@ -27,7 +27,9 @@ 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) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4d1336ce..2a66d945 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -67,4 +67,4 @@ cxf-logging = { module = "org.apache.cxf:cxf-rt-features-logging", version.ref = 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" } -guava = { module = "com.google.guava:guava", version = "32.1.1-jre"} # workaround for å omgå https://github.com/google/guava/issues/6657 \ No newline at end of file +guava = { module = "com.google.guava:guava", version = "32.1.2-jre"} # workaround for å omgå https://github.com/google/guava/issues/6657 \ No newline at end of file From dae07511ae907851ccffe8e399b1b4d159e95f17 Mon Sep 17 00:00:00 2001 From: Mads Opheim Date: Wed, 21 Feb 2024 09:09:27 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Kommentar=20for=20=C3=A5=20minne=20oss=20p?= =?UTF-8?q?=C3=A5=20workarounden=20til=20seinare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 2a66d945..3604685d 100644 --- 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.3" +cxf-version = "4.0.3" # Obs: Når vi oppgraderer denne, bør vi også kunne rydde bort guava og guava-workarounden [libraries]