Skip to content

Commit e50c7ba

Browse files
jbescosdalexandrov
jbescos
authored and
dalexandrov
committed
4.x: Helidon Arquillian module should only depend on MP core (helidon-io#7440)
Helidon Arquillian module should only depend on MP core Signed-off-by: Jorge Bescos Gascon <[email protected]>
1 parent c6d9e5e commit e50c7ba

File tree

15 files changed

+92
-50
lines changed

15 files changed

+92
-50
lines changed

‎microprofile/tests/arquillian/pom.xml

+9-7
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,7 @@
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>
6357
</dependency>
6458
<dependency>
6559
<groupId>junit</groupId>
@@ -70,5 +64,13 @@
7064
<groupId>org.testng</groupId>
7165
<artifactId>testng</artifactId>
7266
</dependency>
67+
<dependency>
68+
<groupId>org.eclipse.microprofile.metrics</groupId>
69+
<artifactId>microprofile-metrics-api</artifactId>
70+
</dependency>
71+
<dependency>
72+
<groupId>jakarta.inject</groupId>
73+
<artifactId>jakarta.inject-api</artifactId>
74+
</dependency>
7375
</dependencies>
7476
</project>

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353

5454
import io.helidon.config.mp.MpConfigSources;
5555

56+
import jakarta.enterprise.inject.ResolutionException;
5657
import jakarta.enterprise.inject.se.SeContainer;
5758
import jakarta.enterprise.inject.spi.CDI;
5859
import jakarta.enterprise.inject.spi.DefinitionException;
@@ -583,9 +584,10 @@ private void cleanupBaseMetrics() {
583584
new BaseRegistryTypeLiteral()).get();
584585
Objects.requireNonNull(metricRegistry);
585586
metricRegistry.removeMatching((m, v) -> true);
586-
} catch (IllegalStateException e) {
587+
} catch (IllegalStateException | ResolutionException e) {
587588
// this may be a negative CDI test (e.g. when CDI is intended not to start)
588589
// in such cases, CDI will not be available
590+
// It can also be that metrics are not used at all in some tests, so we don't want to fail.
589591
LOGGER.log(Level.DEBUG, "Unable to cleanup base metrics", e);
590592
}
591593
}

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

+5
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
<name>Helidon Microprofile Tests TCK CDI</name>
2929

3030
<dependencies>
31+
<dependency>
32+
<groupId>io.helidon.microprofile.cdi</groupId>
33+
<artifactId>helidon-microprofile-cdi</artifactId>
34+
<scope>test</scope>
35+
</dependency>
3136
<dependency>
3237
<groupId>io.helidon.microprofile.tests</groupId>
3338
<artifactId>helidon-arquillian</artifactId>

‎microprofile/tests/tck/tck-core-profile/tck-core-profile-test/pom.xml

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<name>Helidon Microprofile Tests TCK Core Profile</name>
3131

3232
<dependencies>
33+
<dependency>
34+
<groupId>io.helidon.microprofile.bundles</groupId>
35+
<artifactId>helidon-microprofile-core</artifactId>
36+
<scope>test</scope>
37+
</dependency>
3338
<dependency>
3439
<groupId>io.helidon.microprofile.tests</groupId>
3540
<artifactId>helidon-arquillian</artifactId>

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

+8-2
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,21 @@
3535
</properties>
3636

3737
<dependencies>
38+
<dependency>
39+
<groupId>io.helidon.microprofile.metrics</groupId>
40+
<artifactId>helidon-microprofile-metrics</artifactId>
41+
<version>${project.version}</version>
42+
<scope>test</scope>
43+
</dependency>
3844
<dependency>
3945
<groupId>io.helidon.microprofile.tests</groupId>
4046
<artifactId>helidon-arquillian</artifactId>
4147
<version>${project.version}</version>
4248
<scope>test</scope>
4349
</dependency>
4450
<dependency>
45-
<groupId>io.helidon.microprofile.bundles</groupId>
46-
<artifactId>helidon-microprofile</artifactId>
51+
<groupId>io.helidon.microprofile</groupId>
52+
<artifactId>helidon-microprofile-fault-tolerance</artifactId>
4753
<version>${project.version}</version>
4854
<scope>test</scope>
4955
</dependency>

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

+5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@
3131
<name>Helidon Microprofile Tests TCK Health</name>
3232

3333
<dependencies>
34+
<dependency>
35+
<groupId>io.helidon.microprofile.health</groupId>
36+
<artifactId>helidon-microprofile-health</artifactId>
37+
<scope>test</scope>
38+
</dependency>
3439
<dependency>
3540
<groupId>io.helidon.microprofile.tests</groupId>
3641
<artifactId>helidon-arquillian</artifactId>

‎microprofile/tests/tck/tck-inject/tck-inject-test/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<scope>test</scope>
4242
</dependency>
4343
<dependency>
44-
<groupId>io.helidon.microprofile.bundles</groupId>
45-
<artifactId>helidon-microprofile</artifactId>
44+
<groupId>io.helidon.microprofile.cdi</groupId>
45+
<artifactId>helidon-microprofile-cdi</artifactId>
4646
<scope>test</scope>
4747
</dependency>
4848
<dependency>

‎microprofile/tests/tck/tck-jsonb/tck-jsonb-test/pom.xml

-5
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@
3535
<artifactId>junit-jupiter-engine</artifactId>
3636
<scope>test</scope>
3737
</dependency>
38-
<dependency>
39-
<groupId>io.helidon.microprofile.bundles</groupId>
40-
<artifactId>helidon-microprofile</artifactId>
41-
<scope>test</scope>
42-
</dependency>
4338
<dependency>
4439
<groupId>jakarta.json.bind</groupId>
4540
<artifactId>jakarta.json.bind-tck</artifactId>

