From 4d339f0a90ef2b9d1572a02f7c4fb738b8fff555 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 23 Oct 2025 19:13:16 +0000 Subject: [PATCH 1/3] Bump groovy.version from 2.5.7 to 3.0.25 Bumps `groovy.version` from 2.5.7 to 3.0.25. Updates `org.codehaus.groovy:groovy` from 2.5.7 to 3.0.25 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-json` from 2.5.7 to 3.0.25 - [Commits](https://github.com/apache/groovy/commits) Updates `org.codehaus.groovy:groovy-xml` from 2.5.7 to 3.0.25 - [Commits](https://github.com/apache/groovy/commits) --- updated-dependencies: - dependency-name: org.codehaus.groovy:groovy dependency-version: 3.0.25 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.codehaus.groovy:groovy-json dependency-version: 3.0.25 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.codehaus.groovy:groovy-xml dependency-version: 3.0.25 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5511244..e89465c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ UTF-8 UTF-8 3.1 - 2.5.7 + 3.0.25 4.5.14 1.3-groovy-2.5 3.19.0 From dd95b3d8e34a28127a6047f4bbdb125ac1fb4930 Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Mon, 27 Oct 2025 22:32:41 +0100 Subject: [PATCH 2/3] Upgrade spock and remoe global unroll --- mockserver-tests/pom.xml | 4 ---- pom.xml | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml index afcfe3c..4925716 100644 --- a/mockserver-tests/pom.xml +++ b/mockserver-tests/pom.xml @@ -44,10 +44,6 @@ mockserver-client ${project.version} - - info.solidsoft.spock - spock-global-unroll - diff --git a/pom.xml b/pom.xml index e89465c..b1186ca 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ 3.1 3.0.25 4.5.14 - 1.3-groovy-2.5 + 2.3-groovy-3.0 3.19.0 1.7.30 1.5.20 @@ -36,7 +36,6 @@ 1.37 2.5.2 4.2.1 - 0.5.1 @@ -115,12 +114,6 @@ ${jmh.version} test - - info.solidsoft.spock - spock-global-unroll - ${spock-global-unroll.version} - test - From d861b6868fb3948dd02c3a4fde641b18df624e1b Mon Sep 17 00:00:00 2001 From: Dominik Przybysz Date: Mon, 27 Oct 2025 22:44:22 +0100 Subject: [PATCH 3/3] Upgrade to groovy 4.x --- README.md | 4 ++-- mockserver-client/pom.xml | 6 +++--- .../main/groovy/pl/touk/mockserver/client/Util.groovy | 3 ++- mockserver-tests/pom.xml | 2 +- .../touk/mockserver/tests/MockServerHttpsTest.groovy | 2 +- .../mockserver/tests/MockServerIntegrationTest.groovy | 2 +- mockserver/pom.xml | 6 +++--- .../pl/touk/mockserver/server/MockRequest.groovy | 3 ++- pom.xml | 10 +++++----- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 24b3e0d..efd66d9 100644 --- a/README.md +++ b/README.md @@ -192,8 +192,8 @@ In closures input parameter (called req) contains properties: - text - request body as java.util.String - headers - java.util.Map with request headers - query - java.util.Map with query parameters -- xml - groovy.util.slurpersupport.GPathResult created from request body (if request body is valid xml) -- soap - groovy.util.slurpersupport.GPathResult created from request body without Envelope and Body elements (if request body is valid soap xml) +- xml - groovy.xml.slurpersupport.GPathResult created from request body (if request body is valid xml) +- soap - groovy.xml.slurpersupport.GPathResult created from request body without Envelope and Body elements (if request body is valid soap xml) - json - java.lang.Object created from request body (if request body is valid json) - path - java.util.List with not empty parts of request path diff --git a/mockserver-client/pom.xml b/mockserver-client/pom.xml index fb10031..39d9b6c 100644 --- a/mockserver-client/pom.xml +++ b/mockserver-client/pom.xml @@ -14,15 +14,15 @@ - org.codehaus.groovy + org.apache.groovy groovy - org.codehaus.groovy + org.apache.groovy groovy-json - org.codehaus.groovy + org.apache.groovy groovy-xml diff --git a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy index 3a427d6..c4a20a3 100644 --- a/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy +++ b/mockserver-client/src/main/groovy/pl/touk/mockserver/client/Util.groovy @@ -3,7 +3,8 @@ package pl.touk.mockserver.client import groovy.json.JsonSlurper import groovy.transform.CompileStatic import groovy.transform.TypeChecked -import groovy.util.slurpersupport.GPathResult +import groovy.xml.slurpersupport.GPathResult +import groovy.xml.XmlSlurper import org.apache.http.HttpEntity import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.util.EntityUtils diff --git a/mockserver-tests/pom.xml b/mockserver-tests/pom.xml index 4925716..bb6332e 100644 --- a/mockserver-tests/pom.xml +++ b/mockserver-tests/pom.xml @@ -15,7 +15,7 @@ - org.codehaus.groovy + org.apache.groovy groovy diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy index 58c922e..e223682 100644 --- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy +++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerHttpsTest.groovy @@ -1,6 +1,6 @@ package pl.touk.mockserver.tests -import groovy.util.slurpersupport.GPathResult +import groovy.xml.slurpersupport.GPathResult import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpPost import org.apache.http.conn.ssl.SSLConnectionSocketFactory diff --git a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy index 1ab1dad..4db4d12 100644 --- a/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy +++ b/mockserver-tests/src/test/groovy/pl/touk/mockserver/tests/MockServerIntegrationTest.groovy @@ -1,6 +1,6 @@ package pl.touk.mockserver.tests -import groovy.util.slurpersupport.GPathResult +import groovy.xml.slurpersupport.GPathResult import org.apache.http.client.methods.CloseableHttpResponse import org.apache.http.client.methods.HttpDelete import org.apache.http.client.methods.HttpGet diff --git a/mockserver/pom.xml b/mockserver/pom.xml index 25e8617..8c4d290 100644 --- a/mockserver/pom.xml +++ b/mockserver/pom.xml @@ -11,15 +11,15 @@ - org.codehaus.groovy + org.apache.groovy groovy - org.codehaus.groovy + org.apache.groovy groovy-json - org.codehaus.groovy + org.apache.groovy groovy-xml diff --git a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy index 3657131..29ad795 100644 --- a/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy +++ b/mockserver/src/main/groovy/pl/touk/mockserver/server/MockRequest.groovy @@ -3,8 +3,9 @@ package pl.touk.mockserver.server import com.sun.net.httpserver.Headers import groovy.json.JsonSlurper import groovy.transform.PackageScope -import groovy.util.slurpersupport.GPathResult +import groovy.xml.slurpersupport.GPathResult import groovy.xml.XmlUtil +import groovy.xml.XmlSlurper @PackageScope class MockRequest { diff --git a/pom.xml b/pom.xml index b1186ca..d046174 100644 --- a/pom.xml +++ b/pom.xml @@ -24,9 +24,9 @@ UTF-8 UTF-8 3.1 - 3.0.25 + 4.0.29 4.5.14 - 2.3-groovy-3.0 + 2.3-groovy-4.0 3.19.0 1.7.30 1.5.20 @@ -47,17 +47,17 @@ - org.codehaus.groovy + org.apache.groovy groovy ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-json ${groovy.version} - org.codehaus.groovy + org.apache.groovy groovy-xml ${groovy.version}