Merge pull request #133 from quarkiverse/feat/q-392-update

feat: update quarkus to 3.9.2 version
quarkiverse · Apr 9, 2024 · 51ce992 · 51ce992
2 parents 5b8a7b0 + 4196c67
commit 51ce992
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 17 deletions.
diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,5 +1,5 @@
 :project-version: 1.5.0
-:quarkus-version: 3.8.2
+:quarkus-version: 3.9.2
 
 :quarkus-mockserver-url: https://github.com/quarkiverse/quarkus-mockserver
 

diff --git a/examples/local/pom.xml b/examples/local/pom.xml
@@ -14,7 +14,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-jackson</artifactId>
+            <artifactId>quarkus-rest-jackson</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

diff --git a/...ples/local/src/main/java/io/quarkiverse/mockserver/examples/local/BaseRestController.java b/...ples/local/src/main/java/io/quarkiverse/mockserver/examples/local/BaseRestController.java
@@ -31,8 +31,9 @@ public Map<String, Object> post(Data data) {
     @POST
     @Path("2")
     public Response post2(Data data) {
-        try {
-            return Response.fromResponse(client.getData2(Map.of(data.key, data.value))).build();
+        try (Response response = client.getData2(Map.of(data.key, data.value))) {
+            String tmp = response.readEntity(String.class);
+            return Response.ok(tmp).build();
         } catch (WebApplicationException ex) {
             return Response.fromResponse(ex.getResponse()).build();
         }

diff --git a/examples/local/src/main/resources/application.properties b/examples/local/src/main/resources/application.properties
@@ -10,5 +10,5 @@ quarkus.http.test-port=0
 %dev.quarkus.mockserver.devservices.log=true
 
 %dev.quarkus.mockserver.devservices.reuse=false
-%dev.activity-client/mp-rest/url=${quarkus.mockserver.endpoint}
-%test.activity-client/mp-rest/url=${quarkus.mockserver.endpoint}
+%dev.quarkus.rest-client.activity-client.url=${quarkus.mockserver.endpoint}
+%test.quarkus.rest-client.activity-client.url=${quarkus.mockserver.endpoint}
diff --git a/integration-tests/base/pom.xml b/integration-tests/base/pom.xml
@@ -12,7 +12,7 @@
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-jackson</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/...ration-tests/base/src/main/java/io/quarkiverse/mockserver/it/base/BaseRestController.java b/...ration-tests/base/src/main/java/io/quarkiverse/mockserver/it/base/BaseRestController.java
@@ -31,8 +31,9 @@ public Map<String, Object> post(Data data) {
     @POST
     @Path("2")
     public Response post2(Data data) {
-        try {
-            return Response.fromResponse(client.getData2(Map.of(data.key, data.value))).build();
+        try (Response response = client.getData2(Map.of(data.key, data.value))) {
+            String tmp = response.readEntity(String.class);
+            return Response.ok(tmp).build();
         } catch (WebApplicationException ex) {
             return Response.fromResponse(ex.getResponse()).build();
         }

diff --git a/integration-tests/base/src/main/resources/application.properties b/integration-tests/base/src/main/resources/application.properties
@@ -1,4 +1,4 @@
 quarkus.http.test-port=0
 
-activity-client/mp-rest/url=${quarkus.mockserver.endpoint}
-%test.activity-client/mp-rest/url=${quarkus.mockserver.endpoint}
+quarkus.rest-client.activity-client.url=${quarkus.mockserver.endpoint}
+%test.quarkus.rest-client.activity-client.url=${quarkus.mockserver.endpoint}
diff --git a/integration-tests/docker/pom.xml b/integration-tests/docker/pom.xml
@@ -16,7 +16,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-resteasy-jackson</artifactId>
+      <artifactId>quarkus-rest-jackson</artifactId>
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>

diff --git a/...tests/docker/src/main/java/io/quarkiverse/mockserver/it/docker/ExampleRestController.java b/...tests/docker/src/main/java/io/quarkiverse/mockserver/it/docker/ExampleRestController.java
@@ -31,8 +31,9 @@ public Map<String, Object> post(Data data) {
     @POST
     @Path("2")
     public Response post2(Data data) {
-        try {
-            return Response.fromResponse(client.getData2(Map.of(data.key, data.value))).build();
+        try (Response response = client.getData2(Map.of(data.key, data.value))) {
+            String tmp = response.readEntity(String.class);
+            return Response.ok(tmp).build();
         } catch (WebApplicationException ex) {
             return Response.fromResponse(ex.getResponse()).build();
         }

diff --git a/integration-tests/docker/src/main/resources/application.properties b/integration-tests/docker/src/main/resources/application.properties
@@ -1,6 +1,6 @@
 quarkus.http.test-port=0
-example-client/mp-rest/url=${quarkus.mockserver.endpoint}
-%test.example-client/mp-rest/url=${quarkus.mockserver.endpoint}
+quarkus.rest-client.example-client.url=${quarkus.mockserver.endpoint}
+%test.quarkus.rest-client.example-client.url=${quarkus.mockserver.endpoint}
 
 quarkus.container-image.build=true
 quarkus.container-image.tag=latest

diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
     <maven.compiler.release>17</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <quarkus.version>3.8.2</quarkus.version>
+    <quarkus.version>3.9.2</quarkus.version>
     <testcontainers.mockserver.version>1.19.7</testcontainers.mockserver.version>
     <mockserver-client.version>5.15.0</mockserver-client.version>
     <maven.compiler.parameters>true</maven.compiler.parameters>