Skip to content

Commit 19b975e

Browse files
author
Ronald Holshausen
committedMar 7, 2020
chore: set consumer/pact-jvm-consumer-groovy to use Groovy 2.5 #1011
·
4_7_0-beta_04_0_7
1 parent 981943c commit 19b975e

File tree

23 files changed

+159
-71
lines changed

23 files changed

+159
-71
lines changed
 

Diff for: ‎build.gradle

+1-21
Original file line numberDiff line numberDiff line change
@@ -71,27 +71,7 @@ subprojects {
7171
mavenCentral()
7272
jcenter()
7373
}
74-
75-
// Gradle plugin needs to be compiled against the version of Groovy that is bundled with Gradle (currently 2.5.4)
76-
if (name != 'pact-jvm-provider-gradle') {
77-
dependencies {
78-
testCompile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
79-
testRuntime "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}"
80-
testCompile 'org.hamcrest:hamcrest:2.1'
81-
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
82-
exclude group: 'org.codehaus.groovy'
83-
}
84-
testRuntime 'net.bytebuddy:byte-buddy:1.9.16'
85-
constraints {
86-
testRuntime 'net.bytebuddy:byte-buddy-agent:1.9.16'
87-
}
88-
testRuntime 'org.objenesis:objenesis:3.1'
89-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
90-
91-
groovyDoc "org.codehaus.groovy:groovy-all:${project.groovyVersion}"
92-
}
93-
}
94-
74+
9575
compileTestGroovy {
9676
classpath = classpath.plus(files(compileTestKotlin.destinationDir))
9777
dependsOn compileTestKotlin

Diff for: ‎consumer/pact-jvm-consumer-groovy/build.gradle

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
dependencies {
2-
api project(path: ":consumer:pact-jvm-consumer", configuration: 'default')
3-
compile "org.codehaus.groovy:groovy:${project.groovyVersion}"
4-
compile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
2+
api project(path: ":consumer:pact-jvm-consumer", configuration: 'default')
3+
compile "org.codehaus.groovy:groovy:${project.groovy2Version}"
4+
compile "org.codehaus.groovy:groovy-json:${project.groovy2Version}"
55

6-
testCompile "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}",
7-
"ch.qos.logback:logback-classic:${project.logbackVersion}"
8-
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
9-
testCompile "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}"
10-
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
6+
testCompile "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}",
7+
"ch.qos.logback:logback-classic:${project.logbackVersion}"
8+
testCompile "org.codehaus.groovy:groovy-xml:${project.groovy2Version}"
9+
testCompile "org.codehaus.groovy:groovy-dateutil:${project.groovy2Version}"
10+
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
11+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-2.5') {
12+
exclude group: 'org.codehaus.groovy'
13+
}
14+
15+
groovyDoc "org.codehaus.groovy:groovy-all:${project.groovy2Version}"
1116
}

Diff for: ‎consumer/pact-jvm-consumer-java8/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
dependencies {
22
api project(path: ":consumer:pact-jvm-consumer", configuration: 'default')
33

4+
testCompile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
45
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
56
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
7+
testCompile "junit:junit:${project.junitVersion}"
8+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
9+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
10+
exclude group: 'org.codehaus.groovy'
11+
}
612
}

Diff for: ‎consumer/pact-jvm-consumer-junit/build.gradle

+8-3
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,18 @@ dependencies {
1818
testCompile('com.jayway.restassured:rest-assured:2.9.0') {
1919
exclude group: 'org.codehaus.groovy'
2020
}
21-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
22-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
23-
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
21+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
22+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
23+
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}:indy"
2424
testCompile "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}"
2525
// Required for Java 9
2626
testCompile 'javax.xml.bind:jaxb-api:2.3.0'
2727
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
28+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
29+
exclude group: 'org.codehaus.groovy'
30+
}
31+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
32+
testRuntime 'org.objenesis:objenesis:3.1'
2833

2934
testCompile 'org.clojure:clojure:1.10.0',
3035
'http-kit:http-kit:2.3.0'

