diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4f53792..710cbd1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,10 +12,10 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 8
+          java-version: 17
           distribution: 'zulu'
 
       - name: Test consumer tests
diff --git a/.java-version b/.java-version
index 6259340..03b6389 100644
--- a/.java-version
+++ b/.java-version
@@ -1 +1 @@
-1.8
+17.0
diff --git a/build.gradle b/build.gradle
index ed1d3ca..bf16fff 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,13 @@ buildscript {
     mavenCentral()
   }
   dependencies {
-    classpath("org.springframework.boot:spring-boot-gradle-plugin:2.1.6.RELEASE")
+    classpath("org.springframework.boot:spring-boot-gradle-plugin:3.3.4")
   }
 }
 
 plugins {
-  id 'org.jetbrains.kotlin.jvm' version '1.3.41'
-  id 'org.jetbrains.kotlin.plugin.spring' version '1.3.41'
+  id 'org.jetbrains.kotlin.jvm' version '2.0.20'
+  id 'org.jetbrains.kotlin.plugin.spring' version '2.0.20'
 }
 
 repositories {
@@ -32,13 +32,13 @@ subprojects {
 
   compileKotlin {
     kotlinOptions {
-      jvmTarget = "1.8"
+      jvmTarget = "17"
     }
   }
 
   compileTestKotlin {
     kotlinOptions {
-      jvmTarget = "1.8"
+      jvmTarget = "17"
     }
   }
 }
diff --git a/consumer/build.gradle b/consumer/build.gradle
index 2f7bd82..386ab3e 100644
--- a/consumer/build.gradle
+++ b/consumer/build.gradle
@@ -1,21 +1,21 @@
 dependencies {
-  implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib'
   implementation 'org.springframework.boot:spring-boot-starter-web'
   implementation 'org.springframework.boot:spring-boot-starter-hateoas'
-  implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9'
-  implementation('io.github.microutils:kotlin-logging:1.4.4') {
+  implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.17.2'
+  implementation('io.github.oshai:kotlin-logging:7.0.0') {
     exclude group: 'org.jetbrains.kotlin'
   }
 
   testImplementation 'org.springframework.boot:spring-boot-starter-test'
-  testImplementation 'org.junit.jupiter:junit-jupiter:5.5.1'
-  testImplementation 'au.com.dius.pact.consumer:junit5:4.1.43'
-  testImplementation 'ch.qos.logback:logback-core:1.2.3'
-  testImplementation 'ch.qos.logback:logback-classic:1.2.3'
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2'
+  testImplementation 'au.com.dius.pact.consumer:junit5:4.6.14'
+  testImplementation 'ch.qos.logback:logback-core:1.5.8'
+  testImplementation 'ch.qos.logback:logback-classic:1.5.8'
 }
 
 bootJar {
-  baseName = 'consumer'
+  archivesBaseName = 'consumer'
   version =  '0.0.0'
 }
 
diff --git a/consumer/src/main/kotlin/io/pactflow/providerstatesexample/consumer/App.kt b/consumer/src/main/kotlin/io/pactflow/providerstatesexample/consumer/App.kt
index 92d917f..5f1e269 100644
--- a/consumer/src/main/kotlin/io/pactflow/providerstatesexample/consumer/App.kt
+++ b/consumer/src/main/kotlin/io/pactflow/providerstatesexample/consumer/App.kt
@@ -1,8 +1,8 @@
 package io.pactflow.providerstatesexample.consumer
 
 import com.fasterxml.jackson.databind.ObjectMapper
-import com.fasterxml.jackson.module.kotlin.KotlinModule
-import mu.KLogging
+import com.fasterxml.jackson.module.kotlin.registerKotlinModule
+import io.github.oshai.kotlinlogging.KotlinLogging
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.SpringApplication
@@ -10,7 +10,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.web.client.RestTemplateBuilder
 import org.springframework.context.annotation.Bean
 import org.springframework.core.ParameterizedTypeReference
-import org.springframework.hateoas.Resource
+import org.springframework.hateoas.EntityModel
 import org.springframework.http.HttpMethod
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.RequestMapping
@@ -40,23 +40,24 @@ class TransactionController {
   @Value("\${provider.url}")
   lateinit var providerUrl: String
 
+  private val logger = KotlinLogging.logger {} 
+
   @RequestMapping("/transactions", method = [RequestMethod.POST])
   fun new(@RequestParam accountNumber: Int): Map<String, Any> {
     logger.info { "Creating a new transaction for account $accountNumber" }
     val url = "$providerUrl/accounts/search/findOneByAccountNumberId?accountNumber=$accountNumber"
     logger.info { "Getting account details -> $url" }
     val responseEntity = restTemplate.exchange(url, HttpMethod.GET, null,
-      object : ParameterizedTypeReference<Resource<Account>>() {})
-    return if (responseEntity.statusCode == HttpStatus.OK) {
-      logger.info { "Got response ${responseEntity.body}" }
-      logger.info { "          Id ${responseEntity.body.id}" }
-      val account = responseEntity.body.content
+    object : ParameterizedTypeReference<EntityModel<Account>>(){})
+      return if (responseEntity.statusCode == HttpStatus.OK) {
+      logger.info { "Got response $responseEntity.body" }
+      logger.info { "          Id $responseEntity.body.content.id" }
+      val account: Account = responseEntity.body.content
       logger.info { "     Content $account" }
       mapOf("account" to account)
     } else emptyMap()
   }
 
-  companion object: KLogging()
 }
 
 @SpringBootApplication
@@ -65,7 +66,7 @@ class App {
   fun restTemplate(builder: RestTemplateBuilder) = builder.build()
 
   @Bean
-  fun objectMapper() = ObjectMapper().registerModule(KotlinModule())
+  fun objectMapper() = ObjectMapper().registerKotlinModule()
 }
 
 fun main(args: Array<String>) {
diff --git a/consumer/src/test/kotlin/io/pactflow/providerstatesexample/consumer/TransactionPactTest.kt b/consumer/src/test/kotlin/io/pactflow/providerstatesexample/consumer/TransactionPactTest.kt
index 847e142..6b08e33 100644
--- a/consumer/src/test/kotlin/io/pactflow/providerstatesexample/consumer/TransactionPactTest.kt
+++ b/consumer/src/test/kotlin/io/pactflow/providerstatesexample/consumer/TransactionPactTest.kt
@@ -15,6 +15,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
+import au.com.dius.pact.core.model.PactSpecVersion; // required for v4.6.x to set pactVersion
 
 @ExtendWith(PactConsumerTestExt::class)
 @PactTestFor(providerName = "AccountService")
@@ -39,23 +40,23 @@ class TransactionPactTest {
           .integerType("version", 0)
           .stringType("name", "Test")
           .stringValue("accountRef", "Test001")
-          .datetime("createdDate", "yyyy-MM-dd'T'HH:mm:ss.SZ")
-          .datetime("lastModifiedDate", "yyyy-MM-dd'T'HH:mm:ss.SZ")
+          .datetime("createdDate", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
+          .datetime("lastModifiedDate", "yyyy-MM-dd'T'HH:mm:ss.SSSXXX")
           .`object`("accountNumber")
             .valueFromProviderState("id", "\${accountNumber}", 100)
           .closeObject()!!
             .`object`("_links")
             .`object`("self")
-              .matchUrl("href", "http://localhost:8080" as String?, "/accounts" as Any, RegexMatcher("\\d+", "100") as Any)
+              .matchUrl("href", "http://localhost:8080" as String?, "accounts" as Any, RegexMatcher("\\d+", "100") as Any)
             .closeObject()!!
             .`object`("account")
-            .matchUrl("href", "http://localhost:8080" as String?, "/accounts" as Any, RegexMatcher("\\d+", "200") as Any)
+            .matchUrl("href", "http://localhost:8080" as String?, "accounts" as Any, RegexMatcher("\\d+", "200") as Any)
             .closeObject()!!
-          .closeObject()
+          .closeObject() as PactDslJsonBody
       ).toPact()
 
   @Test
-  @PactTestFor(pactMethod = "accounts")
+  @PactTestFor(pactMethod = "accounts", pactVersion = PactSpecVersion.V3)
   fun testNewTransaction(mockServer: MockServer) {
     controller.providerUrl = mockServer.getUrl()
     val result = controller.new(100)
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 5c2d1cf..249e583 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 430dfab..1e2fbf0 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-5.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 8e25e6c..a69d9cb 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,78 +17,113 @@
 #
 
 ##############################################################################
-##
-##  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
-    ;;
-  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
 
+
 # Determine the Java command to use to start the JVM.
 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
@@ -97,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
@@ -105,84 +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" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; 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
     # 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=$((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
 
-# 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"
+# 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.
+#
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+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 9618d8d..53a6b23 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,100 +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 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 init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-: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/provider/application.properties b/provider/application.properties
new file mode 100644
index 0000000..f37cce0
--- /dev/null
+++ b/provider/application.properties
@@ -0,0 +1 @@
+spring.jpa.defer-datasource-initialization=true
\ No newline at end of file
diff --git a/provider/build.gradle b/provider/build.gradle
index 2df03f0..e8d5110 100644
--- a/provider/build.gradle
+++ b/provider/build.gradle
@@ -1,22 +1,22 @@
 plugins {
-  id "org.jetbrains.kotlin.plugin.jpa" version "1.3.41"
+  id "org.jetbrains.kotlin.plugin.jpa" version "2.0.20"
 }
 
 dependencies {
-  implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib'
   implementation 'org.springframework.boot:spring-boot-starter-web'
-  implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.9.9'
+  implementation 'com.fasterxml.jackson.module:jackson-module-kotlin:2.18.0'
   implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
   implementation 'org.springframework.boot:spring-boot-starter-data-rest'
   implementation 'com.h2database:h2'
 
-  testCompile('org.springframework.boot:spring-boot-starter-test')
-  testImplementation 'org.junit.jupiter:junit-jupiter:5.5.1'
-  testImplementation 'au.com.dius.pact.provider:junit5:4.1.43'
+  testImplementation('org.springframework.boot:spring-boot-starter-test')
+  testImplementation 'org.junit.jupiter:junit-jupiter:5.11.2'
+  testImplementation 'au.com.dius.pact.provider:junit5:4.6.14'
 }
 
 bootJar {
-  baseName = 'provider'
+  archivesBaseName = 'provider'
   version =  '0.0.0'
 }
 
diff --git a/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/Account.kt b/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/Account.kt
index 32ef80b..eced777 100644
--- a/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/Account.kt
+++ b/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/Account.kt
@@ -4,15 +4,15 @@ import org.springframework.data.annotation.CreatedDate
 import org.springframework.data.annotation.LastModifiedDate
 import org.springframework.data.annotation.Version
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
-import org.springframework.data.repository.PagingAndSortingRepository
+import org.springframework.data.jpa.repository.JpaRepository
 import java.util.Date
-import javax.persistence.CascadeType
-import javax.persistence.Entity
-import javax.persistence.EntityListeners
-import javax.persistence.GeneratedValue
-import javax.persistence.GenerationType
-import javax.persistence.Id
-import javax.persistence.OneToOne
+import jakarta.persistence.CascadeType
+import jakarta.persistence.Entity
+import jakarta.persistence.EntityListeners
+import jakarta.persistence.GeneratedValue
+import jakarta.persistence.GenerationType
+import jakarta.persistence.Id
+import jakarta.persistence.OneToOne
 
 @Entity
 class AccountNumber(@Id @GeneratedValue(strategy=GenerationType.AUTO) val id: Long)
@@ -29,6 +29,6 @@ class Account @JvmOverloads constructor(
   @LastModifiedDate var lastModifiedDate: Date? = null
 )
 
-interface AcountRepository: PagingAndSortingRepository<Account, Long> {
+interface AccountRepository: JpaRepository<Account, Long> {
   fun findOneByAccountNumberId(accountNumber: Long): Account
 }
diff --git a/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/App.kt b/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/App.kt
index 0aa17d5..562e2e5 100644
--- a/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/App.kt
+++ b/provider/src/main/kotlin/io/pactflow/providerstatesexample/provider/App.kt
@@ -1,7 +1,8 @@
 package io.pactflow.providerstatesexample.provider
 
-import org.h2.server.web.WebServlet
+import org.h2.server.web.JakartaWebServlet
 import org.springframework.boot.SpringApplication
+import org.springframework.boot.web.servlet.ServletComponentScan
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.web.servlet.ServletRegistrationBean
 import org.springframework.context.annotation.Bean
@@ -9,10 +10,11 @@ import org.springframework.context.annotation.Configuration
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing
 import org.springframework.data.rest.core.config.RepositoryRestConfiguration
 import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
 
 @Configuration
 class RepositoryConfig : RepositoryRestConfigurer {
-  override fun configureRepositoryRestConfiguration(config: RepositoryRestConfiguration) {
+  override fun configureRepositoryRestConfiguration(config: RepositoryRestConfiguration, cors: CorsRegistry) {
     config.exposeIdsFor(Account::class.java, AccountNumber::class.java)
   }
 }
@@ -22,7 +24,7 @@ class RepositoryConfig : RepositoryRestConfigurer {
 class App {
   @Bean
   fun h2servletRegistration(): ServletRegistrationBean<*> {
-    val registrationBean = ServletRegistrationBean(WebServlet())
+    val registrationBean = ServletRegistrationBean(JakartaWebServlet())
     registrationBean.addUrlMappings("/console/*")
     return registrationBean
   }
diff --git a/provider/src/test/kotlin/io/pactflow/providerstatesexample/provider/PactVerificationTest.kt b/provider/src/test/kotlin/io/pactflow/providerstatesexample/provider/PactVerificationTest.kt
index f26a188..99360d3 100644
--- a/provider/src/test/kotlin/io/pactflow/providerstatesexample/provider/PactVerificationTest.kt
+++ b/provider/src/test/kotlin/io/pactflow/providerstatesexample/provider/PactVerificationTest.kt
@@ -16,7 +16,7 @@ import org.springframework.boot.test.context.SpringBootTest
 class PactVerificationTest {
 
   @Autowired
-  lateinit var acountRepository: AcountRepository
+  lateinit var accountRepository: AccountRepository
 
   @TestTemplate
   @ExtendWith(PactVerificationInvocationContextProvider::class)
@@ -27,7 +27,7 @@ class PactVerificationTest {
   @State("Account Test001 exists")
   fun createAccount(params: Map<String, String>): Map<String, Any> {
     val account = Account(0, 0, params["accountRef"]!!, AccountNumber(0), params["accountRef"]!!)
-    val persistedAccount = acountRepository.save(account)
+    val persistedAccount = accountRepository.save(account)
     return mapOf("accountNumber" to persistedAccount.accountNumber.id)
   }
 
diff --git a/provider/src/test/resources/pacts/TransactionService-AccountService.json b/provider/src/test/resources/pacts/TransactionService-AccountService.json
index c704a3d..29ac258 100644
--- a/provider/src/test/resources/pacts/TransactionService-AccountService.json
+++ b/provider/src/test/resources/pacts/TransactionService-AccountService.json
@@ -35,19 +35,19 @@
         "body": {
           "_links": {
             "account": {
-              "href": "http://localhost:8080//accounts/200"
+              "href": "http://localhost:8080/accounts/200"
             },
             "self": {
-              "href": "http://localhost:8080//accounts/100"
+              "href": "http://localhost:8080/accounts/100"
             }
           },
           "accountNumber": {
             "id": 100
           },
           "accountRef": "Test001",
-          "createdDate": "2000-01-31T13:00:00.0+0000",
+          "createdDate": "2000-01-31T13:00:00.000+0000",
           "id": 1,
-          "lastModifiedDate": "2000-01-31T13:00:00.0+0000",
+          "lastModifiedDate": "2000-01-31T13:00:00.000+0000",
           "name": "Test",
           "version": 0
         },
@@ -59,11 +59,11 @@
               "type": "ProviderState"
             },
             "$.createdDate": {
-              "format": "yyyy-MM-dd'T'HH:mm:ss.SZ",
+              "format": "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
               "type": "DateTime"
             },
             "$.lastModifiedDate": {
-              "format": "yyyy-MM-dd'T'HH:mm:ss.SZ",
+              "format": "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
               "type": "DateTime"
             }
           }
@@ -78,7 +78,7 @@
               "matchers": [
                 {
                   "match": "regex",
-                  "regex": ".*\\Q/accounts\\E\\/\\d+$"
+                  "regex": ".*\\/(\\Qaccounts\\E\\/\\d+)$"
                 }
               ]
             },
@@ -87,7 +87,7 @@
               "matchers": [
                 {
                   "match": "regex",
-                  "regex": ".*\\Q/accounts\\E\\/\\d+$"
+                  "regex": ".*\\/(\\Qaccounts\\E\\/\\d+)$"
                 }
               ]
             },
@@ -103,7 +103,7 @@
               "combine": "AND",
               "matchers": [
                 {
-                  "format": "yyyy-MM-dd'T'HH:mm:ss.SZ",
+                  "format": "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
                   "match": "timestamp"
                 }
               ]
@@ -120,7 +120,7 @@
               "combine": "AND",
               "matchers": [
                 {
-                  "format": "yyyy-MM-dd'T'HH:mm:ss.SZ",
+                  "format": "yyyy-MM-dd'T'HH:mm:ss.SSSXXX",
                   "match": "timestamp"
                 }
               ]
@@ -149,7 +149,7 @@
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.1.43"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "3.0.0"