Skip to content

Commit

Permalink
Merge pull request #19933 from mkouba/issue-16797
Browse files Browse the repository at this point in the history
  • Loading branch information
@cescoffier
cescoffier committed Sep 10, 2021
2 parents 8130b36 + 262f595 commit 994e164
Show file tree
Hide file tree
Showing 92 changed files with 64 additions and 322 deletions.
10 changes: 0 additions & 10 deletions bom/application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1520,16 +1520,6 @@
<artifactId>quarkus-smallrye-openapi-common-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
Expand Down
13 changes: 0 additions & 13 deletions devtools/bom-descriptor-json/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2645,19 +2645,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</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-vertx-graphql</artifactId>
Expand Down
13 changes: 0 additions & 13 deletions docs/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2606,19 +2606,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-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-vertx-graphql-deployment</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion docs/src/main/asciidoc/vertx-reference.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Documentation about the Vert.x Mutiny variant is available on https://smallrye.i
You can configure the Vert.x instance from the `application.properties` file.
The following table lists the supported properties:

include::{generated-dir}/config/quarkus-vertx-core.adoc[opts=optional, leveloffset=+1]
include::{generated-dir}/config/quarkus-vertx.adoc[opts=optional, leveloffset=+1]


[[using-vertx-clients]]
Expand Down
2 changes: 1 addition & 1 deletion ...s/agroal/deployment/src/test/java/io/quarkus/agroal/test/NoNettyDataSourceConfigTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public class NoNettyDataSourceConfigTest {
//we need to exclude them all
//this removes the need to have a whole new module just for this test
.overrideConfigKey("quarkus.class-loading.removed-artifacts",
"io.netty:netty-common,io.quarkus:quarkus-vertx-core,io.quarkus:quarkus-vertx-core-deployment," +
"io.netty:netty-common,io.quarkus:quarkus-vertx,io.quarkus:quarkus-vertx-deployment," +
"io.quarkus:quarkus-resteasy-deployment,io.quarkus:quarkus-resteasy," +
"io.quarkus:quarkus-resteasy-server-common-deployment, io.quarkus:quarkus-resteasy-server-common," +
"io.quarkus:quarkus-vertx-http,io.quarkus:quarkus-vertx-http-deployment," +
Expand Down
2 changes: 1 addition & 1 deletion extensions/consul-config/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/consul-config/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down
5 changes: 0 additions & 5 deletions extensions/jackson/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,6 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-arc</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<optional>true</optional>
</dependency>
</dependencies>

<build>
Expand Down
1 change: 0 additions & 1 deletion ...nsions/jackson/runtime/src/main/resources/META-INF/services/io.vertx.core.spi.JsonFactory
View file

This file was deleted.

2 changes: 1 addition & 1 deletion extensions/mongodb-client/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/mongodb-client/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/oidc-common/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/oidc-common/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/oidc/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/oidc/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/opentelemetry/opentelemetry/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>

<dependency>
Expand Down
2 changes: 1 addition & 1 deletion extensions/opentelemetry/opentelemetry/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>

<dependency>
Expand Down
1 change: 0 additions & 1 deletion extensions/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<module>jsonb</module>

<!-- HTTP -->
<module>vertx-core</module>
<module>vertx-http</module>
<module>undertow</module>
<module>websockets</module>
Expand Down
2 changes: 1 addition & 1 deletion extensions/reactive-datasource/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/reactive-datasource/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<!-- Add the health extension as optional as we will produce the health check only if it's included -->
<dependency>
Expand Down
5 changes: 0 additions & 5 deletions extensions/resteasy-classic/resteasy/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@
<artifactId>quarkus-junit5-internal</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-jackson-deployment</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/resteasy-reactive/jaxrs-client-reactive/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/resteasy-reactive/jaxrs-client-reactive/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/resteasy-reactive/quarkus-resteasy-reactive-common/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/resteasy-reactive/quarkus-resteasy-reactive-common/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/smallrye-reactive-messaging-kafka/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/spring-cloud-config-client/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/spring-cloud-config-client/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/vault/deployment/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core-deployment</artifactId>
<artifactId>quarkus-vertx-deployment</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
Expand Down
2 changes: 1 addition & 1 deletion extensions/vault/runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx-core</artifactId>
<artifactId>quarkus-vertx</artifactId>
</dependency>
<dependency>
<groupId>io.quarkus.arc</groupId>
Expand Down
66 changes: 0 additions & 66 deletions extensions/vertx-core/deployment/pom.xml
View file

This file was deleted.

4 changes: 0 additions & 4 deletions extensions/vertx-core/deployment/src/test/resources/lorem.txt
View file

This file was deleted.

20 changes: 0 additions & 20 deletions extensions/vertx-core/pom.xml
View file

This file was deleted.

Loading

0 comments on commit 994e164

Please sign in to comment.