From 5ddcb871794f4b37093bb0f398f20a3ce6968424 Mon Sep 17 00:00:00 2001
From: Piotr Dec <piotr_dec@msn.com>
Date: Thu, 22 Feb 2024 22:48:45 +0100
Subject: [PATCH] feat!: Groovy 4 & JAXB 4

---
 mockserver-client/pom.xml                     | 15 ++++++++---
 .../eu/ztsh/mockserver/client/Util.groovy     |  3 ++-
 mockserver-tests/pom.xml                      |  2 +-
 .../tests/MockServerHttpsTest.groovy          | 15 +++++------
 .../tests/MockServerIntegrationTest.groovy    |  2 +-
 mockserver/pom.xml                            | 15 ++++++++---
 .../ztsh/mockserver/server/MockRequest.groovy |  3 ++-
 pom.xml                                       | 25 +++++++++++--------
 8 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/mockserver-client/pom.xml b/mockserver-client/pom.xml
index 223178e..cb7acfb 100644
--- a/mockserver-client/pom.xml
+++ b/mockserver-client/pom.xml
@@ -18,18 +18,27 @@
         </dependency>
 
         <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>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
diff --git a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy
index 0583484..e79e0c3 100644
--- a/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy
+++ b/mockserver-client/src/main/groovy/eu/ztsh/mockserver/client/Util.groovy
@@ -3,7 +3,8 @@ package eu.ztsh.mockserver.client
 import groovy.json.JsonSlurper
 import groovy.transform.CompileStatic
 import groovy.transform.TypeChecked
-import groovy.util.slurpersupport.GPathResult
+import groovy.xml.XmlSlurper
+import groovy.xml.slurpersupport.GPathResult
 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 9f3cc41..bd51227 100644
--- a/mockserver-tests/pom.xml
+++ b/mockserver-tests/pom.xml
@@ -22,7 +22,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy</artifactId>
         </dependency>
 
diff --git a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy
index c83ed6c..5121042 100644
--- a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy
+++ b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerHttpsTest.groovy
@@ -1,6 +1,11 @@
 package eu.ztsh.mockserver.tests
 
-import groovy.util.slurpersupport.GPathResult
+import eu.ztsh.mockserver.api.common.Https
+import eu.ztsh.mockserver.api.request.AddMock
+import eu.ztsh.mockserver.client.RemoteMockServer
+import eu.ztsh.mockserver.client.Util
+import eu.ztsh.mockserver.server.HttpMockServer
+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
@@ -9,11 +14,6 @@ import org.apache.http.entity.ContentType
 import org.apache.http.entity.StringEntity
 import org.apache.http.impl.client.CloseableHttpClient
 import org.apache.http.impl.client.HttpClients
-import eu.ztsh.mockserver.api.common.Https
-import eu.ztsh.mockserver.api.request.AddMock
-import eu.ztsh.mockserver.client.RemoteMockServer
-import eu.ztsh.mockserver.client.Util
-import eu.ztsh.mockserver.server.HttpMockServer
 import spock.lang.AutoCleanup
 import spock.lang.Ignore
 import spock.lang.Shared
@@ -23,7 +23,6 @@ import javax.net.ssl.SSLContext
 import javax.net.ssl.SSLHandshakeException
 import java.security.KeyStore
 
-@Ignore('Upgrade of Java needed')
 class MockServerHttpsTest extends Specification {
 
     RemoteMockServer remoteMockServer = new RemoteMockServer('localhost', 19000)
@@ -48,6 +47,7 @@ class MockServerHttpsTest extends Specification {
         .loadTrustMaterial(trustStore())
         .build()
 
+    @Ignore("TODO: SSL peer shut down incorrectly")
     def 'should handle HTTPS server' () {
         given:
             remoteMockServer.addMock(new AddMock(
@@ -72,6 +72,7 @@ class MockServerHttpsTest extends Specification {
             restPostResponse.name() == 'goodResponse-request'
     }
 
+    @Ignore("TODO: SSL peer shut down incorrectly")
     def 'should handle HTTPS server with client auth' () {
         given:
             remoteMockServer.addMock(new AddMock(
diff --git a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy
index fc88b53..56e498d 100644
--- a/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy
+++ b/mockserver-tests/src/test/groovy/eu/ztsh/mockserver/tests/MockServerIntegrationTest.groovy
@@ -1,6 +1,6 @@
 package eu.ztsh.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 c1bf76c..d097048 100644
--- a/mockserver/pom.xml
+++ b/mockserver/pom.xml
@@ -18,18 +18,27 @@
         </dependency>
 
         <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>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
diff --git a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy
index 4d9fca0..a714afe 100644
--- a/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy
+++ b/mockserver/src/main/groovy/eu/ztsh/mockserver/server/MockRequest.groovy
@@ -3,7 +3,8 @@ package eu.ztsh.mockserver.server
 import com.sun.net.httpserver.Headers
 import groovy.json.JsonSlurper
 import groovy.transform.PackageScope
-import groovy.util.slurpersupport.GPathResult
+import groovy.xml.XmlSlurper
+import groovy.xml.slurpersupport.GPathResult
 import groovy.xml.XmlUtil
 
 @PackageScope
diff --git a/pom.xml b/pom.xml
index 7e57e1d..a981985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,14 +23,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <groovy.version>3.0.20</groovy.version>
+        <groovy.version>4.0.12</groovy.version>
         <httpclient.version>4.5.13</httpclient.version>
-        <spock-core.version>2.0-groovy-3.0</spock-core.version>
+        <spock-core.version>2.2-groovy-4.0</spock-core.version>
         <commons-lang3.version>3.3.2</commons-lang3.version>
         <slf4j-api.version>1.7.30</slf4j-api.version>
         <logback.version>1.3.12</logback.version>
         <lombok.version>1.18.26</lombok.version>
-        <jakarta-xml-bind.version>4.0.1</jakarta-xml-bind.version>
+        <jaxb.version>4.0.4</jaxb.version>
 
         <autoVersionSubmodules>true</autoVersionSubmodules>
         <jmh.version>1.37</jmh.version>
@@ -57,17 +57,25 @@
             </dependency>
 
             <dependency>
-                <groupId>org.codehaus.groovy</groupId>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-bom</artifactId>
+                <version>${jaxb.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+            <dependency>
+                <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>
@@ -82,11 +90,6 @@
                 <artifactId>commons-lang3</artifactId>
                 <version>${commons-lang3.version}</version>
             </dependency>
-            <dependency>
-                <groupId>jakarta.xml.bind</groupId>
-                <artifactId>jakarta.xml.bind-api</artifactId>
-                <version>${jakarta-xml-bind.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>