Merge branch 'master' into upgrade-dependencies

Author: ericbeland

browserup-proxy-core/build.gradle

@@ -84,7 +84,7 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:4.9.0"
     implementation 'org.zeroturnaround:zt-exec:1.12'
     testImplementation 'junit:junit:4.13.1'
-    testImplementation 'org.codehaus.groovy:groovy-all:3.0.6'
+    testImplementation 'org.codehaus.groovy:groovy-all:3.0.7'
     testImplementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
     testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
     testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
@@ -94,8 +94,8 @@ dependencies {
     testImplementation "org.eclipse.jetty:jetty-servlets:${jettyVersion}"
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
-    testImplementation 'org.mockito:mockito-core:3.6.0'
+    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.26.3'
+    testImplementation 'org.mockito:mockito-core:3.6.28'
     testImplementation 'org.seleniumhq.selenium:selenium-firefox-driver:3.141.59'
     testImplementation 'org.apache.httpcomponents:httpclient:4.5.13'
 }

browserup-proxy-mitm/build.gradle

@@ -80,8 +80,8 @@ dependencies {
     testImplementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
     testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
     testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
-    testImplementation 'org.codehaus.groovy:groovy-all:3.0.6'
+    testImplementation 'org.codehaus.groovy:groovy-all:3.0.7'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.mockito:mockito-core:3.6.0'
+    testImplementation 'org.mockito:mockito-core:3.6.28'
 }

browserup-proxy-rest/build.gradle

@@ -96,12 +96,13 @@ dependencies {
     testImplementation "org.apache.logging.log4j:log4j-api:${log4jVersion}"
     testImplementation "org.apache.logging.log4j:log4j-core:${log4jVersion}"
     testImplementation "org.apache.logging.log4j:log4j-slf4j-impl:${log4jVersion}"
-    testImplementation 'org.codehaus.groovy:groovy-all:3.0.6'
+    testImplementation 'org.codehaus.groovy:groovy-all:3.0.7'
     testImplementation 'org.codehaus.groovy.modules.http-builder:http-builder:0.7.2'
     testImplementation 'org.hamcrest:hamcrest:2.2'
     testImplementation 'org.hamcrest:hamcrest-library:2.2'
-    testImplementation 'org.mockito:mockito-core:3.6.0'
-    testImplementation 'org.seleniumhq.selenium:selenium-api:3.141.59'
-    testImplementation 'org.awaitility:awaitility:4.0.3'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
+
+    testImplementation 'org.mockito:mockito-core:3.6.28'
+    testImplementation 'org.seleniumhq.selenium:selenium-api:3.4.0'
+    testImplementation 'org.awaitility:awaitility:4.0.2'
+    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.24.1'
 }