Skip to content

Commit e12dc66

Browse files
jbescosjbescos
committed
[3.x] Helidon Arquillian module should only depend on MP core #7614
Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
1 parent d3f7edf commit e12dc66

File tree

10 files changed

+68
-21
lines changed

10 files changed

+68
-21
lines changed

‎microprofile/tests/arquillian/pom.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,11 @@
5353
</dependency>
5454
<dependency>
5555
<groupId>io.helidon.microprofile.bundles</groupId>
56-
<artifactId>helidon-microprofile</artifactId>
57-
<exclusions>
58-
<exclusion>
59-
<groupId>io.helidon.health</groupId>
60-
<artifactId>helidon-health-checks</artifactId>
61-
</exclusion>
62-
</exclusions>
56+
<artifactId>helidon-microprofile-core</artifactId>
57+
</dependency>
58+
<dependency>
59+
<groupId>io.helidon.microprofile.metrics</groupId>
60+
<artifactId>helidon-microprofile-metrics</artifactId>
6361
</dependency>
6462
<dependency>
6563
<groupId>junit</groupId>

‎microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018, 2022 Oracle and/or its affiliates.
2+
* Copyright (c) 2018, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -48,6 +48,7 @@
4848

4949
import io.helidon.config.mp.MpConfigSources;
5050

51+
import jakarta.enterprise.inject.ResolutionException;
5152
import jakarta.enterprise.inject.se.SeContainer;
5253
import jakarta.enterprise.inject.spi.CDI;
5354
import jakarta.enterprise.inject.spi.DefinitionException;
@@ -474,7 +475,7 @@ private void cleanupBaseMetrics() {
474475
new BaseRegistryTypeLiteral()).get();
475476
Objects.requireNonNull(metricRegistry);
476477
metricRegistry.removeMatching((m, v) -> true);
477-
} catch (IllegalStateException e) {
478+
} catch (IllegalStateException | ResolutionException e) {
478479
LOGGER.log(Level.WARNING, "Unable to cleanup base metrics", e);
479480
}
480481
}

‎microprofile/tests/tck/tck-fault-tolerance/pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@
4242
<scope>test</scope>
4343
</dependency>
4444
<dependency>
45-
<groupId>io.helidon.microprofile.bundles</groupId>
46-
<artifactId>helidon-microprofile</artifactId>
45+
<groupId>io.helidon.microprofile.metrics</groupId>
46+
<artifactId>helidon-microprofile-metrics</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>io.helidon.microprofile</groupId>
51+
<artifactId>helidon-microprofile-fault-tolerance</artifactId>
4752
<scope>test</scope>
4853
</dependency>
4954
<dependency>

‎microprofile/tests/tck/tck-health/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@
4747
<artifactId>parsson</artifactId>
4848
<scope>test</scope>
4949
</dependency>
50+
<dependency>
51+
<groupId>io.helidon.microprofile.health</groupId>
52+
<artifactId>helidon-microprofile-health</artifactId>
53+
</dependency>
5054
<dependency>
5155
<groupId>org.eclipse.microprofile.health</groupId>
5256
<artifactId>microprofile-health-tck</artifactId>

‎microprofile/tests/tck/tck-jwt-auth/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,6 @@
3838
<type>test-jar</type>
3939
<scope>test</scope>
4040
</dependency>
41-
<dependency>
42-
<groupId>io.helidon.microprofile.bundles</groupId>
43-
<artifactId>helidon-microprofile-core</artifactId>
44-
</dependency>
4541
<dependency>
4642
<groupId>io.helidon.microprofile.jwt</groupId>
4743
<artifactId>helidon-microprofile-jwt-auth</artifactId>