Diff for: ‎consumer/pact-jvm-consumer-junit5/build.gradle

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,14 @@ dependencies {
66
testCompile "ch.qos.logback:logback-core:${project.logbackVersion}",
77
"ch.qos.logback:logback-classic:${project.logbackVersion}"
88
testCompile "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}"
9-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
10-
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
9+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
10+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
11+
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}:indy"
1112
testCompile 'org.apache.commons:commons-io:1.3.2'
1213
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1314
testCompile project(path: ":consumer:pact-jvm-consumer-java8", configuration: 'default')
15+
testCompile 'org.hamcrest:hamcrest:2.1'
16+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
17+
exclude group: 'org.codehaus.groovy'
18+
}
1419
}

Diff for: ‎consumer/pact-jvm-consumer-specs2/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,8 @@ dependencies {
1313
"ch.qos.logback:logback-core:${project.logbackVersion}",
1414
"ch.qos.logback:logback-classic:${project.logbackVersion}"
1515
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
16+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
17+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
18+
exclude group: 'org.codehaus.groovy'
19+
}
1620
}

Diff for: ‎consumer/pact-jvm-consumer/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,16 @@ dependencies {
1313
implementation 'io.ktor:ktor-server-netty:1.2.6'
1414
implementation "io.ktor:ktor-network-tls:1.2.6"
1515

16+
testCompile "junit:junit:${project.junitVersion}"
1617
testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}"
1718
testCompile 'org.cthul:cthul-matchers:1.1.0'
1819
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1920
testCompile "org.junit.jupiter:junit-jupiter-params:${project.junit5Version}"
21+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
2022
testCompile "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}:indy"
21-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
23+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
24+
testCompile 'org.hamcrest:hamcrest:2.1'
25+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
26+
exclude group: 'org.codehaus.groovy'
27+
}
2228
}

Diff for: ‎core/matchers/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,8 @@ dependencies {
99

1010
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
1111
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
12+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
13+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
14+
exclude group: 'org.codehaus.groovy'
15+
}
1216
}

Diff for: ‎core/model/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,15 @@ dependencies {
3131
testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}"
3232
testCompile "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}"
3333
testRuntime project(path: project.path, configuration: 'testJars')
34-
testCompile "org.codehaus.groovy:groovy-datetime:${project.groovyVersion}"
34+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
35+
testCompile "org.codehaus.groovy:groovy-datetime:${project.groovyVersion}:indy"
3536
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
3637
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.3.2'
38+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
39+
exclude group: 'org.codehaus.groovy'
40+
}
41+
testCompile "junit:junit:${project.junitVersion}"
42+
testCompile 'org.hamcrest:hamcrest:2.1'
3743
}
3844

3945
compileGroovy {

Diff for: ‎core/pact-broker/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,10 @@ dependencies {
1313

1414
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1515
testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}"
16-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
16+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
17+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
18+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
19+
exclude group: 'org.codehaus.groovy'
20+
}
21+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
1722
}

Diff for: ‎core/support/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,14 @@ dependencies {
1414
}
1515
api "org.apache.httpcomponents:httpclient:${project.httpClientVersion}"
1616

17-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
17+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
1818
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1919
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.3.2'
20+
testCompile 'org.hamcrest:hamcrest:2.1'
21+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
22+
exclude group: 'org.codehaus.groovy'
23+
}
24+
testCompile "junit:junit:${project.junitVersion}"
2025

2126
antlr "org.antlr:antlr4:4.7.2"
2227
}

Diff for: ‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
groovyVersion=3.0.0
1+
groovyVersion=3.0.1
2+
groovy2Version=2.5.10
23
kotlinVersion=1.3.60
34
httpBuilderVersion=1.0.4
45
commonsLang3Version=3.4
@@ -16,3 +17,4 @@ mavenPluginPluginVersion=3.5
1617
guavaVersion=18.0
1718
junit5Version=5.5.2
1819
gsonVersion=2.8.6
20+
bytebuddyVersion=1.10.8

Diff for: ‎pact-jvm-server/build.gradle

