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<String> 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 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-xml</artifactId>
         </dependency>
         <dependency>
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 afcfe3c..bb6332e 100644
--- a/mockserver-tests/pom.xml
+++ b/mockserver-tests/pom.xml
@@ -15,7 +15,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
@@ -44,10 +44,6 @@
             <artifactId>mockserver-client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>info.solidsoft.spock</groupId>
-            <artifactId>spock-global-unroll</artifactId>
-        </dependency>
     </dependencies>
 
 </project>
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 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-json</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-xml</artifactId>
         </dependency>
         <dependency>
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 5511244..d046174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,9 +24,9 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-        <groovy.version>2.5.7</groovy.version>
+        <groovy.version>4.0.29</groovy.version>
         <httpclient.version>4.5.14</httpclient.version>
-        <spock-core.version>1.3-groovy-2.5</spock-core.version>
+        <spock-core.version>2.3-groovy-4.0</spock-core.version>
         <commons-lang3.version>3.19.0</commons-lang3.version>
         <slf4j-api.version>1.7.30</slf4j-api.version>
         <logback.version>1.5.20</logback.version>
@@ -36,7 +36,6 @@
         <jmh.version>1.37</jmh.version>
         <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
         <gmavenplus-plugin.version>4.2.1</gmavenplus-plugin.version>
-        <spock-global-unroll.version>0.5.1</spock-global-unroll.version>
     </properties>
 
     <scm>
@@ -48,17 +47,17 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-json</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.apache.groovy</groupId>
                 <artifactId>groovy-xml</artifactId>
                 <version>${groovy.version}</version>
             </dependency>
@@ -115,12 +114,6 @@
                 <version>${jmh.version}</version>
                 <scope>test</scope>
             </dependency>
-            <dependency>
-                <groupId>info.solidsoft.spock</groupId>
-                <artifactId>spock-global-unroll</artifactId>
-                <version>${spock-global-unroll.version}</version>
-                <scope>test</scope>
-            </dependency>
         </dependencies>
     </dependencyManagement>