From e12dc6621e8ad5a7da45b9ade8dc7cf1c7132c39 Mon Sep 17 00:00:00 2001 From: Jorge Bescos Gascon Date: Thu, 21 Dec 2023 11:03:21 +0100 Subject: [PATCH 1/4] [3.x] Helidon Arquillian module should only depend on MP core #7614 Signed-off-by: Jorge Bescos Gascon --- microprofile/tests/arquillian/pom.xml | 12 +++++------ .../HelidonDeployableContainer.java | 5 +++-- .../tests/tck/tck-fault-tolerance/pom.xml | 9 +++++++-- microprofile/tests/tck/tck-health/pom.xml | 4 ++++ microprofile/tests/tck/tck-jwt-auth/pom.xml | 4 ---- microprofile/tests/tck/tck-lra/pom.xml | 9 +++++++++ microprofile/tests/tck/tck-openapi/pom.xml | 5 +++++ .../tests/tck/tck-opentracing/pom.xml | 20 +++++++++++++++++++ .../tests/tck/tck-reactive-operators/pom.xml | 6 ------ .../tests/tck/tck-rest-client/pom.xml | 15 ++++++++++++++ 10 files changed, 68 insertions(+), 21 deletions(-) diff --git a/microprofile/tests/arquillian/pom.xml b/microprofile/tests/arquillian/pom.xml index 6b0b8f93b34..aba7259ed10 100644 --- a/microprofile/tests/arquillian/pom.xml +++ b/microprofile/tests/arquillian/pom.xml @@ -53,13 +53,11 @@ io.helidon.microprofile.bundles - helidon-microprofile - - - io.helidon.health - helidon-health-checks - - + helidon-microprofile-core + + + io.helidon.microprofile.metrics + helidon-microprofile-metrics junit diff --git a/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java b/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java index d426eba6754..bb8a2aa0e93 100644 --- a/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java +++ b/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2022 Oracle and/or its affiliates. + * Copyright (c) 2018, 2023 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,6 +48,7 @@ import io.helidon.config.mp.MpConfigSources; +import jakarta.enterprise.inject.ResolutionException; import jakarta.enterprise.inject.se.SeContainer; import jakarta.enterprise.inject.spi.CDI; import jakarta.enterprise.inject.spi.DefinitionException; @@ -474,7 +475,7 @@ private void cleanupBaseMetrics() { new BaseRegistryTypeLiteral()).get(); Objects.requireNonNull(metricRegistry); metricRegistry.removeMatching((m, v) -> true); - } catch (IllegalStateException e) { + } catch (IllegalStateException | ResolutionException e) { LOGGER.log(Level.WARNING, "Unable to cleanup base metrics", e); } } diff --git a/microprofile/tests/tck/tck-fault-tolerance/pom.xml b/microprofile/tests/tck/tck-fault-tolerance/pom.xml index 864e5d11661..1c823c422c3 100644 --- a/microprofile/tests/tck/tck-fault-tolerance/pom.xml +++ b/microprofile/tests/tck/tck-fault-tolerance/pom.xml @@ -42,8 +42,13 @@ test - io.helidon.microprofile.bundles - helidon-microprofile + io.helidon.microprofile.metrics + helidon-microprofile-metrics + test + + + io.helidon.microprofile + helidon-microprofile-fault-tolerance test diff --git a/microprofile/tests/tck/tck-health/pom.xml b/microprofile/tests/tck/tck-health/pom.xml index f65fc5b1d5f..7099f1dae5d 100644 --- a/microprofile/tests/tck/tck-health/pom.xml +++ b/microprofile/tests/tck/tck-health/pom.xml @@ -47,6 +47,10 @@ parsson test + + io.helidon.microprofile.health + helidon-microprofile-health + org.eclipse.microprofile.health microprofile-health-tck diff --git a/microprofile/tests/tck/tck-jwt-auth/pom.xml b/microprofile/tests/tck/tck-jwt-auth/pom.xml index 92b9276a13f..0434e46b6b6 100644 --- a/microprofile/tests/tck/tck-jwt-auth/pom.xml +++ b/microprofile/tests/tck/tck-jwt-auth/pom.xml @@ -38,10 +38,6 @@ test-jar test - - io.helidon.microprofile.bundles - helidon-microprofile-core - io.helidon.microprofile.jwt helidon-microprofile-jwt-auth diff --git a/microprofile/tests/tck/tck-lra/pom.xml b/microprofile/tests/tck/tck-lra/pom.xml index 85402db5056..96818e2a22c 100644 --- a/microprofile/tests/tck/tck-lra/pom.xml +++ b/microprofile/tests/tck/tck-lra/pom.xml @@ -45,6 +45,11 @@ io.helidon.microprofile.lra helidon-microprofile-lra + + org.glassfish.jersey.media + jersey-media-json-binding + test + io.helidon.lra helidon-lra-coordinator-narayana-client @@ -54,6 +59,10 @@ helidon-lra-coordinator-server ${project.version} + + io.helidon.microprofile.health + helidon-microprofile-health + diff --git a/microprofile/tests/tck/tck-openapi/pom.xml b/microprofile/tests/tck/tck-openapi/pom.xml index c6e76f5d5a0..29dd704c321 100644 --- a/microprofile/tests/tck/tck-openapi/pom.xml +++ b/microprofile/tests/tck/tck-openapi/pom.xml @@ -63,6 +63,11 @@ arquillian-testng-container test + + io.helidon.microprofile.openapi + helidon-microprofile-openapi + test + org.eclipse.microprofile.openapi microprofile-openapi-api diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml index 279e98145b6..7d5f7dcbe62 100644 --- a/microprofile/tests/tck/tck-opentracing/pom.xml +++ b/microprofile/tests/tck/tck-opentracing/pom.xml @@ -41,6 +41,26 @@ + + org.glassfish.jersey.media + jersey-media-json-binding + test + + + io.helidon.microprofile.tracing + helidon-microprofile-tracing + test + + + io.helidon.microprofile.rest-client + helidon-microprofile-rest-client + test + + + io.helidon.microprofile.server + helidon-microprofile-server + test + org.eclipse.microprofile.opentracing microprofile-opentracing-tck diff --git a/microprofile/tests/tck/tck-reactive-operators/pom.xml b/microprofile/tests/tck/tck-reactive-operators/pom.xml index bd6d88d3c85..0d88819139b 100644 --- a/microprofile/tests/tck/tck-reactive-operators/pom.xml +++ b/microprofile/tests/tck/tck-reactive-operators/pom.xml @@ -34,12 +34,6 @@ helidon-arquillian ${project.version} test - - - io.helidon.microprofile.bundles - helidon-microprofile-3.1 - - io.helidon.microprofile.reactive-streams diff --git a/microprofile/tests/tck/tck-rest-client/pom.xml b/microprofile/tests/tck/tck-rest-client/pom.xml index 971c629bfb6..71dbfe9d7eb 100644 --- a/microprofile/tests/tck/tck-rest-client/pom.xml +++ b/microprofile/tests/tck/tck-rest-client/pom.xml @@ -37,6 +37,21 @@ ${project.version} test + + org.glassfish.jersey.media + jersey-media-json-binding + test + + + io.helidon.microprofile.rest-client + helidon-microprofile-rest-client + test + + + io.helidon.microprofile.server + helidon-microprofile-server + test + org.eclipse.microprofile.rest.client microprofile-rest-client-tck From 09b8c207cf7c860c47a16f31b6b6d56578931b0d Mon Sep 17 00:00:00 2001 From: Jorge Bescos Gascon Date: Fri, 23 Feb 2024 08:34:37 +0100 Subject: [PATCH 2/4] Copyright 2024 Signed-off-by: Jorge Bescos Gascon --- .../microprofile/arquillian/HelidonDeployableContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java b/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java index bb8a2aa0e93..0bb530aa26e 100644 --- a/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java +++ b/microprofile/tests/arquillian/src/main/java/io/helidon/microprofile/arquillian/HelidonDeployableContainer.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, 2023 Oracle and/or its affiliates. + * Copyright (c) 2018, 2024 Oracle and/or its affiliates. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 74c5941b6ab1b69f215f8e5fd008c57dc94a2be6 Mon Sep 17 00:00:00 2001 From: Jorge Bescos Gascon Date: Mon, 8 Apr 2024 09:37:19 +0200 Subject: [PATCH 3/4] Remove helidon-microprofile-server Signed-off-by: Jorge Bescos Gascon --- microprofile/tests/tck/tck-opentracing/pom.xml | 5 ----- microprofile/tests/tck/tck-rest-client/pom.xml | 5 ----- 2 files changed, 10 deletions(-) diff --git a/microprofile/tests/tck/tck-opentracing/pom.xml b/microprofile/tests/tck/tck-opentracing/pom.xml index eba03e3e227..991dd37f70b 100644 --- a/microprofile/tests/tck/tck-opentracing/pom.xml +++ b/microprofile/tests/tck/tck-opentracing/pom.xml @@ -56,11 +56,6 @@ helidon-microprofile-rest-client test - - io.helidon.microprofile.server - helidon-microprofile-server - test - org.eclipse.microprofile.opentracing microprofile-opentracing-tck diff --git a/microprofile/tests/tck/tck-rest-client/pom.xml b/microprofile/tests/tck/tck-rest-client/pom.xml index e0d8a7fd1cb..2e84880b08f 100644 --- a/microprofile/tests/tck/tck-rest-client/pom.xml +++ b/microprofile/tests/tck/tck-rest-client/pom.xml @@ -47,11 +47,6 @@ helidon-microprofile-rest-client test - - io.helidon.microprofile.server - helidon-microprofile-server - test - org.eclipse.microprofile.rest.client microprofile-rest-client-tck From 0912aa04ed3c8b8a7ccf58e3ab97c5ee11c5689e Mon Sep 17 00:00:00 2001 From: Jorge Bescos Gascon Date: Mon, 8 Apr 2024 13:31:08 +0200 Subject: [PATCH 4/4] Add missing dependency Signed-off-by: Jorge Bescos Gascon --- microprofile/tests/tck/tck-rest-client/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/microprofile/tests/tck/tck-rest-client/pom.xml b/microprofile/tests/tck/tck-rest-client/pom.xml index 619f7bdbc85..8fbd5087c90 100644 --- a/microprofile/tests/tck/tck-rest-client/pom.xml +++ b/microprofile/tests/tck/tck-rest-client/pom.xml @@ -47,6 +47,11 @@ helidon-microprofile-rest-client test + + org.glassfish.jersey.ext.cdi + jersey-cdi1x + test + org.eclipse.microprofile.rest.client microprofile-rest-client-tck