diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..097f9f98d9
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,9 @@
+#
+# https://help.github.com/articles/dealing-with-line-endings/
+#
+# Linux start script should use lf
+/gradlew        text eol=lf
+
+# These are Windows script files and should use crlf
+*.bat           text eol=crlf
+
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index b26c53d641..54f0751b19 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -12,7 +12,8 @@ jobs:
     strategy:
       matrix:
         operating-system: [ ubuntu-latest, windows-latest, macos-latest ]
-        module: [ core, "consumer -x :consumer:junit:clojureTest", provider, pact-specification-test ]
+#        module: [ core, consumer, provider, pact-specification-test ]
+        module: [ core ]
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 17
@@ -27,7 +28,6 @@ jobs:
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: ${{ runner.os }}-gradle
     - run: ./gradlew -v
-    - run: ./gradlew :core:pactbroker:publishToMavenLocal :core:support:publishToMavenLocal  :core:model:publishToMavenLocal
     - name: Build with Gradle
       run: ./gradlew -s --no-daemon -i -p ${{ matrix.module }} build
     - name: Publish Unit Test Results
@@ -40,7 +40,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        module: [ core, consumer, provider, pact-specification-test ]
+#        module: [ core, consumer, provider, pact-specification-test ]
+        module: [ core ]
         jdk: [ 11, 15, 16 ]
     steps:
       - uses: actions/checkout@v2
@@ -56,7 +57,6 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
       - run: ./gradlew -v
-      - run: ./gradlew :core:pactbroker:publishToMavenLocal :core:support:publishToMavenLocal
       - name: Build with Gradle
         run: ./gradlew -s --no-daemon -i -p ${{ matrix.module }} build
       - name: Publish Unit Test Results
diff --git a/.gitignore b/.gitignore
index 357d1c2ffa..65076ab838 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,46 +1,11 @@
-*.class
-*.hprof
-*.log
-*/bin
-# sbt specific
-dist/*
-lib_managed/
-src_managed/
-project/boot/
-project/plugins/project/
-pact-jvm-provider-sbt/project/project/
-pact-jvm-provider-sbt/project/target/
+# Ignore Gradle project-specific cache directory
+.gradle
 
-# Scala-IDE specific
-.scala_dependencies
-
-.DS_Store
-
-*/.settings
+# Ignore Gradle build output directory
+build
 
+# IDE files and directories
 .idea
 .idea_modules
 *.iml
-
-# Eclipse
-*/.cache
-.classpath
-.settings
-.project
-build/
-pkgdiff_reports/
-.gradle/
-
-out/
-consumer/target/
-consumer/groovy/target/
-consumer/junit/target/
-consumer/junit5/target/
-consumer/specs2/target/
-consumer/scalasupport/target/
-provider/target/
-provider/scalasupport/target/
-.kotlintest/
-bin/
 .vscode/
