chore: Upgrade all test dependencies with reported CSVs #1626

consumer/build.gradle

@@ -36,5 +36,5 @@ dependencies {
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
   testRuntimeOnly 'org.objenesis:objenesis:3.1'
-  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
 }

consumer/groovy/build.gradle

@@ -5,7 +5,7 @@ dependencies {
   implementation "org.apache.httpcomponents.client5:httpclient5:${project.httpClientVersion}"
   implementation 'com.github.mifmif:generex:1.0.2'
   implementation "org.apache.commons:commons-lang3:${project.commonsLang3Version}"
-  implementation 'org.apache.commons:commons-collections4:4.4'
+  implementation "org.apache.commons:commons-collections4:${project.commonsCollections4}"
 
   testImplementation "junit:junit:${project.junitVersion}"
   testImplementation "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}",

consumer/junit/build.gradle

@@ -23,12 +23,12 @@ dependencies {
 
   testImplementation "ch.qos.logback:logback-core:${project.logbackVersion}",
     "ch.qos.logback:logback-classic:${project.logbackVersion}",
-    'org.apache.commons:commons-collections4:4.1'
+    "org.apache.commons:commons-collections4:${project.commonsCollections4}"
   implementation "org.apache.httpcomponents.client5:httpclient5:${project.httpClientVersion}"
   implementation "org.apache.httpcomponents.client5:httpclient5-fluent:${project.httpClientVersion}"
-  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.4'
-  testImplementation('com.jayway.restassured:rest-assured:2.9.0') {
-    exclude group: 'org.codehaus.groovy'
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.13.4.2'
+  testImplementation('io.rest-assured:rest-assured:5.2.0') {
+    exclude group: 'org.apache.groovy'
   }
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"

consumer/junit/src/test/java/au/com/dius/pact/consumer/junit/Defect215Test.java

@@ -1,12 +1,10 @@
 package au.com.dius.pact.consumer.junit;
 
 import au.com.dius.pact.consumer.dsl.PactDslWithProvider;
-import au.com.dius.pact.consumer.junit.PactProviderRule;
-import au.com.dius.pact.consumer.junit.PactVerification;
 import au.com.dius.pact.core.model.RequestResponsePact;
 import au.com.dius.pact.core.model.annotations.Pact;
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.http.ContentType;
+import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 import org.hamcrest.Matchers;
 import org.json.JSONObject;
 import org.junit.Rule;

consumer/junit/src/test/java/au/com/dius/pact/consumer/junit/pactproviderrule/PactProviderHttpsKeystoreTest.java

@@ -10,14 +10,14 @@
 
 import au.com.dius.pact.consumer.junit.PactProviderRule;
 import au.com.dius.pact.core.model.RequestResponsePact;
+import io.restassured.RestAssured;
 import org.hamcrest.Matchers;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.jayway.restassured.RestAssured;
 import au.com.dius.pact.core.model.annotations.Pact;
 import au.com.dius.pact.consumer.junit.PactVerification;
 import au.com.dius.pact.consumer.dsl.PactDslWithProvider;

consumer/junit5/build.gradle

@@ -18,8 +18,10 @@ dependencies {
     exclude group: 'org.codehaus.groovy'
   }
   testImplementation "org.apache.httpcomponents.client5:httpclient5:${project.httpClientVersion}"
-  testImplementation 'com.jayway.restassured:rest-assured:2.9.0'
-  testImplementation 'org.apache.commons:commons-collections4:4.4'
+  testImplementation('io.rest-assured:rest-assured:5.2.0') {
+    exclude group: 'org.apache.groovy'
+  }
+  testImplementation "org.apache.commons:commons-collections4:${project.commonsCollections4}"
 
   // JAX-B dependencies for JDK 9+
   testImplementation "jakarta.xml.bind:jakarta.xml.bind-api:2.3.2"

consumer/junit5/src/test/java/au/com/dius/pact/consumer/junit5/Issue1176Test.java

@@ -5,20 +5,20 @@
 import au.com.dius.pact.core.model.PactSpecVersion;
 import au.com.dius.pact.core.model.RequestResponsePact;
 import au.com.dius.pact.core.model.annotations.Pact;
-import com.jayway.restassured.builder.RequestSpecBuilder;
-import com.jayway.restassured.filter.log.RequestLoggingFilter;
-import com.jayway.restassured.filter.log.ResponseLoggingFilter;
-import com.jayway.restassured.http.ContentType;
-import com.jayway.restassured.response.Response;
-import com.jayway.restassured.specification.RequestSpecification;
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.filter.log.RequestLoggingFilter;
+import io.restassured.filter.log.ResponseLoggingFilter;
+import io.restassured.http.ContentType;
+import io.restassured.response.Response;
+import io.restassured.specification.RequestSpecification;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import java.util.Collections;
 import java.util.Map;
 
-import static com.jayway.restassured.RestAssured.given;
+import static io.restassured.RestAssured.given;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 

core/model/build.gradle

@@ -23,7 +23,7 @@ dependencies {
   api project(":core:support")
   api project(":core:pactbroker")
 
-  implementation 'org.apache.commons:commons-collections4:4.4'
+  implementation "org.apache.commons:commons-collections4:${project.commonsCollections4}"
   implementation 'com.github.mifmif:generex:1.0.2'
   implementation 'javax.mail:mail:1.5.0-b01'
   implementation "org.jetbrains.kotlin:kotlin-reflect:${project.kotlinVersion}"
@@ -47,7 +47,7 @@ dependencies {
   }
   testImplementation "junit:junit:${project.junitVersion}"
   testImplementation 'org.hamcrest:hamcrest:2.1'
-  testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.32'
+  testImplementation 'com.amazonaws:aws-java-sdk-s3:1.12.232'
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
 
   antlr "org.antlr:antlr4:4.11.1"

gradle.properties

@@ -1,5 +1,6 @@
 bytebuddyVersion=1.10.8
 commonsLang3Version=3.12.0
+commonsCollections4=4.4
 groovyVersion=3.0.9
 guavaVersion=30.1.1-jre
 httpBuilderVersion=1.0.4
@@ -22,3 +23,4 @@ specs2Version=4.9.4
 spock=2.3-groovy-3.0
 springboot=2.5.14
 tika=1.28.5
+wiremock=2.34.0

provider/build.gradle

@@ -19,13 +19,13 @@ dependencies {
     implementation 'com.github.ajalt:mordant:1.2.1'
     implementation 'com.vladsch.flexmark:flexmark:0.62.2'
     implementation 'com.vladsch.flexmark:flexmark-ext-tables:0.62.2'
-    implementation 'org.apache.commons:commons-collections4:4.4'
+    implementation "org.apache.commons:commons-collections4:${project.commonsCollections4}"
     implementation "org.apache.commons:commons-lang3:${project.commonsLang3Version}"
     implementation "io.pact.plugin.driver:core:${project.pluginDriverVersion}"
 
     testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
     testRuntimeOnly "ch.qos.logback:logback-classic:${project.logbackVersion}"
-    testImplementation 'io.dropwizard:dropwizard-testing:1.3.7'
+    testImplementation 'io.dropwizard:dropwizard-testing:2.1.3'
     testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
     testImplementation 'org.mockito:mockito-core:2.28.2'

provider/junit/build.gradle

@@ -11,10 +11,10 @@ dependencies {
     implementation 'javax.mail:mail:1.5.0-b01'
     implementation 'commons-io:commons-io:2.11.0'
 
-    testImplementation 'com.github.rest-driver:rest-client-driver:1.1.45'
-    testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
+    testImplementation 'com.github.rest-driver:rest-client-driver:2.0.1'
+    testImplementation "com.github.tomakehurst:wiremock-jre8:${project.wiremock}"
     testImplementation "ch.qos.logback:logback-classic:${project.logbackVersion}"
-    testImplementation 'org.apache.commons:commons-collections4:4.1'
+    testImplementation "org.apache.commons:commons-collections4:${project.commonsCollections4}"
 
     // Required for Java 9
     testImplementation 'javax.xml.bind:jaxb-api:2.3.0'

provider/junit/src/test/java/au/com/dius/pact/provider/junit/CustomAnnotationContractTest.java

@@ -1,17 +1,11 @@
 package au.com.dius.pact.provider.junit;
 
 import au.com.dius.pact.provider.junit.target.HttpTarget;
-import au.com.dius.pact.provider.junitsupport.Provider;
 import au.com.dius.pact.provider.junitsupport.State;
-import au.com.dius.pact.provider.junitsupport.TargetRequestFilter;
-import au.com.dius.pact.provider.junitsupport.VerificationReports;
-import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
 import au.com.dius.pact.provider.junitsupport.target.Target;
 import au.com.dius.pact.provider.junitsupport.target.TestTarget;
 import com.github.restdriver.clientdriver.ClientDriverRule;
-import org.apache.http.HttpRequest;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.ClassRule;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;

provider/junit/src/test/java/au/com/dius/pact/provider/junit/InheritedAnnotationsTest.java

@@ -8,7 +8,7 @@
 import au.com.dius.pact.provider.junitsupport.loader.PactBroker;
 import au.com.dius.pact.provider.junitsupport.loader.PactFilter;
 import au.com.dius.pact.provider.junitsupport.loader.PactFolder;
-import org.apache.http.HttpRequest;
+import org.apache.hc.core5.http.HttpRequest;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -43,7 +43,7 @@ public void hasNoData() {
         }
 
         @TargetRequestFilter
-        public void requestFilter(HttpRequest  httpRequest) {
+        public void requestFilter(HttpRequest httpRequest) {
 
         }
     }

provider/junit5/build.gradle

@@ -6,7 +6,7 @@ dependencies {
 
   testRuntimeOnly "ch.qos.logback:logback-classic:${project.logbackVersion}"
   testImplementation 'ru.lanwen.wiremock:wiremock-junit5:1.3.1'
-  testImplementation 'com.github.tomakehurst:wiremock:2.27.2'
+  testImplementation "com.github.tomakehurst:wiremock-jre8:${project.wiremock}"
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}"
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
@@ -18,5 +18,5 @@ dependencies {
   testImplementation('com.github.javafaker:javafaker:1.0.2') {
     exclude group: 'org.yaml'
   }
-  testImplementation 'org.yaml:snakeyaml:1.23'
+  testImplementation 'org.yaml:snakeyaml:1.33'
 }

provider/spring/build.gradle

@@ -10,7 +10,7 @@ dependencies {
   runtimeOnly group: 'org.synchronoss.cloud', name: 'nio-multipart-parser', version: '1.1.0'
   implementation "org.apache.commons:commons-lang3:${project.commonsLang3Version}"
   implementation 'javax.mail:mail:1.5.0-b01'
-  implementation 'org.apache.commons:commons-collections4:4.4'
+  implementation "org.apache.commons:commons-collections4:${project.commonsCollections4}"
 
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: project.springboot
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"