Vert.x restructuring - part 2/2

- rename quarkus-vertx-web to quarkus-reactive-routes
- keep the API package name io.quarkus.vertx.web
- resolves #16797

bom/application/pom.xml

@@ -1552,12 +1552,12 @@
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-web</artifactId>
+                <artifactId>quarkus-reactive-routes</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-vertx-web-deployment</artifactId>
+                <artifactId>quarkus-reactive-routes-deployment</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>

devtools/bom-descriptor-json/pom.xml

@@ -1852,6 +1852,19 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
+                <dependency>
+                    <groupId>io.quarkus</groupId>
+                    <artifactId>quarkus-reactive-routes</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-redis-client</artifactId>
@@ -2671,19 +2684,6 @@
                         </exclusion>
                     </exclusions>
                 </dependency>
-                <dependency>
-                    <groupId>io.quarkus</groupId>
-                    <artifactId>quarkus-vertx-web</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-webjars-locator</artifactId>

devtools/cli/src/test/java/io/quarkus/cli/CliDriver.java

@@ -278,8 +278,8 @@ public static Result invokeExtensionListInstallableSearch(Path projectRoot) thro
         Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode,
                 "Expected OK return code. Result:\n" + result);
 
-        Assertions.assertTrue(result.stdout.contains("quarkus-vertx-web"),
-                "quarkus-vertx-web should be returned in search result. Found:\n" + result);
+        Assertions.assertTrue(result.stdout.contains("quarkus-reactive-routes"),
+                "quarkus-reactive-routes should be returned in search result. Found:\n" + result);
         Assertions.assertFalse(result.stdout.contains("quarkus-vertx-http"),
                 "quarkus-vertx-http should not be returned in search result (already installed). Found:\n" + result);
 
@@ -290,8 +290,8 @@ public static void invokeExtensionListFormatting(Path projectRoot) throws Except
         Result result = CliDriver.execute(projectRoot, "extension", "list", "-e", "-B", "--verbose", "-i", "--concise");
         Assertions.assertEquals(CommandLine.ExitCode.OK, result.exitCode,
                 "Expected OK return code. Result:\n" + result);
-        Assertions.assertTrue(result.stdout.contains("quarkus-vertx-web"),
-                "quarkus-vertx-web should be returned in result. Found:\n" + result);
+        Assertions.assertTrue(result.stdout.contains("quarkus-reactive-routes"),
+                "quarkus-reactive-routes should be returned in result. Found:\n" + result);
         Assertions.assertTrue(result.stdout.contains("Reactive Routes"),
                 "'Reactive Routes' descriptive name should be returned in results. Found:\n" + result);
 

devtools/cli/src/test/java/io/quarkus/cli/CliProjectJBangTest.java

