Merge branch 'master' into v4.7.x

Author: rholshausen

.github/workflows/compatability-suite.yml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Set up JDK 18
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v5
       with:
         distribution: temurin
         java-version: 18
@@ -29,7 +29,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 18
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 18
@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 18
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 18
@@ -63,7 +63,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 18
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: 18

.github/workflows/gradle.yml

@@ -56,8 +56,8 @@ jobs:
         jdk: [ 17, 18, 19, 21, 22 ]
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK
-        uses: actions/setup-java@v3
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: ${{ matrix.jdk }}

CHANGELOG.md

@@ -1,5 +1,47 @@
 To generate the log, run `git log --pretty='* %h - %s (%an, %ad)'  TAGNAME..HEAD` replacing TAGNAME and HEAD as appropriate.
 
+# 4.6.18 - Maintenance Release
+
+* 8a1e8b0a4 - chore: fix port conflict in test (Ronald Holshausen, Tue Nov 11 10:39:20 2025 +1100)
+* 8c22c525e - chore: Update release process to use jreleaser (Ronald Holshausen, Tue Nov 11 10:30:48 2025 +1100)
+* 57c5bda6f - fix: add Lambda DSL methods that are the same as the old DSL arrayEachLike #1877 (Ronald Holshausen, Mon Nov 10 15:30:04 2025 +1100)
+* 012242246 - chore: Update provider dependencies (Ronald Holshausen, Mon Nov 10 14:35:19 2025 +1100)
+* ab81b32ba - chore: Update core dependencies (Ronald Holshausen, Mon Nov 10 11:20:36 2025 +1100)
+* f3b1d6e5a - chore: Update consumer dependencies (Ronald Holshausen, Mon Nov 10 11:06:01 2025 +1100)
+* 87cc6c0ce - chore: Update main dependency versions (Ronald Holshausen, Mon Nov 10 10:45:18 2025 +1100)
+* 8696796fe - chore: Update Gradle to 7.6.6 (Ronald Holshausen, Mon Nov 10 10:19:21 2025 +1100)
+* 3f60ce0e0 - Merge pull request #1875 from holly-cummins/reference-quarkus-in-docs (Ronald Holshausen, Fri Aug 29 09:06:32 2025 +1000)
+* 897aaea3c - Reference Quarkus in service providers section (Holly Cummins, Thu Aug 28 19:30:51 2025 +0100)
+* c4abfaaf8 - Merge pull request #1872 from pact-foundation/dependabot/github_actions/actions/setup-java-5 (Ronald Holshausen, Thu Aug 28 10:10:55 2025 +1000)
+* 8a3e56648 - Merge pull request #1873 from holly-cummins/update-classgraph (Ronald Holshausen, Thu Aug 28 10:10:20 2025 +1000)
+* c50f6271d - chore(deps): bump actions/setup-java from 3 to 5 (dependabot[bot], Wed Aug 27 23:37:55 2025 +0000)
+* f663217ad - Merge pull request #1874 from holly-cummins/improve-java-version-clarity (Ronald Holshausen, Thu Aug 28 09:34:44 2025 +1000)
+* 4670fa8f4 - Correct Java versions in developer-facing content (Holly Cummins, Wed Aug 27 16:35:52 2025 +0100)
+* aa17dca65 - Update classgraph to work around compatibility issue (Holly Cummins, Wed Aug 27 16:19:14 2025 +0100)
+* 286861e97 - chore(CI): update to actions/cache@v4 (Ronald Holshausen, Thu May 29 13:59:06 2025 +1000)
+* 64a931298 - chore: Update plugin driver to 0.5.2 (Ronald Holshausen, Thu May 29 11:00:58 2025 +1000)
+* 15da5a605 - Update README.md (Ronald Holshausen, Fri May 23 10:10:59 2025 +1000)
+* 7d49354be - Merge pull request #1858 from WellingR/sync-message-pact-provider-state (Ronald Holshausen, Mon Mar 17 10:03:08 2025 +1100)
+* 7a924a007 - fix: Ensure provider state is injected when verifying synchronous message pacts (Ruud Welling, Sun Mar 16 18:44:41 2025 +0100)
+* 90e0f919d - bump version to 4.6.18 (Ronald Holshausen, Fri Feb 14 11:52:44 2025 +1100)
+
+# 4.6.17 - Bugfix Release
+
+* b3656418f - fix: Only coerce strings to numbers when comparing headers and query parameters (Ronald Holshausen, Fri Feb 14 10:27:01 2025 +1100)
+* 00e4b409f - Merge commit '8cb9773b51dc729c4d03414bcb8bc0a8843662a1' (Ronald Holshausen, Fri Feb 14 10:24:30 2025 +1100)
+* 8cb9773b5 - Squashed 'compatibility-suite/pact-compatibility-suite/' changes from cc76eac3c..1acfa1ecb (Ronald Holshausen, Fri Feb 14 10:24:30 2025 +1100)
+* 1b1cf8432 - chore(compatibility-suite): Correct the shared steps after updating the compatibility suite (Ronald Holshausen, Thu Feb 13 10:23:52 2025 +1100)
+* f6fa6e3fe - Squashed 'compatibility-suite/pact-compatibility-suite/' changes from 416f3a64d..cc76eac3c (Ronald Holshausen, Thu Feb 13 10:06:48 2025 +1100)
+* 878949219 - Merge commit 'f6fa6e3fe1da4c8fa8a7285f844c3187252365b3' (Ronald Holshausen, Thu Feb 13 10:06:48 2025 +1100)
+* c3938b4c8 - chore: Fix compatibility-suite CI build (Ronald Holshausen, Thu Feb 13 09:34:10 2025 +1100)
+* dea8fb762 - chore: Fix compatibility-suite CI build (Ronald Holshausen, Thu Feb 13 09:15:34 2025 +1100)
+* 8c5b0b1da - fix: Only split values of known multi-value headers #1852 (Ronald Holshausen, Wed Feb 12 16:01:17 2025 +1100)
+* d7d30304c - fix: Matching rule paths for fields with only digits should not be written as indices #1851 (Ronald Holshausen, Wed Feb 12 11:21:26 2025 +1100)
+* 5dba442e2 - fix: Lambda based DSL stringType method did not match the old DSL #1850 (Ronald Holshausen, Wed Feb 12 10:27:13 2025 +1100)
+* 287b16c44 - feat: Pass any transport config to the plugin in the test context under the transport_config key (Ronald Holshausen, Mon Dec 16 10:34:56 2024 +1100)
+* 80d8a8779 - chore: Add example of a test with a pending interaction (Ronald Holshausen, Fri Dec 6 09:38:52 2024 +1100)
+* 8b09520f2 - bump version to 4.6.17 (Ronald Holshausen, Thu Dec 5 09:50:10 2024 +1100)
+
 # 4.7.0-beta.1 - Upgrade Kotlin to 2.1 and update all dependencies
 
 * 7d50d9891 - chore: Upgrade KTor to 3.1.3 #1863 (Ronald Holshausen, Thu May 22 16:35:07 2025 +1000)

