From 33b6dde19f5540431a1b6a3d2f5f98c8354b1d20 Mon Sep 17 00:00:00 2001
From: Ronald Holshausen <ronald.holshausen@smartbear.com>
Date: Tue, 29 Oct 2024 14:29:15 +1100
Subject: [PATCH] chore: Update dependencies to support JDK 21

---
 ...dius.pact.kotlin-common-conventions.gradle | 19 ++++++++++---------
 settings.gradle                               |  3 ++-
 2 files changed, 12 insertions(+), 10 deletions(-)

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
index 0bfa1f4c0..d21650c73 100644
--- 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
@@ -47,23 +47,23 @@ dependencies {
         implementation 'io.ktor:ktor-network-tls-certificates:2.3.8'
         implementation 'io.ktor:ktor-server-call-logging:2.3.8'
         implementation 'io.netty:netty-handler:4.1.108.Final'
-        implementation 'org.apache.groovy:groovy:4.0.18'
-        implementation 'org.apache.groovy:groovy-json:4.0.18'
-        implementation 'org.apache.groovy:groovy-xml:4.0.18'
+        implementation 'org.apache.groovy:groovy:4.0.23'
+        implementation 'org.apache.groovy:groovy-json:4.0.23'
+        implementation 'org.apache.groovy:groovy-xml:4.0.23'
         implementation 'io.pact.plugin.driver:core:0.5.1'  //remember to also update under api
         implementation 'commons-codec:commons-codec:1.15'
         implementation 'io.github.oshai:kotlin-logging-jvm:5.1.4'
 
-        testImplementation 'org.apache.groovy:groovy:4.0.18'
-        testImplementation 'org.apache.groovy:groovy-json:4.0.18'
-        testImplementation 'org.apache.groovy:groovy-datetime:4.0.18'
-        testImplementation 'org.apache.groovy:groovy-xml:4.0.18'
-        testImplementation 'org.apache.groovy:groovy-nio:4.0.18'
+        testImplementation 'org.apache.groovy:groovy:4.0.23'
+        testImplementation 'org.apache.groovy:groovy-json:4.0.23'
+        testImplementation 'org.apache.groovy:groovy-datetime:4.0.23'
+        testImplementation 'org.apache.groovy:groovy-xml:4.0.23'
+        testImplementation 'org.apache.groovy:groovy-nio:4.0.23'
         testImplementation 'org.hamcrest:hamcrest:2.2'
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'ch.qos.logback:logback-classic:1.4.5'
         testImplementation 'ch.qos.logback:logback-core:1.4.5'
-        testImplementation 'net.bytebuddy:byte-buddy:1.12.21'
+        testImplementation 'net.bytebuddy:byte-buddy:1.15.7'
         testImplementation 'com.github.tomakehurst:wiremock-jre8:2.34.0'
         testImplementation 'org.junit.vintage:junit-vintage-engine:5.9.2'
         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
@@ -77,6 +77,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
 
     codenarc('org.codenarc:CodeNarc:3.5.0-groovy-4.0')
+    codenarc('org.apache.groovy:groovy:4.0.23')
 }
 
 testing {
diff --git a/settings.gradle b/settings.gradle
index e5fdf45e6..314d1e977 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -25,7 +25,8 @@ if (System.getenv('GITHUB_WORKFLOW') == null) {
   include 'provider:lein'
 }
 
-include 'pact-jvm-server'
+// Scala does not support JDK 20+
+//include 'pact-jvm-server'
 include 'pact-specification-test'
 include 'pact-publish'
 include 'compatibility-suite'