Switch to org.wiremock:wiremock-standalone

apache · Dec 6, 2023 · 414ecf3 · 414ecf3
1 parent 7c28220
commit 414ecf3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 32 deletions.
diff --git 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
@@ -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/.../src/test/java/org/apache/camel/quarkus/component/openstack/it/OpenStackTestResource.java b/.../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/...e/src/test/java/org/apache/camel/quarkus/component/salesforce/SalesforceTestResource.java b/...e/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
@@ -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
@@ -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>