Skip to content

Commit a80e74a

Browse files
author
Ronald Holshausen
committedMar 7, 2020
chore: remove indy version of Groovy
·
4_7_0-beta_04_0_7
1 parent 19b975e commit a80e74a

File tree

19 files changed

+59
-59
lines changed

19 files changed

+59
-59
lines changed
 

‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ subprojects {
7171
mavenCentral()
7272
jcenter()
7373
}
74-
74+
7575
compileTestGroovy {
7676
classpath = classpath.plus(files(compileTestKotlin.destinationDir))
7777
dependsOn compileTestKotlin

‎consumer/pact-jvm-consumer-java8/build.gradle

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

‎consumer/pact-jvm-consumer-junit/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ 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}:indy"
22-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
23-
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}:indy"
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}"
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'

‎consumer/pact-jvm-consumer-junit5/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ 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:${project.groovyVersion}:indy"
10-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
11-
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}:indy"
9+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
10+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
11+
testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
1212
testCompile 'org.apache.commons:commons-io:1.3.2'
1313
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1414
testCompile project(path: ":consumer:pact-jvm-consumer-java8", configuration: 'default')

‎consumer/pact-jvm-consumer-specs2/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ 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"
16+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
1717
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1818
exclude group: 'org.codehaus.groovy'
1919
}

‎consumer/pact-jvm-consumer/build.gradle

+23-23
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11

22
dependencies {
3-
api project(path: ":core:pact-jvm-core-model", configuration: 'default')
4-
api project(path: ":core:pact-jvm-core-matchers", configuration: 'default')
5-
compile 'com.googlecode.java-diff-utils:diffutils:1.3.0',
6-
'dk.brics.automaton:automaton:1.11-8',
7-
"org.apache.httpcomponents:httpclient:${project.httpClientVersion}"
8-
compile "org.json:json:${project.jsonVersion}"
9-
compile "io.netty:netty-handler:${project.nettyVersion}"
10-
compile "org.apache.httpcomponents:httpmime:${project.httpClientVersion}"
11-
compile "org.apache.httpcomponents:fluent-hc:${project.httpClientVersion}"
12-
implementation "org.slf4j:slf4j-api:${project.slf4jVersion}"
13-
implementation 'io.ktor:ktor-server-netty:1.2.6'
14-
implementation "io.ktor:ktor-network-tls:1.2.6"
3+
api project(path: ":core:pact-jvm-core-model", configuration: 'default')
4+
api project(path: ":core:pact-jvm-core-matchers", configuration: 'default')
5+
compile 'com.googlecode.java-diff-utils:diffutils:1.3.0',
6+
'dk.brics.automaton:automaton:1.11-8',
7+
"org.apache.httpcomponents:httpclient:${project.httpClientVersion}"
8+
compile "org.json:json:${project.jsonVersion}"
9+
compile "io.netty:netty-handler:${project.nettyVersion}"
10+
compile "org.apache.httpcomponents:httpmime:${project.httpClientVersion}"
11+
compile "org.apache.httpcomponents:fluent-hc:${project.httpClientVersion}"
12+
implementation "org.slf4j:slf4j-api:${project.slf4jVersion}"
13+
implementation 'io.ktor:ktor-server-netty:1.2.6'
14+
implementation "io.ktor:ktor-network-tls:1.2.6"
1515

16-
testCompile "junit:junit:${project.junitVersion}"
17-
testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}"
18-
testCompile 'org.cthul:cthul-matchers:1.1.0'
19-
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
20-
testCompile "org.junit.jupiter:junit-jupiter-params:${project.junit5Version}"
21-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
22-
testCompile "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}:indy"
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'
16+
testCompile "junit:junit:${project.junitVersion}"
17+
testCompile "ch.qos.logback:logback-classic:${project.logbackVersion}"
18+
testCompile 'org.cthul:cthul-matchers:1.1.0'
19+
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
20+
testCompile "org.junit.jupiter:junit-jupiter-params:${project.junit5Version}"
21+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
22+
testCompile "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}"
23+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
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'
2727
}
2828
}

