From 5a1b462b3941b5c2a0a23f868e9fe81f25da5784 Mon Sep 17 00:00:00 2001
From: Jan Ullrich <jan.ullrich@codecentric.de>
Date: Fri, 15 Dec 2023 13:57:00 +0000
Subject: [PATCH] fix: version conflicts due to spring boot upgrade

---
 services/gateway/build.gradle    | 1 -
 services/habit/build.gradle      | 1 -
 services/report/build.gradle.kts | 6 ++++--
 services/track/build.gradle      | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/services/gateway/build.gradle b/services/gateway/build.gradle
index 2f5ec36d..3b9f3719 100644
--- a/services/gateway/build.gradle
+++ b/services/gateway/build.gradle
@@ -45,7 +45,6 @@ ext {
     springCloudVersion = '2022.0.4'
     versions = [
             restAssured   : '5.3.2',
-            junitJupiter  : '5.8.0',
     ]
 }
 // override the version the spring boot dependency-management plugin would enforce
diff --git a/services/habit/build.gradle b/services/habit/build.gradle
index 409ea00a..494c8fdd 100644
--- a/services/habit/build.gradle
+++ b/services/habit/build.gradle
@@ -68,7 +68,6 @@ configurations {
 ext {
     versions = [
             restAssured       : '5.3.2',
-            junitJupiter      : '5.8.0',
             chaosMonkey       : '3.0.2',
             testcontainers    : '1.19.0',
             postgresql        : '42.6.0',
diff --git a/services/report/build.gradle.kts b/services/report/build.gradle.kts
index 72c5fd4b..2c01ef6e 100644
--- a/services/report/build.gradle.kts
+++ b/services/report/build.gradle.kts
@@ -46,7 +46,7 @@ repositories {
 extra["chaosMonkeyVersion"] = "3.0.2"
 extra["mockkVersion"] = "1.13.8"
 extra["springMockkVersion"] = "4.0.2"
-extra["wiremockVersion"] = "3.0.1"
+extra["wiremockVersion"] = "3.3.1"
 extra["moschiVersion"] = "1.15.0"
 
 dependencies {
@@ -74,7 +74,9 @@ dependencies {
 
     testImplementation("io.mockk:mockk:${property("mockkVersion")}")
     testImplementation("com.ninja-squad:springmockk:${property("springMockkVersion")}")
-    testImplementation("com.github.tomakehurst:wiremock:${property("wiremockVersion")}")
+    // the standalone dependency avoids problems with jetty dependencies
+    // https://github.com/wiremock/wiremock/issues/2317#issuecomment-1695804622
+    testImplementation("org.wiremock:wiremock-standalone:${property("wiremockVersion")}")
 }
 
 tasks.withType<Test> {
diff --git a/services/track/build.gradle b/services/track/build.gradle
index 9a6a3e68..a78815df 100644
--- a/services/track/build.gradle
+++ b/services/track/build.gradle
@@ -67,7 +67,6 @@ configurations {
 ext {
     versions = [
             restAssured       : '5.3.2',
-            junitJupiter      : '5.8.0',
             chaosMonkey       : '3.0.2',
             testcontainers    : '1.19.0',
             reflections       : '0.10.2',