+13-8
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,22 @@ plugins {
1818
mainClassName = 'au.com.dius.pact.server.Server'
1919

2020
dependencies {
21-
compile project(":consumer:pact-jvm-consumer")
22-
compile "ch.qos.logback:logback-core:${project.logbackVersion}",
23-
"ch.qos.logback:logback-classic:${project.logbackVersion}",
24-
"com.github.scopt:scopt_2.12:3.5.0"
25-
compile("com.typesafe.scala-logging:scala-logging_2.12:3.7.2") {
26-
exclude group: 'org.scala-lang'
27-
}
28-
compile "ws.unfiltered:unfiltered-netty-server_2.12:0.9.1"
21+
compile project(":consumer:pact-jvm-consumer")
22+
compile "ch.qos.logback:logback-core:${project.logbackVersion}",
23+
"ch.qos.logback:logback-classic:${project.logbackVersion}",
24+
"com.github.scopt:scopt_2.12:3.5.0"
25+
compile("com.typesafe.scala-logging:scala-logging_2.12:3.7.2") {
26+
exclude group: 'org.scala-lang'
27+
}
28+
compile "ws.unfiltered:unfiltered-netty-server_2.12:0.9.1"
2929
implementation 'org.apache.commons:commons-io:1.3.2'
3030

3131
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
32+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
33+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
34+
exclude group: 'org.codehaus.groovy'
35+
}
36+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
3237
}
3338

3439
jar {

Diff for: ‎pact-publish/build.gradle

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ dependencies {
1212
testCompile project(":consumer:pact-jvm-consumer-groovy")
1313
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1414
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
15+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
16+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
17+
exclude group: 'org.codehaus.groovy'
18+
}
1519
}
1620

1721
if (System.env.PACT_PUBLISH == 'true') {

Diff for: ‎pact-specification-test/build.gradle

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,9 @@ dependencies {
55
testCompile "ch.qos.logback:logback-core:${project.logbackVersion}",
66
"ch.qos.logback:logback-classic:${project.logbackVersion}"
77
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
8-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
8+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
9+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
10+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
11+
exclude group: 'org.codehaus.groovy'
12+
}
913
}

Diff for: ‎provider/pact-jvm-provider-junit/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ dependencies {
1616
// Required for Java 9
1717
testCompile 'javax.xml.bind:jaxb-api:2.3.0'
1818
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
19+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
20+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
21+
exclude group: 'org.codehaus.groovy'
22+
}
23+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
24+
testRuntime 'org.objenesis:objenesis:3.1'
1925
}
2026

2127
test {

Diff for: ‎provider/pact-jvm-provider-junit5/build.gradle

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
dependencies {
2-
api project(path: ":core:pact-jvm-core-support", configuration: 'default'),
3-
project(path: ":provider:pact-jvm-provider", configuration: 'default')
4-
compile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
5-
implementation "org.slf4j:slf4j-api:${project.slf4jVersion}"
2+
api project(path: ":core:pact-jvm-core-support", configuration: 'default'),
3+
project(path: ":provider:pact-jvm-provider", configuration: 'default')
4+
compile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
5+
implementation "org.slf4j:slf4j-api:${project.slf4jVersion}"
66

7-
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
8-
testCompile 'ru.lanwen.wiremock:wiremock-junit5:1.1.1'
9-
testCompile 'com.github.tomakehurst:wiremock:2.19.0'
10-
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
7+
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
8+
testCompile 'ru.lanwen.wiremock:wiremock-junit5:1.1.1'
9+
testCompile 'com.github.tomakehurst:wiremock:2.19.0'
10+
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
11+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
12+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
13+
exclude group: 'org.codehaus.groovy'
14+
}
15+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
1116
}

Diff for: ‎provider/pact-jvm-provider-lein/build.gradle

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ dependencies {
1616

1717
testRuntime 'org.clojure:tools.nrepl:0.2.13'
1818
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
19+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
20+
exclude group: 'org.codehaus.groovy'
21+
}
22+
23+
groovyDoc "org.codehaus.groovy:groovy-all:${project.groovyVersion}"
1924
}
2025

2126
clojure.aotCompile = true