‎microprofile/tests/tck/tck-lra/pom.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@
4545
<groupId>io.helidon.microprofile.lra</groupId>
4646
<artifactId>helidon-microprofile-lra</artifactId>
4747
</dependency>
48+
<dependency>
49+
<groupId>org.glassfish.jersey.media</groupId>
50+
<artifactId>jersey-media-json-binding</artifactId>
51+
<scope>test</scope>
52+
</dependency>
4853
<dependency>
4954
<groupId>io.helidon.lra</groupId>
5055
<artifactId>helidon-lra-coordinator-narayana-client</artifactId>
@@ -54,6 +59,10 @@
5459
<artifactId>helidon-lra-coordinator-server</artifactId>
5560
<version>${project.version}</version>
5661
</dependency>
62+
<dependency>
63+
<groupId>io.helidon.microprofile.health</groupId>
64+
<artifactId>helidon-microprofile-health</artifactId>
65+
</dependency>
5766
</dependencies>
5867

5968
<profiles>

‎microprofile/tests/tck/tck-openapi/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@
6363
<artifactId>arquillian-testng-container</artifactId>
6464
<scope>test</scope>
6565
</dependency>
66+
<dependency>
67+
<groupId>io.helidon.microprofile.openapi</groupId>
68+
<artifactId>helidon-microprofile-openapi</artifactId>
69+
<scope>test</scope>
70+
</dependency>
6671
<dependency>
6772
<groupId>org.eclipse.microprofile.openapi</groupId>
6873
<artifactId>microprofile-openapi-api</artifactId>

‎microprofile/tests/tck/tck-opentracing/pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,26 @@
4141
</exclusion>
4242
</exclusions>
4343
</dependency>
44+
<dependency>
45+
<groupId>org.glassfish.jersey.media</groupId>
46+
<artifactId>jersey-media-json-binding</artifactId>
47+
<scope>test</scope>
48+
</dependency>
49+
<dependency>
50+
<groupId>io.helidon.microprofile.tracing</groupId>
51+
<artifactId>helidon-microprofile-tracing</artifactId>
52+
<scope>test</scope>
53+
</dependency>
54+
<dependency>
55+
<groupId>io.helidon.microprofile.rest-client</groupId>
56+
<artifactId>helidon-microprofile-rest-client</artifactId>
57+
<scope>test</scope>
58+
</dependency>
59+
<dependency>
60+
<groupId>io.helidon.microprofile.server</groupId>
61+
<artifactId>helidon-microprofile-server</artifactId>
62+
<scope>test</scope>
63+
</dependency>
4464
<dependency>
4565
<groupId>org.eclipse.microprofile.opentracing</groupId>
4666
<artifactId>microprofile-opentracing-tck</artifactId>

‎microprofile/tests/tck/tck-reactive-operators/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@
3434
<artifactId>helidon-arquillian</artifactId>
3535
<version>${project.version}</version>
3636
<scope>test</scope>
37-
<exclusions>
38-
<exclusion>
39-
<groupId>io.helidon.microprofile.bundles</groupId>
40-
<artifactId>helidon-microprofile-3.1</artifactId>
41-
</exclusion>
42-
</exclusions>
4337
</dependency>
4438
<dependency>
4539
<groupId>io.helidon.microprofile.reactive-streams</groupId>

‎microprofile/tests/tck/tck-rest-client/pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,21 @@
3737
<version>${project.version}</version>
3838
<scope>test</scope>
3939
</dependency>
40+
<dependency>
41+
<groupId>org.glassfish.jersey.media</groupId>
42+
<artifactId>jersey-media-json-binding</artifactId>
43+
<scope>test</scope>
44+
</dependency>
45+
<dependency>
46+
<groupId>io.helidon.microprofile.rest-client</groupId>
47+
<artifactId>helidon-microprofile-rest-client</artifactId>
48+
<scope>test</scope>
49+
</dependency>
50+
<dependency>
51+
<groupId>io.helidon.microprofile.server</groupId>
52+
<artifactId>helidon-microprofile-server</artifactId>
53+
<scope>test</scope>
54+
</dependency>
4055
<dependency>
4156
<groupId>org.eclipse.microprofile.rest.client</groupId>
4257
<artifactId>microprofile-rest-client-tck</artifactId>

0 commit comments

Comments
 (0)