-
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 40497e6f40..0000000000
--- a/build.gradle
+++ /dev/null
@@ -1,222 +0,0 @@
-buildscript {
-  repositories {
-    mavenCentral()
-    mavenLocal()
-  }
-  dependencies {
-    classpath 'org.apache.commons:commons-text:1.5'
-  }
-}
-
-plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.6.21'
-  id 'io.gitlab.arturbosch.detekt' version '1.18.0'
-  id 'org.jetbrains.dokka' version '1.5.0' apply false
-  id 'org.javamodularity.moduleplugin' version '1.7.0' apply false
-}
-
-import org.apache.commons.text.StringEscapeUtils
-
-allprojects {
-  apply plugin: 'maven-publish'
-  apply plugin: 'signing'
-
-  repositories {
-    mavenLocal()
-    mavenCentral()
-  }
-
-  targetCompatibility = '11'
-  sourceCompatibility = '11'
-}
-
-subprojects {
-
-  if (name in ['core']) {
-    return
-  }
-
-  version = '4.4.0-beta.8'
-  
-  buildscript {
-    repositories {
-      mavenCentral()
-      mavenLocal()
-    }
-  }
-
-  configurations {
-    groovyDoc
-  }
-
-  apply plugin: 'java'
-  apply plugin: 'groovy'
-//  apply plugin: 'codenarc'
-  apply plugin: 'jacoco'
-  apply plugin: 'org.jetbrains.kotlin.jvm'
-  apply plugin: 'io.gitlab.arturbosch.detekt'
-  if (System.env.CI != 'true') {
-    apply plugin: 'org.jetbrains.dokka'
-  }
-  apply plugin: "org.javamodularity.moduleplugin"
-
-  dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-  }
-
-  java {
-//    modularity.inferModulePath = true
-    targetCompatibility = '11'
-    sourceCompatibility = '11'
-  }
-
-    compileTestGroovy {
-      classpath = classpath.plus(files(compileTestKotlin.destinationDir))
-      dependsOn compileTestKotlin
-    }
-
-    tasks.withType(GroovyCompile) {
-      groovyOptions.optimizationOptions.indy = true
-    }
-
-    tasks.withType(Groovydoc) {
-      groovyClasspath = project.configurations.groovyDoc
-    }
-
-    tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
-      kotlinOptions {
-        jvmTarget = "11"
-      }
-    }
-
-    jar {
-        manifest {
-          attributes provider: 'gradle',
-            'Implementation-Title': project.name, 'Implementation-Version': archiveVersion,
-            'Implementation-Vendor': project.group, 'Implementation-Vendor-Id': project.group,
-            'Specification-Vendor': project.group,
-            'Specification-Title': project.name,
-            'Specification-Version': archiveVersion,
-            'Automatic-Module-Name': project.group + "." + project.name.replaceAll('-', '_')
-        }
-    }
-
-  if (System.env.CI != 'true') {
-    task javadocJar(type: Jar, dependsOn: [javadoc, groovydoc, dokkaJavadoc]) {
-      archiveClassifier = 'javadoc'
-      duplicatesStrategy = 'exclude'
-      from javadoc.destinationDir, groovydoc.destinationDir, dokkaJavadoc.outputDirectory
-    }
-  } else {
-    task javadocJar(type: Jar, dependsOn: [javadoc, groovydoc]) {
-      archiveClassifier = 'javadoc'
-      duplicatesStrategy = 'exclude'
-      from javadoc.destinationDir, groovydoc.destinationDir
-    }
-  }
-
-    task sourceJar(type: Jar) {
-      archiveClassifier = 'sources'
-      from sourceSets.main.allSource
-    }
-
-  test {
-    useJUnitPlatform()
-
-    if (System.env.CI == 'true') {
-      testLogging {
-        exceptionFormat "full"
-        showCauses true
-        showExceptions true
-        showStackTraces true
-        showStandardStreams false
-        events "passed", "skipped", "failed"
-      }
-    } else {
-      // Show test results.
-      testLogging {
-        events "passed", "skipped", "failed"
-      }
-    }
-
-    // Mark sure Pact-JVM builds don't skew the metrics
-    systemProperty 'pact_do_not_track', 'true'
-  }
-
-  // Gradle plugin plugin will automatically add these
-  if (name != 'gradle') {
-    publishing {
-      publications {
-        mavenPublication(MavenPublication) {
-          from components.java
-          artifact sourceJar
-          artifact javadocJar
-
-          pom {
-            name = project.name
-            description = StringEscapeUtils.escapeXml11(new File(projectDir, 'README.md').text)
-            url = 'https://github.com/DiUS/pact-jvm'
-            licenses {
-              license {
-                name = 'Apache 2'
-                url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-                distribution = 'repo'
-              }
-            }
-            scm {
-              url = 'https://github.com/pact-foundation/pact-jvm'
-              connection = 'https://github.com/pact-foundation/pact-jvm.git'
-            }
-
-            developers {
-              developer {
-                id = 'thetrav'
-                name = 'Travis Dixon'
-                email = 'the.trav@gmail.com'
-              }
-              developer {
-                id = 'rholshausen'
-                name = 'Ronald Holshausen'
-                email = 'rholshausen@dius.com.au'
-              }
-            }
-          }
-        }
-      }
-      repositories {
-        maven {
-          url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
-          if (project.hasProperty('sonatypeUsername')) {
-            credentials {
-              username sonatypeUsername
-              password sonatypePassword
-            }
-          }
-        }
-      }
-    }
-
-    signing {
-      required { project.hasProperty('isRelease') }
-      sign publishing.publications.mavenPublication
-    }
-  }
-
-//  codenarcMain {
-//    configFile = rootProject.file('config/codenarc/ruleset.groovy')
-//  }
-//
-//  codenarcTest {
-//      configFile = rootProject.file('config/codenarc/rulesetTest.groovy')
-//  }
-
-  check.dependsOn << 'jacocoTestReport'
-
-  detekt {
-    failFast = false
-    config = files(rootProject.file("config/detekt-config.yml"))
-  }
-
-  task allDeps(type: DependencyReportTask) {}
-}
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 0000000000..4e847b4be8
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,14 @@
+plugins {
+    // Support convention plugins written in Groovy. Convention plugins are build scripts in 'src/main' that
+    // automatically become available as plugins in the main build.
+    id 'groovy-gradle-plugin'
+}
+
+repositories {
+    // Use the plugin portal to apply community plugins in convention plugins.
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21'
+}
diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-application-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-application-conventions.gradle
new file mode 100644
index 0000000000..a816294280
--- /dev/null
+++ b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-application-conventions.gradle
@@ -0,0 +1,7 @@
+plugins {
+    // Apply the common convention plugin for shared build configuration between library and application projects.
+    id 'au.com.dius.pact.kotlin-common-conventions'
+
+    // Apply the application plugin to add support for building a CLI application in Java.
+    id 'application'
+}
diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle
new file mode 100644
index 0000000000..adc934c3a6
--- /dev/null
+++ b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle
@@ -0,0 +1,68 @@
+plugins {
+    // Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
+    id 'org.jetbrains.kotlin.jvm'
+
+    id 'maven-publish'
+    id 'signing'
+    id 'groovy'
+}
+
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
+
+version = '4.4.0-beta.8'
+
+java {
+    targetCompatibility = '11'
+    sourceCompatibility = '11'
+}
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
+}
+
+dependencies {
+    constraints {
+        // Define dependency versions as constraints
+        implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+        implementation 'org.apache.commons:commons-lang3:3.12.0'
+        implementation 'io.github.microutils:kotlin-logging:2.0.10'
+        implementation 'org.apache.httpcomponents.client5:httpclient5:5.1.1'
+        implementation 'org.apache.httpcomponents.client5:httpclient5-fluent:5.1.1'
+        implementation 'com.michael-bull.kotlin-result:kotlin-result:1.1.16'
+
+        testImplementation 'org.apache.groovy:groovy:4.0.6'
+        testImplementation 'org.hamcrest:hamcrest:2.2'
+        testImplementation 'org.spockframework:spock-core:2.3-groovy-4.0'
+        testImplementation 'junit:junit:4.13.2'
+    }
+
+    // Align versions of all Kotlin components
+    implementation platform('org.jetbrains.kotlin:kotlin-bom')
+
+    // Use the Kotlin JDK 8 standard library.
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+    implementation 'org.jetbrains.kotlin:kotlin-reflect'
+
+    // Align versions of all Kotlin components
+    implementation platform('org.jetbrains.kotlin:kotlin-bom')
+}
+
+testing {
+    suites {
+        // Configure the built-in test suite
+        test {
+            // Use JUnit Jupiter test framework
+            useJUnitJupiter('5.9.0')
+        }
+    }
+}
+
+test {
+    // Mark sure Pact-JVM builds don't skew the metrics
+    systemProperty 'pact_do_not_track', 'true'
+}
diff --git a/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-library-conventions.gradle b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-library-conventions.gradle
new file mode 100644
index 0000000000..593a261fbe
--- /dev/null
+++ b/buildSrc/src/main/groovy/au.com.dius.pact.kotlin-library-conventions.gradle
@@ -0,0 +1,7 @@
+plugins {
+    // Apply the common convention plugin for shared build configuration between library and application projects.
+    id 'au.com.dius.pact.kotlin-common-conventions'
+
+    // Apply the java-library plugin for API and implementation separation.
+    id 'java-library'
+}
diff --git a/core/support/build.gradle b/core/support/build.gradle
index de0e9c60b2..57dd2501a2 100644
--- a/core/support/build.gradle
+++ b/core/support/build.gradle
@@ -1,29 +1,16 @@
-dependencies {
-  api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-  implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlinVersion"
-  implementation "org.apache.commons:commons-lang3:${project.commonsLang3Version}"
-  implementation "com.google.code.findbugs:jsr305:3.0.2"
-  api("io.github.microutils:kotlin-logging:$kotlinLogging") {
-    exclude group: 'org.jetbrains.kotlin'
-  }
-  api "org.apache.httpcomponents.client5:httpclient5:${project.httpClientVersion}"
-  implementation "org.apache.httpcomponents.client5:httpclient5-fluent:${project.httpClientVersion}"
-  api("com.michael-bull.kotlin-result:kotlin-result:$kotlinResult") {
-    exclude group: 'org.jetbrains.kotlin'
-  }
-
-  testImplementation "org.apache.groovy:groovy:${project.groovyVersion}"
-  testImplementation "org.junit.jupiter:junit-jupiter-api:${project.junit5Version}"
-  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:${project.spock}") {
-    exclude group: 'org.codehaus.groovy'
-  }
-  testImplementation "junit:junit:${project.junitVersion}"
+plugins {
+    id 'au.com.dius.pact.kotlin-library-conventions'
 }
 