@@ -90,7 +90,7 @@ public void testCreateAppOverrides() throws Exception {
         Path javaMain = valdiateJBangSourcePackage(project, "");
 
         String source = CliDriver.readFileAsString(project, javaMain);
-        Assertions.assertTrue(source.contains("quarkus-vertx-web"),
+        Assertions.assertTrue(source.contains("quarkus-reactive-routes"),
                 "Generated source should reference vertx-web. Found:\n" + source);
 
         result = CliDriver.invokeValidateDryRunBuild(project);

devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/examples/google-cloud-functions-http-example/codestart.yml

@@ -11,6 +11,6 @@ language:
     dependencies:
       - io.quarkus:quarkus-google-cloud-functions-http
       - io.quarkus:quarkus-resteasy
-      - io.quarkus:quarkus-vertx-web
+      - io.quarkus:quarkus-reactive-routes
       - io.quarkus:quarkus-funqy-http
       - io.quarkus:quarkus-undertow

docs/pom.xml

@@ -1813,6 +1813,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-reactive-routes-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-redis-client-deployment</artifactId>
@@ -2632,19 +2645,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-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-webjars-locator-deployment</artifactId>

docs/src/main/asciidoc/amazon-lambda-http.adoc

@@ -252,7 +252,7 @@ There is nothing special about the POM other than the inclusion of the `quarkus-
 (if you are deploying an AWS Gateway HTTP API) or the `quarkus-amazon-lambda-rest` extension (if you are deploy an AWS Gateway REST API).
 These extensions automatically generate everything you might need for your lambda deployment.
 
-Also, at least in the generated Maven archetype `pom.xml`, the `quarkus-resteasy`, `quarkus-vertx-web`, and `quarkus-undertow`
+Also, at least in the generated Maven archetype `pom.xml`, the `quarkus-resteasy`, `quarkus-reactive-routes`, and `quarkus-undertow`
 dependencies are all optional.  Pick which HTTP framework(s) you want to use (JAX-RS, Vertx Web, and/or Servlet) and
 remove the other dependencies to shrink your deployment.
 

docs/src/main/asciidoc/azure-functions-http.adoc

@@ -101,7 +101,7 @@ https://{appName}.azurewebsites.net/api/funqyHello
 
 The sample project includes the RESTEasy, Undertow, Vert.x Web, link:funqy-http[Funqy HTTP] extensions.  If you are only using one of those
 APIs (i.e. jax-rs only), respectively remove the maven dependency `quarkus-resteasy`, `quarkus-undertow`, `quarkus-funqy-http`, and/or
-`quarkus-vertx-web`.
+`quarkus-reactive-routes`.
 
 You must include the `quarkus-azure-functions-http` extension as this is a generic bridge between the Azure Functions
 runtime and the HTTP framework you are writing your microservices in.

docs/src/main/asciidoc/reactive-routes.adoc

@@ -30,15 +30,15 @@ See the xref:quarkus-reactive-architecture.adoc[Quarkus Reactive Architecture do
 == Declaring reactive routes
 
 The first way to use reactive routes is to use the `@Route` annotation.
-To have access to this annotation, you need to add the `quarkus-vertx-web` extension:
+To have access to this annotation, you need to add the `quarkus-reactive-routes` extension:
 
 In your `pom.xml` file, add:
 
 [source,xml]
 ----
 <dependency>
     <groupId>io.quarkus</groupId>
-    <artifactId>quarkus-vertx-web</artifactId>
+    <artifactId>quarkus-reactive-routes</artifactId>
 </dependency>
 ----
 
@@ -606,7 +606,7 @@ Check the https://vertx.io/docs/vertx-web/java/#_basic_vert_x_web_concepts[Vert.
 [NOTE]
 ====
 `Router` access is provided by the `quarkus-vertx-http` extension.
-If you use `quarkus-resteasy` or `quarkus-vertx-web`, the extension will be added automatically.
+If you use `quarkus-resteasy` or `quarkus-reactive-routes`, the extension will be added automatically.
 ====
 
 == Intercepting HTTP requests

extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml

@@ -45,7 +45,7 @@
         <!-- remove if not using vertx web -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
         <!-- remove if not using funqy -->
         <dependency>

extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml

@@ -45,7 +45,7 @@
         <!-- remove if not using vertx web -->
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
         <!-- remove if not using funqy -->
         <dependency>

extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml

@@ -52,7 +52,7 @@
     <!-- remove if not using vertx web -->
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-vertx-web</artifactId>
+      <artifactId>quarkus-reactive-routes</artifactId>
     </dependency>
     <!-- remove if not using funqy -->
     <dependency>

extensions/micrometer/deployment/pom.xml

@@ -89,7 +89,7 @@
 
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
             <scope>test</scope>
         </dependency>
 

extensions/pom.xml

@@ -35,6 +35,7 @@
         <module>websockets</module>
         <module>webjars-locator</module>
         <module>resteasy-reactive</module>
+        <module>reactive-routes</module>
         <module>apache-httpclient</module>
 
         <!-- Monitoring -->
@@ -56,7 +57,6 @@
         <!-- Reactive -->
         <module>mutiny</module>
         <module>vertx</module>
-        <module>vertx-web</module>
         <module>netty</module>
         <module>reactive-messaging-http</module>
         <module>reactive-streams-operators</module>

extensions/qute/deployment/pom.xml

@@ -50,7 +50,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

extensions/reactive-messaging-http/deployment/pom.xml

@@ -32,7 +32,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
         </dependency>
 
         <dependency>

extensions/reactive-messaging-http/runtime/pom.xml

@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
 
         <dependency>

extensions/vertx-web/deployment/pom.xml → extensions/reactive-routes/deployment/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-vertx-web-parent</artifactId>
+        <artifactId>quarkus-reactive-routes-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-vertx-web-deployment</artifactId>
-    <name>Quarkus - Vert.x Web - Deployment</name>
+    <artifactId>quarkus-reactive-routes-deployment</artifactId>
+    <name>Quarkus - Reactive Routes - Deployment</name>
 
     <dependencies>
         <dependency>
@@ -23,7 +23,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

extensions/vertx-web/pom.xml → extensions/reactive-routes/pom.xml

@@ -10,8 +10,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-vertx-web-parent</artifactId>
-    <name>Quarkus - Vert.x Web</name>
+    <artifactId>quarkus-reactive-routes-parent</artifactId>
+    <name>Quarkus - Reactive Routes</name>
     <packaging>pom</packaging>
     <modules>
         <module>deployment</module>

extensions/vertx-web/runtime/pom.xml → extensions/reactive-routes/runtime/pom.xml

@@ -3,14 +3,14 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>quarkus-vertx-web-parent</artifactId>
+        <artifactId>quarkus-reactive-routes-parent</artifactId>
         <groupId>io.quarkus</groupId>
         <version>999-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>quarkus-vertx-web</artifactId>
-    <name>Quarkus - Vert.x Web - Runtime</name>
+    <artifactId>quarkus-reactive-routes</artifactId>
+    <name>Quarkus - Reactive Routes - Runtime</name>
     <description>REST framework offering the route model to define non blocking endpoints</description>
     <dependencies>
         <dependency>

extensions/smallrye-health/deployment/pom.xml

@@ -58,7 +58,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

extensions/smallrye-jwt/deployment/pom.xml

@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

extensions/smallrye-jwt/runtime/pom.xml

@@ -28,7 +28,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>

extensions/smallrye-openapi/deployment/pom.xml

@@ -73,7 +73,7 @@
     </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-vertx-web-deployment</artifactId>
+      <artifactId>quarkus-reactive-routes-deployment</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>

integration-tests/amazon-lambda-http/pom.xml

@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -118,7 +118,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>

integration-tests/amazon-lambda-rest/pom.xml

@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web</artifactId>
+            <artifactId>quarkus-reactive-routes</artifactId>
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
@@ -118,7 +118,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-vertx-web-deployment</artifactId>
+            <artifactId>quarkus-reactive-routes-deployment</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
             <scope>test</scope>