From 414ecf325611945eeffa2a2e9e8c1370e33af5ac Mon Sep 17 00:00:00 2001
From: James Netherton <jamesnetherton@gmail.com>
Date: Wed, 6 Dec 2023 12:11:21 +0000
Subject: [PATCH] Switch to org.wiremock:wiremock-standalone

---
 integration-tests-support/wiremock/pom.xml          |  4 ++--
 integration-tests/oaipmh/pom.xml                    | 13 ++-----------
 .../openstack/it/OpenStackTestResource.java         |  8 --------
 .../salesforce/SalesforceTestResource.java          |  8 --------
 pom.xml                                             |  2 +-
 poms/bom-test/pom.xml                               |  4 ++--
 6 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/integration-tests-support/wiremock/pom.xml b/integration-tests-support/wiremock/pom.xml
index 0197c18db871..d600d1da4dc2 100644
--- a/integration-tests-support/wiremock/pom.xml
+++ b/integration-tests-support/wiremock/pom.xml
@@ -39,8 +39,8 @@
             <artifactId>camel-quarkus-integration-test-support-mock-backend</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
diff --git a/integration-tests/oaipmh/pom.xml b/integration-tests/oaipmh/pom.xml
index dcc8b2f7186f..dfca90e198b5 100644
--- a/integration-tests/oaipmh/pom.xml
+++ b/integration-tests/oaipmh/pom.xml
@@ -67,11 +67,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty</groupId>
-            <artifactId>jetty-servlet</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.camel.quarkus</groupId>
             <artifactId>camel-quarkus-integration-test-support</artifactId>
@@ -83,14 +78,10 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock-standalone</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
-        </dependency>
     </dependencies>
 
     <profiles>
diff --git a/integration-tests/openstack/src/test/java/org/apache/camel/quarkus/component/openstack/it/OpenStackTestResource.java b/integration-tests/openstack/src/test/java/org/apache/camel/quarkus/component/openstack/it/OpenStackTestResource.java
index 6d2011e5ec45..3ac7a48bf15a 100644
--- a/integration-tests/openstack/src/test/java/org/apache/camel/quarkus/component/openstack/it/OpenStackTestResource.java
+++ b/integration-tests/openstack/src/test/java/org/apache/camel/quarkus/component/openstack/it/OpenStackTestResource.java
@@ -18,8 +18,6 @@
 
 import java.util.Map;
 
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 import org.apache.camel.quarkus.test.wiremock.WireMockTestResourceLifecycleManager;
 
 public class OpenStackTestResource extends WireMockTestResourceLifecycleManager {
@@ -41,10 +39,4 @@ protected String getRecordTargetBaseUrl() {
     protected boolean isMockingEnabled() {
         return true;
     }
-
-    @Override
-    protected void customizeWiremockConfiguration(WireMockConfiguration config) {
-        config.extensions(new ResponseTemplateTransformer(false));
-    }
-
 }
diff --git a/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTestResource.java b/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTestResource.java
index 9d47e8ced250..afa81b420e02 100644
--- a/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTestResource.java
+++ b/integration-tests/salesforce/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTestResource.java
@@ -18,8 +18,6 @@
 
 import java.util.Map;
 
-import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 import org.apache.camel.quarkus.test.wiremock.WireMockTestResourceLifecycleManager;
 
 public class SalesforceTestResource extends WireMockTestResourceLifecycleManager {
@@ -50,10 +48,4 @@ public Map<String, String> start() {
         }
         return options;
     }
-
-    @Override
-    protected void customizeWiremockConfiguration(WireMockConfiguration config) {
-        config.extensions(new ResponseTemplateTransformer(false));
-    }
-
 }
diff --git a/pom.xml b/pom.xml
index 69914c18e7d6..2bd335c3a058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -170,7 +170,7 @@
         <pdfbox.version>${pdfbox-version}</pdfbox.version>
         <sshd.version>2.10.0</sshd.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.sshd:sshd-common -->
         <unboundid-ldapsdk.version>6.0.11</unboundid-ldapsdk.version>
-        <wiremock.version>3.0.0-beta-10</wiremock.version>
+        <wiremock.version>3.3.1</wiremock.version>
         <zt-exec.version>1.12</zt-exec.version>
 
         <!-- Tooling dependency versions (keep sorted alphabetically) -->
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 32687c5a7b7a..9e4a72b51591 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -342,8 +342,8 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>com.github.tomakehurst</groupId>
-                <artifactId>wiremock</artifactId>
+                <groupId>org.wiremock</groupId>
+                <artifactId>wiremock-standalone</artifactId>
                 <version>${wiremock.version}</version>
                 <exclusions>
                     <exclusion>