-compileJava {
-  classpath = classpath.plus(files(compileKotlin.destinationDir))
-  dependsOn compileKotlin
+dependencies {
+    implementation 'org.apache.commons:commons-lang3'
+    api 'io.github.microutils:kotlin-logging'
+    api 'org.apache.httpcomponents.client5:httpclient5'
+    api 'org.apache.httpcomponents.client5:httpclient5-fluent'
+    api 'com.michael-bull.kotlin-result:kotlin-result'
+
+    testImplementation 'org.apache.groovy:groovy'
+    testImplementation 'org.hamcrest:hamcrest'
+    testImplementation 'org.spockframework:spock-core'
+    testImplementation 'junit:junit'
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2a..249e5832f0 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 00e33edef6..ae04661ee7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed5..a69d9cb6c2 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f938..f127cfd49d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,89 +1,91 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
index dd96db7477..2efba08d4b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,28 +1,20 @@
-rootProject.name = 'au.com.dius.pact'
+rootProject.name = 'pact-jvm'
 
 include 'core:support'
-include 'core:pactbroker'
-include 'core:model'
-include 'core:matchers'
-
-include 'consumer'
-include 'consumer:groovy'
-include 'consumer:junit'
-include 'consumer:junit5'
-include 'consumer:kotlin'
-
-include 'provider'
-include 'provider:gradle'
-include 'provider:maven'
-include 'provider:junit'
-include 'provider:junit5'
-include 'provider:spring'
-include 'provider:junit5spring'
-
-if (System.getenv('GITHUB_WORKFLOW') == null) {
-  include 'provider:lein'
-}
-
-include 'pact-jvm-server'
-include 'pact-specification-test'
-include 'pact-publish'
+//include 'core:pactbroker'
+//include 'core:model'
+//include 'core:matchers'
+//
+//include 'consumer'
+//include 'consumer:groovy'
+//include 'consumer:junit'
+//include 'consumer:junit5'
+//include 'consumer:kotlin'
+//
+//include 'provider'
+//include 'provider:gradle'
+//include 'provider:maven'
+//include 'provider:junit'
+//include 'provider:junit5'
+//include 'provider:spring'
+//include 'provider:junit5spring'
diff --git a/upgrade-to-4.4.x.md b/upgrade-to-4.4.x.md
deleted file mode 100644
index 4ccaea7d9a..0000000000
--- a/upgrade-to-4.4.x.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Upgrading to 4.4.x
-