CONTRIBUTING.md

@@ -10,7 +10,7 @@
 
 Most of Pact-JVM is written in Kotlin and is built with Gradle. Tests are written using [Spock](https://spockframework.org/).
 
-Before you build, install java 11, `Gradle` and `Maven` (Maven is required to build the Maven plugin).
+Before you build, install java 17, `Gradle` and `Maven` (Maven is required to build the Maven plugin).
 
 #### To build the libraries:
 

README.md

@@ -168,6 +168,10 @@ You want to look at: [pact leiningen plugin](provider/lein)
 
 Have a look at [spring](provider/spring) or [Spring MVC Pact Test Runner](https://github.com/realestate-com-au/pact-jvm-provider-spring-mvc) (Not maintained).
 
+#### verify pacts with a Quarkus project
+
+Have a look at the Quarkus Pact [provider extension](https://quarkus.io/extensions/io.quarkiverse.pact/quarkus-pact-provider/)
+
 #### I want to verify pacts but don't want to use sbt or gradle or leiningen
 
 You want to look at: [provider](provider)

buildSrc/build.gradle

@@ -13,5 +13,5 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0'
     implementation 'io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8'
     implementation 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.20'
-    implementation 'org.apache.commons:commons-text:1.13.1'
+    implementation 'org.apache.commons:commons-text:1.14.0'
 }

buildSrc/src/main/groovy/au.com.dius.pact.kotlin-common-conventions.gradle

@@ -39,36 +39,36 @@ dependencies {
         api 'org.apache.tika:tika-core:2.9.4'
         api 'io.github.oshai:kotlin-logging-jvm:7.0.7'
 
-        implementation 'commons-codec:commons-codec:1.18.0'
+        implementation 'commons-codec:commons-codec:1.19.0'
         implementation 'commons-io:commons-io:2.19.0'
         implementation 'org.jetbrains.kotlin:kotlin-stdlib:2.2.0'
-        implementation 'org.apache.commons:commons-lang3:3.17.0'
-        implementation 'org.apache.commons:commons-text:1.13.1'
+        implementation 'org.apache.commons:commons-lang3:3.19.0'
+        implementation 'org.apache.commons:commons-text:1.14.0'
         implementation 'org.apache.commons:commons-collections4:4.5.0'
         implementation 'org.apache.tika:tika-core:2.9.4'
-        implementation 'com.google.guava:guava:33.4.8-jre'
+        implementation 'com.google.guava:guava:33.5.0-jre'
         implementation 'org.slf4j:slf4j-api:2.0.17'
         implementation 'io.ktor:ktor-http-jvm:3.1.3'
         implementation 'io.ktor:ktor-server-netty:3.1.3'
         implementation 'io.ktor:ktor-network-tls-certificates:3.1.3'
         implementation 'io.ktor:ktor-server-call-logging:3.1.3'
         implementation 'io.netty:netty-handler:4.2.1.Final'
-        implementation 'org.apache.groovy:groovy:4.0.26'
-        implementation 'org.apache.groovy:groovy-json:4.0.26'
-        implementation 'org.apache.groovy:groovy-xml:4.0.26'
+        implementation 'org.apache.groovy:groovy:4.0.29'
+        implementation 'org.apache.groovy:groovy-json:4.0.29'
+        implementation 'org.apache.groovy:groovy-xml:4.0.29'
         implementation 'io.pact.plugin.driver:core:0.5.2'  //remember to also update under api
         implementation 'io.github.oshai:kotlin-logging-jvm:7.0.7'
 
-        testImplementation 'org.apache.groovy:groovy:4.0.26'
-        testImplementation 'org.apache.groovy:groovy-json:4.0.26'
-        testImplementation 'org.apache.groovy:groovy-datetime:4.0.26'
-        testImplementation 'org.apache.groovy:groovy-xml:4.0.26'
-        testImplementation 'org.apache.groovy:groovy-nio:4.0.26'
+        testImplementation 'org.apache.groovy:groovy:4.0.29'
+        testImplementation 'org.apache.groovy:groovy-json:4.0.29'
+        testImplementation 'org.apache.groovy:groovy-datetime:4.0.29'
+        testImplementation 'org.apache.groovy:groovy-xml:4.0.29'
+        testImplementation 'org.apache.groovy:groovy-nio:4.0.29'
         testImplementation 'org.hamcrest:hamcrest:3.0'
         testImplementation 'junit:junit:4.13.2'
         testImplementation 'ch.qos.logback:logback-classic:1.4.14'
         testImplementation 'ch.qos.logback:logback-core:1.4.14'
-        testImplementation 'net.bytebuddy:byte-buddy:1.17.5'
+        testImplementation 'net.bytebuddy:byte-buddy:1.17.8'
         testImplementation 'com.github.tomakehurst:wiremock-jre8:2.35.2'
         testImplementation 'org.junit.vintage:junit-vintage-engine:5.12.2'
         testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'
@@ -82,7 +82,7 @@ dependencies {
     implementation 'org.jetbrains.kotlin:kotlin-reflect:2.2.0'
 
     codenarc('org.codenarc:CodeNarc:3.6.0-groovy-4.0')
-    codenarc('org.apache.groovy:groovy:4.0.26')
+    codenarc('org.apache.groovy:groovy:4.0.29')
 }
 
 testing {

buildSrc/src/main/groovy/au.com.dius.pact.kotlin-library-conventions.gradle

@@ -6,7 +6,6 @@ plugins {
     id 'java-library'
 
     id 'maven-publish'
-    id 'signing'
     id 'org.jetbrains.dokka'
 }
 
@@ -83,18 +82,7 @@ publishing {
     }
     repositories {
         maven {
-            url "https://oss.sonatype.org/service/local/staging/deploy/maven2"
-            if (project.hasProperty('sonatypeUsername')) {
-                credentials {
-                    username sonatypeUsername
-                    password sonatypePassword
-                }
-            }
+          url = rootProject.layout.buildDirectory.dir('staging-deploy')
         }
     }
 }
-
-signing {
-    required { project.hasProperty('isRelease') }
-    sign publishing.publications.mavenPublication
-}

consumer/build.gradle

@@ -26,7 +26,7 @@ dependencies {
   }
   implementation 'org.apache.commons:commons-lang3'
   implementation 'org.apache.commons:commons-io:1.3.2'
-  implementation 'org.apache.commons:commons-text:1.13.1'
+  implementation 'org.apache.commons:commons-text:1.14.0'
   implementation 'org.apache.tika:tika-core'
 
   testImplementation 'org.hamcrest:hamcrest'
@@ -40,7 +40,7 @@ dependencies {
   testImplementation 'org.apache.groovy:groovy-dateutil'
   testRuntimeOnly 'net.bytebuddy:byte-buddy'
   testRuntimeOnly 'org.objenesis:objenesis:3.4'
-  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.19.0'
-  testImplementation 'io.grpc:grpc-protobuf:1.72.0'
+  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.20.1'
+  testImplementation 'io.grpc:grpc-protobuf:1.76.0'
   testImplementation 'org.junit.jupiter:junit-jupiter-api'
 }

consumer/groovy/build.gradle

@@ -22,7 +22,7 @@ dependencies {
   testImplementation 'org.apache.groovy:groovy-xml'
   testImplementation 'org.apache.groovy:groovy-dateutil'
 
-  groovyDoc 'org.apache.groovy:groovy-all:4.0.26'
+  groovyDoc 'org.apache.groovy:groovy-all:4.0.29'
 }
 
 compileGroovy {