‎core/matchers/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ 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"
12+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
1313
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1414
exclude group: 'org.codehaus.groovy'
1515
}

‎core/model/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ 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:${project.groovyVersion}:indy"
35-
testCompile "org.codehaus.groovy:groovy-datetime:${project.groovyVersion}:indy"
34+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
35+
testCompile "org.codehaus.groovy:groovy-datetime:${project.groovyVersion}"
3636
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
3737
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.3.2'
3838
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {

‎core/pact-broker/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ 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:${project.groovyVersion}:indy"
17-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
16+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
17+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
1818
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1919
exclude group: 'org.codehaus.groovy'
2020
}

‎core/support/build.gradle

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

17-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
17+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
1818
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
1919
testImplementation 'io.kotlintest:kotlintest-runner-junit5:3.3.2'
2020
testCompile 'org.hamcrest:hamcrest:2.1'

‎pact-jvm-server/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ dependencies {
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"
32+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
3333
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
3434
exclude group: 'org.codehaus.groovy'
3535
}

‎pact-publish/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ 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"
15+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
1616
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1717
exclude group: 'org.codehaus.groovy'
1818
}

‎pact-specification-test/build.gradle

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

22
dependencies {
3-
testCompile project(":core:pact-jvm-core-matchers"),
4-
project(":provider:pact-jvm-provider")
5-
testCompile "ch.qos.logback:logback-core:${project.logbackVersion}",
6-
"ch.qos.logback:logback-classic:${project.logbackVersion}"
7-
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
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-
}
3+
testCompile project(":core:pact-jvm-core-matchers"),
4+
project(":provider:pact-jvm-provider")
5+
testCompile "ch.qos.logback:logback-core:${project.logbackVersion}",
6+
"ch.qos.logback:logback-classic:${project.logbackVersion}"
7+
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
8+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
9+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
10+
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
11+
exclude group: 'org.codehaus.groovy'
12+
}
1313
}

‎provider/pact-jvm-provider-junit/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ 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"
19+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
2020
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
2121
exclude group: 'org.codehaus.groovy'
2222
}

‎provider/pact-jvm-provider-junit5/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88
testCompile 'ru.lanwen.wiremock:wiremock-junit5:1.1.1'
99
testCompile 'com.github.tomakehurst:wiremock:2.19.0'
1010
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
11-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
11+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
1212
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1313
exclude group: 'org.codehaus.groovy'
1414
}

‎provider/pact-jvm-provider-maven/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ dependencies {
88
compile "org.fusesource.jansi:jansi:${project.jansiVersion}"
99

1010
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"
11+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
12+
testCompile "org.codehaus.groovy:groovy-nio:${project.groovyVersion}"
1313
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1414
exclude group: 'org.codehaus.groovy'
1515
}

‎provider/pact-jvm-provider-scalasupport/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ 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:${project.groovyVersion}:indy"
22-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
21+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
22+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
2323
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
2424
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
2525
exclude group: 'org.codehaus.groovy'

‎provider/pact-jvm-provider-spring/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ dependencies {
88

99
testCompile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.16.RELEASE'
1010
testRuntime "org.junit.vintage:junit-vintage-engine:${project.junit5Version}"
11-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
11+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
1212
testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
1313
exclude group: 'org.codehaus.groovy'
1414
}

‎provider/pact-jvm-provider/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ dependencies {
1919
testCompile(project(":consumer:pact-jvm-consumer-groovy")) {
2020
exclude group: 'org.codehaus.groovy'
2121
}
22-
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}:indy"
23-
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}:indy"
22+
testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
23+
testCompile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
2424
testRuntime "ch.qos.logback:logback-classic:${project.logbackVersion}"
2525
testCompile 'io.dropwizard:dropwizard-testing:1.3.7'
2626
testCompile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"

0 commit comments

Comments
 (0)
Please sign in to comment.