Merge branch 'master' into jcenter-https

Author: Ronald Holshausen

build.gradle

@@ -72,21 +72,24 @@ subprojects {
         jcenter()
     }
 
-    dependencies {
-      testCompile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
-      testRuntime "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}"
-      testCompile 'org.hamcrest:hamcrest:2.1'
-      testCompile('org.spockframework:spock-core:1.3-groovy-2.5') {
-        exclude group: 'org.codehaus.groovy'
-      }
-      testRuntime 'net.bytebuddy:byte-buddy:1.9.16'
-      constraints {
-        testRuntime 'net.bytebuddy:byte-buddy-agent:1.9.16'
-      }
-      testRuntime 'org.objenesis:objenesis:3.1'
-      testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
+    // Gradle plugin needs to be compiled against the version of Groovy that is bundled with Gradle (currently 2.5.4)
+    if (name != 'pact-jvm-provider-gradle') {
+      dependencies {
+        testCompile "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
+        testRuntime "org.junit.jupiter:junit-jupiter-engine:${project.junit5Version}"
+        testCompile 'org.hamcrest:hamcrest:2.1'
+        testCompile('org.spockframework:spock-core:2.0-M2-groovy-3.0') {
+          exclude group: 'org.codehaus.groovy'
+        }
+        testRuntime 'net.bytebuddy:byte-buddy:1.9.16'
+        constraints {
+          testRuntime 'net.bytebuddy:byte-buddy-agent:1.9.16'
+        }
+        testRuntime 'org.objenesis:objenesis:3.1'
+        testCompile "org.codehaus.groovy:groovy:${project.groovyVersion}"
 
-      groovyDoc "org.codehaus.groovy:groovy-all:${project.groovyVersion}"
+        groovyDoc "org.codehaus.groovy:groovy-all:${project.groovyVersion}"
+      }
     }
 
     compileTestGroovy {

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

@@ -3,7 +3,7 @@ dependencies {
     compile "org.codehaus.groovy:groovy:${project.groovyVersion}"
     compile "org.codehaus.groovy:groovy-json:${project.groovyVersion}"
 
-    testCompile "org.codehaus.groovy.modules.http-builder:http-builder:${project.httpBuilderVersion}",
+    testCompile "io.github.http-builder-ng:http-builder-ng-apache:${project.httpBuilderVersion}",
       "ch.qos.logback:logback-classic:${project.logbackVersion}"
     testCompile "org.codehaus.groovy:groovy-xml:${project.groovyVersion}"
     testCompile "org.codehaus.groovy:groovy-dateutil:${project.groovyVersion}"