Skip to content

Commit 1155b5e

Browse files
committed
build: fix vertx classpath
- fix #3807
1 parent 3a9ca80 commit 1155b5e

File tree

6 files changed

+15
-34
lines changed

6 files changed

+15
-34
lines changed

jooby/src/main/java/io/jooby/Server.java

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
import java.io.IOException;
1515
import java.net.BindException;
1616
import java.nio.channels.ClosedChannelException;
17-
import java.util.List;
18-
import java.util.Optional;
19-
import java.util.ServiceLoader;
20-
import java.util.Spliterator;
17+
import java.util.*;
2118
import java.util.concurrent.CopyOnWriteArrayList;
2219
import java.util.concurrent.Executor;
2320
import java.util.concurrent.atomic.AtomicBoolean;
@@ -300,17 +297,16 @@ static Server loadServer(@NonNull ServerOptions options) {
300297
boolean warn = true;
301298
if (servers.size() == 2) {
302299
// Must be Netty and Vertx
303-
var supported =
304-
servers.stream()
305-
.map(it -> it.getClass().getSimpleName())
306-
.allMatch(it -> it.equals("NettyServer") || it.equals("VertxServer"));
307-
if (supported) {
300+
var supported = new HashSet<String>();
301+
supported.add("NettyServer");
302+
supported.add("VertxServer");
303+
servers.stream().map(it -> it.getClass().getSimpleName()).forEach(supported::remove);
304+
if (supported.isEmpty()) {
308305
if (!servers.getFirst().getClass().getSimpleName().equals("VertxServer")) {
309306
index = 1;
310307
}
311308
warn = false;
312309
}
313-
;
314310
}
315311
if (warn) {
316312
var names = servers.stream().map(Server::getName).collect(Collectors.toList());

modules/jooby-vertx-mysql-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>io.vertx</groupId>
2727
<artifactId>vertx-mysql-client</artifactId>
28-
<version>5.0.5</version>
28+
<version>${vertx.version}</version>
2929
</dependency>
3030

3131
<!-- Test dependencies -->

modules/jooby-vertx-pg-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<dependency>
2626
<groupId>io.vertx</groupId>
2727
<artifactId>vertx-pg-client</artifactId>
28-
<version>5.0.5</version>
28+
<version>${vertx.version}</version>
2929
</dependency>
3030

3131
<!-- Test dependencies -->

modules/jooby-vertx-sql-client/pom.xml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@
1818
<dependencies>
1919
<dependency>
2020
<groupId>io.jooby</groupId>
21-
<artifactId>jooby-vertx</artifactId>
21+
<artifactId>jooby</artifactId>
2222
<version>${jooby.version}</version>
2323
</dependency>
2424

2525
<dependency>
2626
<groupId>io.vertx</groupId>
2727
<artifactId>vertx-sql-client</artifactId>
28-
<version>5.0.5</version>
29-
</dependency>
30-
31-
<dependency>
32-
<groupId>io.vertx</groupId>
33-
<artifactId>vertx-pg-client</artifactId>
34-
<version>5.0.5</version>
35-
<optional>true</optional>
28+
<version>${vertx.version}</version>
3629
</dependency>
3730

3831
<!-- Test dependencies -->

modules/jooby-vertx/pom.xml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,7 @@
2222
<dependency>
2323
<groupId>io.vertx</groupId>
2424
<artifactId>vertx-core</artifactId>
25-
<version>5.0.5</version>
26-
</dependency>
27-
28-
<dependency>
29-
<groupId>io.vertx</groupId>
30-
<artifactId>vertx-sql-client</artifactId>
31-
<version>${vertx.version}</version>
32-
</dependency>
33-
34-
<dependency>
35-
<groupId>io.vertx</groupId>
36-
<artifactId>vertx-pg-client</artifactId>
3725
<version>${vertx.version}</version>
38-
<optional>true</optional>
3926
</dependency>
4027

4128
<!-- Test dependencies -->

tests/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@
5656
<artifactId>jooby-netty</artifactId>
5757
<version>${jooby.version}</version>
5858
</dependency>
59+
<dependency>
60+
<groupId>io.jooby</groupId>
61+
<artifactId>jooby-vertx</artifactId>
62+
<version>${jooby.version}</version>
63+
</dependency>
5964
<dependency>
6065
<groupId>io.jooby</groupId>
6166
<artifactId>jooby-vertx-pg-client</artifactId>

0 commit comments

Comments
 (0)