NO-ISSUE: Upgrade WireMock to 3.9.2; Add Jboss RestEasy Multipart t…

…o IT (#882) * NO-ISSUE: Upgrade WireMock; Add Jboss RestEasy Multipart to IT Signed-off-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> * Remove leftovers Signed-off-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com> --------- Signed-off-by: Ricardo Zanini <1538000+ricardozanini@users.noreply.github.com>
quarkiverse · Dec 2, 2024 · 2d82c37 · 2d82c37
1 parent 2711260
commit 2d82c37
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 47 deletions.
diff --git a/client/integration-tests/beanparam/pom.xml b/client/integration-tests/beanparam/pom.xml
@@ -27,8 +27,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/client/integration-tests/change-custom-template-directory/pom.xml b/client/integration-tests/change-custom-template-directory/pom.xml
@@ -20,8 +20,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/client/integration-tests/change-directory/pom.xml b/client/integration-tests/change-directory/pom.xml
@@ -20,8 +20,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/client/integration-tests/cookie-authentication/pom.xml b/client/integration-tests/cookie-authentication/pom.xml
@@ -28,8 +28,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/client/integration-tests/enum-property/pom.xml b/client/integration-tests/enum-property/pom.xml
@@ -27,8 +27,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...sts/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java b/...sts/enum-property/src/test/java/io/quarkiverse/openapi/generator/it/EnumPropertyTest.java
@@ -20,7 +20,6 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
@@ -67,8 +66,7 @@ public Map<String, String> start() {
         }
 
         private void configureWiremockServer() {
-            var wireMockConfiguration = WireMockConfiguration.wireMockConfig()
-                    .extensions(new ResponseTemplateTransformer(false)).dynamicPort();
+            var wireMockConfiguration = WireMockConfiguration.wireMockConfig().dynamicPort();
             wireMockServer = new WireMockServer(wireMockConfiguration);
             wireMockServer.start();
 

diff --git a/client/integration-tests/enum-unexpected/pom.xml b/client/integration-tests/enum-unexpected/pom.xml
@@ -27,8 +27,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/...enum-unexpected/src/test/java/io/quarkiverse/openapi/generator/it/EnumUnexpectedTest.java b/...enum-unexpected/src/test/java/io/quarkiverse/openapi/generator/it/EnumUnexpectedTest.java
@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.databind.exc.ValueInstantiationException;
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
@@ -35,6 +34,8 @@ class EnumUnexpectedTest {
     @RestClient
     @Inject
     org.openapi.quarkus.with_enum_unexpected_yaml.api.DefaultApi api;
+    @Inject
+    ObjectMapper objectMapper;
 
     @Test
     void apiIsBeingGenerated() {
@@ -45,9 +46,6 @@ void apiIsBeingGenerated() {
                 .isEqualTo(org.openapi.quarkus.with_enum_unexpected_yaml.model.Echo.MsgTypeEnum.UNEXPECTED);
     }
 
-    @Inject
-    ObjectMapper objectMapper;
-
     @Test
     void when_additional_enum_type_unexpected_member_is_true_should_have_extra_member() {
         AssertionsForClassTypes.assertThat(org.openapi.quarkus.with_enum_unexpected_yaml.model.Echo.MsgTypeEnum.class)
@@ -89,8 +87,7 @@ public Map<String, String> start() {
         }
 
         private void configureWiremockServer() {
-            var wireMockConfiguration = WireMockConfiguration.wireMockConfig()
-                    .extensions(new ResponseTemplateTransformer(false)).dynamicPort();
+            var wireMockConfiguration = WireMockConfiguration.wireMockConfig().dynamicPort();
             wireMockServer = new WireMockServer(wireMockConfiguration);
             wireMockServer.start();
 

diff --git a/client/integration-tests/generation-tests/pom.xml b/client/integration-tests/generation-tests/pom.xml
@@ -25,8 +25,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/client/integration-tests/multipart-request/pom.xml b/client/integration-tests/multipart-request/pom.xml
@@ -21,8 +21,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/client/integration-tests/open-api-normalizer/pom.xml b/client/integration-tests/open-api-normalizer/pom.xml
@@ -26,8 +26,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/client/integration-tests/polymorphism/pom.xml b/client/integration-tests/polymorphism/pom.xml
@@ -21,8 +21,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>com.github.tomakehurst</groupId>
-            <artifactId>wiremock-jre8</artifactId>
+            <groupId>org.wiremock</groupId>
+            <artifactId>wiremock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

diff --git a/...ests/polymorphism/src/test/java/io/quarkiverse/openapi/generator/it/PolymorphismTest.java b/...ests/polymorphism/src/test/java/io/quarkiverse/openapi/generator/it/PolymorphismTest.java
@@ -15,7 +15,6 @@
 
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
 
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
@@ -52,8 +51,7 @@ public Map<String, String> start() {
         }
 
         private void configureWiremockServer() {
-            var wireMockConfiguration = WireMockConfiguration.wireMockConfig()
-                    .extensions(new ResponseTemplateTransformer(false)).dynamicPort();
+            var wireMockConfiguration = WireMockConfiguration.wireMockConfig().dynamicPort();
             wireMockServer = new WireMockServer(wireMockConfiguration);
             wireMockServer.start();
 

diff --git a/client/integration-tests/pom.xml b/client/integration-tests/pom.xml
@@ -46,9 +46,9 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>com.github.tomakehurst</groupId>
-        <artifactId>wiremock-jre8</artifactId>
-        <version>${version.com.github.tomakehurst}</version>
+        <groupId>org.wiremock</groupId>
+        <artifactId>wiremock</artifactId>
+        <version>${version.org.wiremock}</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -74,6 +74,10 @@
           <groupId>io.quarkus</groupId>
           <artifactId>quarkus-resteasy-client-jackson</artifactId>
         </dependency>
+        <dependency>
+          <groupId>org.jboss.resteasy</groupId>
+          <artifactId>resteasy-multipart-provider</artifactId>
+        </dependency>
       </dependencies>
       <build>
         <plugins>

diff --git a/client/integration-tests/security/pom.xml b/client/integration-tests/security/pom.xml
@@ -26,8 +26,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/client/integration-tests/skip-validation/pom.xml b/client/integration-tests/skip-validation/pom.xml
@@ -22,8 +22,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/client/integration-tests/type-mapping/pom.xml b/client/integration-tests/type-mapping/pom.xml
@@ -21,8 +21,8 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/client/test-utils/pom.xml b/client/test-utils/pom.xml
@@ -22,8 +22,8 @@
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.tomakehurst</groupId>
-      <artifactId>wiremock-jre8</artifactId>
+      <groupId>org.wiremock</groupId>
+      <artifactId>wiremock</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
     <version.com.github.javaparser>3.26.2</version.com.github.javaparser>
     <version.org.assertj>3.26.3</version.org.assertj>
     <version.org.eclipse.microprofile.fault-tolerance>4.1.1</version.org.eclipse.microprofile.fault-tolerance>
-    <version.com.github.tomakehurst>2.35.2</version.com.github.tomakehurst>
+    <version.org.wiremock>3.9.2</version.org.wiremock>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -63,9 +63,9 @@
         <version>${apicurio.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.github.tomakehurst</groupId>
-        <artifactId>wiremock-jre8</artifactId>
-        <version>${version.com.github.tomakehurst}</version>
+        <groupId>org.wiremock</groupId>
+        <artifactId>wiremock</artifactId>
+        <version>${version.org.wiremock}</version>
       </dependency>
       <!-- Test -->
       <dependency>