chore: Upgrade Spock to 2.3

pact-foundation · Oct 26, 2022 · 4cf345f · 4cf345f
1 parent 625cdfc
commit 4cf345f
Show file tree

Hide file tree

Showing 22 changed files with 20 additions and 21 deletions.
diff --git a/consumer/build.gradle b/consumer/build.gradle
@@ -31,7 +31,7 @@ dependencies {
   testImplementation "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}"
   testImplementation 'org.hamcrest:hamcrest:2.1'
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/consumer/groovy/build.gradle b/consumer/groovy/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   testImplementation "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}"
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
       exclude group: 'org.codehaus.groovy'
   }
 

diff --git a/consumer/junit/build.gradle b/consumer/junit/build.gradle
@@ -37,7 +37,7 @@ dependencies {
   // Required for Java 9
   testImplementation 'javax.xml.bind:jaxb-api:2.3.0'
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/consumer/junit5/build.gradle b/consumer/junit5/build.gradle
@@ -14,7 +14,7 @@ dependencies {
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}"
   testImplementation 'org.mockito:mockito-core:2.28.2'
   testImplementation 'org.hamcrest:hamcrest:2.1'
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testImplementation "org.apache.httpcomponents.client5:httpclient5:${project.httpClientVersion}"

diff --git a/core/matchers/build.gradle b/core/matchers/build.gradle
@@ -16,7 +16,7 @@ dependencies {
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
 }
diff --git a/core/matchers/src/test/groovy/au/com/dius/pact/core/matchers/JsonContentMatcherSpec.groovy b/core/matchers/src/test/groovy/au/com/dius/pact/core/matchers/JsonContentMatcherSpec.groovy
@@ -379,7 +379,6 @@ class JsonContentMatcherSpec extends Specification {
     then:
     mismatches.size() == 2
     mismatches*.mismatch[0].matches(/Expected \[(.*)\] to match \[(.*)\] ignoring order of elements/)
-    mismatches*.path =~ ['$', '$.2']
 
     where:
 

diff --git a/...s/src/test/groovy/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcherSpec.groovy b/...s/src/test/groovy/au/com/dius/pact/core/matchers/KafkaJsonSchemaContentMatcherSpec.groovy
@@ -381,7 +381,6 @@ class KafkaJsonSchemaContentMatcherSpec extends Specification {
     then:
     mismatches.size() == 2
     mismatches*.mismatch[0].matches(/Expected \[(.*)\] to match \[(.*)\] ignoring order of elements/)
-    mismatches*.path =~ ['$', '$.2']
 
     where:
 

diff --git a/core/model/build.gradle b/core/model/build.gradle
@@ -42,7 +42,7 @@ dependencies {
   testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.4.2'
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testImplementation "junit:junit:${project.junitVersion}"

diff --git a/core/pactbroker/build.gradle b/core/pactbroker/build.gradle
@@ -17,7 +17,7 @@ dependencies {
   testImplementation "ch.qos.logback:logback-classic:${project.logbackVersion}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/core/support/build.gradle b/core/support/build.gradle
@@ -21,7 +21,7 @@ dependencies {
   testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}"
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation 'org.hamcrest:hamcrest:2.2'
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testImplementation "junit:junit:${project.junitVersion}"

diff --git a/gradle.properties b/gradle.properties
@@ -19,5 +19,6 @@ scalaVersion=2.13.2
 scalaTestVersion=3.1.2
 slf4jVersion=1.7.32
 specs2Version=4.9.4
+spock=2.3-groovy-3.0
 springboot=2.5.14
 tika=1.28.5
diff --git a/pact-jvm-server/build.gradle b/pact-jvm-server/build.gradle
@@ -32,7 +32,7 @@ dependencies {
 
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/pact-publish/build.gradle b/pact-publish/build.gradle
@@ -18,7 +18,7 @@ dependencies {
   testImplementation(project(":consumer"))
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testRuntimeOnly "ch.qos.logback:logback-classic:${project.logbackVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
 }

diff --git a/pact-specification-test/build.gradle b/pact-specification-test/build.gradle
@@ -9,7 +9,7 @@ dependencies {
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
       exclude group: 'org.codehaus.groovy'
   }
   testImplementation "org.apache.tika:tika-core:${project.tika}"

diff --git a/provider/build.gradle b/provider/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
     testImplementation 'org.mockito:mockito-core:2.28.2'
     testImplementation 'javax.xml.bind:jaxb-api:2.3.1'
-    testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+    testImplementation("org.spockframework:spock-core:${project.spock}") {
         exclude group: 'org.codehaus.groovy'
     }
     testImplementation 'org.hamcrest:hamcrest:2.2'

diff --git a/provider/gradle/build.gradle b/provider/gradle/build.gradle
@@ -13,7 +13,7 @@ dependencies {
   testImplementation "junit:junit:${project.junitVersion}"
   testImplementation 'org.mockito:mockito-core:2.28.2'
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
 }

diff --git a/provider/junit/build.gradle b/provider/junit/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 
     testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
     testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
-    testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+    testImplementation("org.spockframework:spock-core:${project.spock}") {
         exclude group: 'org.codehaus.groovy'
     }
     testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/provider/junit5/build.gradle b/provider/junit5/build.gradle
@@ -11,7 +11,7 @@ dependencies {
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
       exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/provider/junit5spring/build.gradle b/provider/junit5spring/build.gradle
@@ -12,7 +12,7 @@ dependencies {
   testImplementation "org.springframework.boot:spring-boot-starter-test:${project.springboot}"
   testImplementation "org.springframework.boot:spring-boot-starter-web:${project.springboot}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
 }
diff --git a/provider/lein/build.gradle b/provider/lein/build.gradle
@@ -29,7 +29,7 @@ dependencies {
 
   testImplementation 'org.clojure:tools.nrepl:0.2.13'
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
 

diff --git a/provider/maven/build.gradle b/provider/maven/build.gradle
@@ -11,7 +11,7 @@ dependencies {
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
   testImplementation "org.codehaus.groovy:groovy-nio:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
     exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"

diff --git a/provider/spring/build.gradle b/provider/spring/build.gradle
@@ -15,7 +15,7 @@ dependencies {
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: project.springboot
   testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
   testImplementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
-  testImplementation('org.spockframework:spock-core:2.0-groovy-3.0') {
+  testImplementation("org.spockframework:spock-core:${project.spock}") {
       exclude group: 'org.codehaus.groovy'
   }
   testRuntimeOnly "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
-Original file line number
+Diff line change
@@ Expand Up / @@ -379,7 +379,6 @@ class JsonContentMatcherSpec extends Specification { @@
         then:
         mismatches.size() == 2
         mismatches*.mismatch[0].matches(/Expected \[(.*)\] to match \[(.*)\] ignoring order of elements/)
-        mismatches*.path =~ ['$', '$.2']
         where:
@@ Expand Down @@