#315: prevent dependency leaks

Author: tommysitu

build.gradle

@@ -31,30 +31,31 @@ dependencies {
         jacksonVersion = '2.17.2'
     }
 
-    compile 'com.squareup.okhttp3:okhttp:4.12.0'
-    compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
-    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"
-    compile "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion"
-    compile 'org.apache.commons:commons-lang3:3.12.0'
-    compile 'org.zeroturnaround:zt-exec:1.12'
-    compile 'org.slf4j:slf4j-api:1.7.36'
-    compile 'ch.qos.logback:logback-classic:1.5.13'
+    implementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    implementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:$jacksonVersion"
+    implementation 'org.apache.commons:commons-lang3:3.12.0'
+    implementation 'org.zeroturnaround:zt-exec:1.12'
+    implementation 'org.slf4j:slf4j-api:1.7.36'
     compileOnly 'junit:junit:4.13.2'
-    testCompile 'com.sun.jersey:jersey-client:1.19.4'
-    testCompile 'com.google.guava:guava:33.0.0-jre'
-    testCompile 'org.springframework:spring-web:5.3.20'
-    testCompile 'org.apache.httpcomponents:httpclient:4.5.13'
-    testCompile 'org.assertj:assertj-core:3.22.0'
-    testCompile 'net.javacrumbs.json-unit:json-unit:2.32.0'
-    testCompile 'net.javacrumbs.json-unit:json-unit-fluent:2.28.0'
-    testCompile 'org.eclipse.jetty:jetty-server:9.3.11.v20160721'
-    testCompile 'org.skyscreamer:jsonassert:1.5.0'
-    testCompile 'org.mockito:mockito-core:4.2.0'
-    testCompile 'org.powermock:powermock-module-junit4:2.0.9'
-    testCompile 'com.github.stefanbirkner:system-rules:1.19.0'
-    testCompile 'io.projectreactor.ipc:reactor-netty:0.7.15.RELEASE'
-    testCompile 'io.projectreactor:reactor-test:3.2.3.RELEASE'
-    testCompile 'org.awaitility:awaitility:4.1.1'
+    testImplementation 'ch.qos.logback:logback-classic:1.5.13'
+    testImplementation 'com.sun.jersey:jersey-client:1.19.4'
+    testImplementation 'com.google.guava:guava:33.0.0-jre'
+    testImplementation 'org.springframework:spring-web:5.3.20'
+    testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
+    testImplementation 'org.assertj:assertj-core:3.22.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit:2.32.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit-fluent:2.28.0'
+    testImplementation 'org.eclipse.jetty:jetty-server:9.3.11.v20160721'
+    testImplementation 'org.skyscreamer:jsonassert:1.5.0'
+    testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.9'
+    testImplementation 'com.github.stefanbirkner:system-rules:1.19.0'
+    testImplementation 'io.projectreactor.ipc:reactor-netty:0.7.15.RELEASE'
+    testImplementation 'io.projectreactor:reactor-test:3.2.3.RELEASE'
+    testImplementation 'org.awaitility:awaitility:4.1.1'
+
 }
 
 allprojects { subproj ->

junit5/build.gradle

@@ -17,27 +17,31 @@ repositories {
 dependencies {
 
     ext {
+        jacksonVersion = '2.17.2'
         junitJupiterVersion = '5.10.2'
         junitPlatformVersion = '1.10.2'
     }
 
     compileOnly "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
     compileOnly "org.junit.platform:junit-platform-commons:$junitPlatformVersion"
-    compile(rootProject) {
+    implementation(rootProject) {
         exclude group: 'junit'
     }
 
-    testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-    testCompile "org.junit.platform:junit-platform-testkit:$junitPlatformVersion"
-    testCompile 'org.mockito:mockito-core:4.2.0'
-    testCompile 'org.assertj:assertj-core:3.21.0'
-    testCompile 'net.javacrumbs.json-unit:json-unit:2.28.0'
-    testCompile 'net.javacrumbs.json-unit:json-unit-fluent:2.28.0'
+    testImplementation 'com.squareup.okhttp3:okhttp:4.12.0'
+    testImplementation "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+    testImplementation "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
+    testImplementation "org.junit.platform:junit-platform-testkit:$junitPlatformVersion"
+    testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.assertj:assertj-core:3.21.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit:2.28.0'
+    testImplementation 'net.javacrumbs.json-unit:json-unit-fluent:2.28.0'
+
 
     // Only needed to run tests in an IntelliJ IDEA that bundles an older version
-    testRuntime("org.junit.platform:junit-platform-launcher:$junitPlatformVersion")
-    testRuntime("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
-    testRuntime("org.junit.vintage:junit-vintage-engine:$junitJupiterVersion")
+    testRuntimeOnly "org.junit.platform:junit-platform-launcher:$junitPlatformVersion"
+    testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
+    testRuntimeOnly "org.junit.vintage:junit-vintage-engine:$junitJupiterVersion"
 
 }
 

junit5/src/main/java/io/specto/hoverfly/junit5/HoverflyExtensionUtils.java

@@ -7,11 +7,11 @@
 import io.specto.hoverfly.junit5.api.HoverflyConfig;
 import io.specto.hoverfly.junit5.api.HoverflySimulate;
 import io.specto.hoverfly.junit5.api.UnsetSimulationPreprocessor;
-import org.apache.commons.lang3.StringUtils;
 import org.junit.platform.commons.util.ReflectionUtils;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import org.junit.platform.commons.util.StringUtils;
 
 import static io.specto.hoverfly.junit.core.HoverflyConfig.localConfigs;
 import static io.specto.hoverfly.junit.core.HoverflyConfig.remoteConfigs;

junit5/src/test/java/io/specto/hoverfly/junit5/HoverflyCustomCaptureTest.java

@@ -1,6 +1,5 @@
 package io.specto.hoverfly.junit5;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.specto.hoverfly.junit.core.Hoverfly;
 import io.specto.hoverfly.junit.core.HoverflyMode;
 import io.specto.hoverfly.junit.core.ObjectMapperFactory;