Diff for: ‎provider/pact-jvm-provider-maven/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,14 @@ dependencies {
77
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
88
compile "org.fusesource.jansi:jansi:${project.jansiVersion}"
99

10-
testCompile "org.codehaus.groovy:groovy-nio:${project.groovyVersion}:indy"
1110
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
11+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
12+
testCompile "org.codehaus.groovy:groovy-nio:${project.groovyVersion}:indy"
13+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
14+
exclude group: 'org.codehaus.groovy'
15+
}
16+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
17+
testRuntime 'org.objenesis:objenesis:3.1'
1218
}
1319

1420
import org.apache.tools.ant.taskdefs.condition.Os

Diff for: ‎provider/pact-jvm-provider-scalasupport/build.gradle

+6-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,13 @@ dependencies {
1818

1919
testCompile "org.specs2:specs2-core_2.12:${project.specs2Version}",
2020
"org.specs2:specs2-junit_2.12:${project.specs2Version}"
21-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
21+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
22+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
2223
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
24+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
25+
exclude group: 'org.codehaus.groovy'
26+
}
27+
testCompile "junit:junit:${project.junitVersion}"
2328
}
2429

2530
compileScala {

Diff for: ‎provider/pact-jvm-provider-scalatest/build.gradle

+6-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ plugins {
33
}
44

55
dependencies {
6-
compile project(path: ":provider:pact-jvm-provider", configuration: 'default'),
7-
project(path: ":provider:pact-jvm-provider-scalasupport_2.12", configuration: 'default'),
8-
"org.scalatest:scalatest_2.12:${project.scalaTestVersion}"
6+
compile project(path: ":provider:pact-jvm-provider", configuration: 'default'),
7+
project(path: ":provider:pact-jvm-provider-scalasupport_2.12", configuration: 'default'),
8+
"org.scalatest:scalatest_2.12:${project.scalaTestVersion}"
99

10-
testCompile project(":consumer:pact-jvm-consumer")
11-
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
10+
testCompile project(":consumer:pact-jvm-consumer")
11+
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
12+
testCompile "junit:junit:${project.junitVersion}"
1213
}

Diff for: ‎provider/pact-jvm-provider-spring/build.gradle

+12-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
dependencies {
2-
api project(path: ":provider:pact-jvm-provider-junit", configuration: 'default')
2+
api project(path: ":provider:pact-jvm-provider-junit", configuration: 'default')
33

4-
compile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.16.RELEASE'
5-
compile group: 'org.springframework', name: 'spring-webmvc', version: '4.3.19.RELEASE'
6-
compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
7-
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.6.4'
4+
compile group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.16.RELEASE'
5+
compile group: 'org.springframework', name: 'spring-webmvc', version: '4.3.19.RELEASE'
6+
compile group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
7+
compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-joda', version: '2.6.4'
88

9-
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.16.RELEASE'
10-
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
9+
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.16.RELEASE'
10+
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
11+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
12+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
13+
exclude group: 'org.codehaus.groovy'
14+
}
15+
testRuntime "net.bytebuddy:byte-buddy:${project.bytebuddyVersion}"
1116
}

Diff for: ‎provider/pact-jvm-provider/build.gradle

+10-1
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,21 @@ dependencies {
1616
implementation "org.codehaus.groovy:groovy:${project.groovyVersion}"
1717
api 'io.arrow-kt:arrow-core-extensions:0.9.0'
1818

19-
testCompile project(":consumer:pact-jvm-consumer-groovy")
19+
testCompile(project(":consumer:pact-jvm-consumer-groovy")) {
20+
exclude group: 'org.codehaus.groovy'
21+
}
22+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
23+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
2024
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
2125
testCompile 'io.dropwizard:dropwizard-testing:1.3.7'
26+
testCompile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
2227
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
2328
testCompile 'org.mockito:mockito-core:2.28.2'
2429
testCompile 'javax.xml.bind:jaxb-api:2.3.1'
30+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
31+
exclude group: 'org.codehaus.groovy'
32+
}
33+
testCompile 'org.hamcrest:hamcrest:2.1'
2534
}
2635

2736
compileTestGroovy {

0 commit comments

Comments
 (0)
Please sign in to comment.