Fixed tests and got rid of quarkus-resteasy-mutiny

quarkusio · Aug 2, 2023 · d55e533 · d55e533
1 parent 2794c39
commit d55e533
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 42 deletions.
diff --git a/integration-tests/grpc-mutual-auth/pom.xml b/integration-tests/grpc-mutual-auth/pom.xml
@@ -16,11 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -78,20 +74,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

diff --git a/integration-tests/grpc-mutual-auth/src/main/resources/application.properties b/integration-tests/grpc-mutual-auth/src/main/resources/application.properties
@@ -21,8 +21,8 @@ quarkus.grpc.server.ssl.trust-store-password=123456
 quarkus.grpc.server.ssl.client-auth=REQUIRED
 
 %vertx.quarkus.http.insecure-requests=disabled
-%vertx.quarkus.http.ssl.certificate.file=tls/server.pem
-%vertx.quarkus.http.ssl.certificate.key-file=tls/server.key
+%vertx.quarkus.http.ssl.certificate.files=tls/server.pem
+%vertx.quarkus.http.ssl.certificate.key-files=tls/server.key
 %vertx.quarkus.http.ssl.certificate.trust-store-file=tls/ca.jks
 %vertx.quarkus.http.ssl.certificate.trust-store-password=123456
 %vertx.quarkus.http.ssl.client-auth=required

diff --git a/integration-tests/grpc-tls/pom.xml b/integration-tests/grpc-tls/pom.xml
@@ -16,11 +16,7 @@
     <dependencies>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny</artifactId>
+            <artifactId>quarkus-resteasy-reactive</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -69,20 +65,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-deployment</artifactId>
-            <version>${project.version}</version>
-            <type>pom</type>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-resteasy-mutiny-deployment</artifactId>
+            <artifactId>quarkus-resteasy-reactive-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

diff --git a/integration-tests/grpc-tls/src/main/resources/application.properties b/integration-tests/grpc-tls/src/main/resources/application.properties
@@ -5,8 +5,8 @@ quarkus.grpc.clients.hello.ssl.trust-store=tls/ca.pem
 quarkus.grpc.server.ssl.certificate=tls/server.pem
 quarkus.grpc.server.ssl.key=tls/server.key
 
-%vertx.quarkus.http.ssl.certificate.file=tls/server.pem
-%vertx.quarkus.http.ssl.certificate.key-file=tls/server.key
+%vertx.quarkus.http.ssl.certificate.files=tls/server.pem
+%vertx.quarkus.http.ssl.certificate.key-files=tls/server.key
 
 quarkus.grpc.server.port=9001