‎microprofile/tests/tck/tck-jsonp/tck-jsonp-test/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,18 @@
3535
<artifactId>junit-jupiter-engine</artifactId>
3636
<scope>test</scope>
3737
</dependency>
38-
<dependency>
39-
<groupId>io.helidon.microprofile.bundles</groupId>
40-
<artifactId>helidon-microprofile</artifactId>
41-
<scope>test</scope>
42-
</dependency>
4338
<!-- Dependencies coming from below maven-antrun-plugin -->
4439
<dependency>
4540
<groupId>jakarta.json</groupId>
4641
<artifactId>jakarta.json-tck-tests</artifactId>
4742
<version>${version.lib.jakarta.jsonp-api}</version>
4843
<scope>test</scope>
4944
</dependency>
45+
<dependency>
46+
<groupId>org.eclipse.parsson</groupId>
47+
<artifactId>parsson</artifactId>
48+
<scope>test</scope>
49+
</dependency>
5050
</dependencies>
5151

5252
<build>

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

+5-22
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
</properties>
3333

3434
<dependencies>
35+
<dependency>
36+
<groupId>org.glassfish.jersey.media</groupId>
37+
<artifactId>jersey-media-json-binding</artifactId>
38+
<scope>test</scope>
39+
</dependency>
3540
<dependency>
3641
<groupId>org.eclipse.microprofile.lra</groupId>
3742
<artifactId>microprofile-lra-tck</artifactId>
@@ -40,28 +45,6 @@
4045
<groupId>io.helidon.microprofile.tests</groupId>
4146
<artifactId>helidon-arquillian</artifactId>
4247
<version>${project.version}</version>
43-
<exclusions>
44-
<exclusion>
45-
<artifactId>helidon-microprofile-openapi</artifactId>
46-
<groupId>io.helidon.microprofile.openapi</groupId>
47-
</exclusion>
48-
<exclusion>
49-
<groupId>io.helidon.microprofile.tracing</groupId>
50-
<artifactId>helidon-microprofile-tracing</artifactId>
51-
</exclusion>
52-
<exclusion>
53-
<groupId>io.helidon.microprofile.metrics</groupId>
54-
<artifactId>helidon-microprofile-metrics</artifactId>
55-
</exclusion>
56-
<exclusion>
57-
<groupId>io.helidon.microprofile</groupId>
58-
<artifactId>helidon-microprofile-fault-tolerance</artifactId>
59-
</exclusion>
60-
<exclusion>
61-
<groupId>io.helidon.microprofile.jwt</groupId>
62-
<artifactId>helidon-microprofile-jwt-auth</artifactId>
63-
</exclusion>
64-
</exclusions>
6548
</dependency>
6649
<dependency>
6750
<groupId>io.helidon.microprofile.lra</groupId>

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

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
<name>Helidon Microprofile Tests TCK Metrics</name>
3131

3232
<dependencies>
33+
<dependency>
34+
<groupId>io.helidon.microprofile.metrics</groupId>
35+
<artifactId>helidon-microprofile-metrics</artifactId>
36+
<scope>test</scope>
37+
</dependency>
3338
<dependency>
3439
<groupId>io.helidon.microprofile.tests</groupId>
3540
<artifactId>helidon-arquillian</artifactId>

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

+5
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@
4747
</dependencyManagement>
4848

4949
<dependencies>
50+
<dependency>
51+
<groupId>io.helidon.microprofile.openapi</groupId>
52+
<artifactId>helidon-microprofile-openapi</artifactId>
53+
<scope>test</scope>
54+
</dependency>
5055
<dependency>
5156
<groupId>io.helidon.microprofile.tests</groupId>
5257
<artifactId>helidon-arquillian</artifactId>

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

+20
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,26 @@
2828
<name>Helidon Microprofile Tests TCK Opentracing</name>
2929

3030
<dependencies>
31+
<dependency>
32+
<groupId>org.glassfish.jersey.media</groupId>
33+
<artifactId>jersey-media-json-binding</artifactId>
34+
<scope>test</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>io.helidon.microprofile.tracing</groupId>
38+
<artifactId>helidon-microprofile-tracing</artifactId>
39+
<scope>test</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>io.helidon.microprofile.rest-client</groupId>
43+
<artifactId>helidon-microprofile-rest-client</artifactId>
44+
<scope>test</scope>
45+
</dependency>
46+
<dependency>
47+
<groupId>io.helidon.microprofile.server</groupId>
48+
<artifactId>helidon-microprofile-server</artifactId>
49+
<scope>test</scope>
50+
</dependency>
3151
<dependency>
3252
<groupId>io.helidon.microprofile.tests</groupId>
3353
<artifactId>helidon-arquillian</artifactId>

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

-6
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

+15
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,21 @@
2929
<name>Helidon Microprofile Tests TCK REST Client</name>
3030

3131
<dependencies>
32+
<dependency>
33+
<groupId>org.glassfish.jersey.media</groupId>
34+
<artifactId>jersey-media-json-binding</artifactId>
35+
<scope>test</scope>
36+
</dependency>
37+
<dependency>
38+
<groupId>io.helidon.microprofile.rest-client</groupId>
39+
<artifactId>helidon-microprofile-rest-client</artifactId>
40+
<scope>test</scope>
41+
</dependency>
42+
<dependency>
43+
<groupId>io.helidon.microprofile.server</groupId>
44+
<artifactId>helidon-microprofile-server</artifactId>
45+
<scope>test</scope>
46+
</dependency>
3247
<dependency>
3348
<groupId>io.helidon.microprofile.tests</groupId>
3449
<artifactId>helidon-arquillian</artifactId>

0 commit comments

Comments
 (0)