From a6327aab8ed498b8ff5f296f8696526acece6aeb Mon Sep 17 00:00:00 2001
From: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
Date: Thu, 21 Dec 2023 11:03:21 +0100
Subject: [PATCH] [3.x] Helidon Arquillian module should only depend on MP core
 #7614

Signed-off-by: Jorge Bescos Gascon <jorge.bescos.gascon@oracle.com>
---
 microprofile/tests/arquillian/pom.xml                | 12 +++++-------
 .../arquillian/HelidonDeployableContainer.java       |  5 +++--
 microprofile/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-openapi/pom.xml           |  5 +++++
 .../tests/tck/tck-reactive-operators/pom.xml         |  6 ------
 7 files changed, 24 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 @@
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.bundles</groupId>
-            <artifactId>helidon-microprofile</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.helidon.health</groupId>
-                    <artifactId>helidon-health-checks</artifactId>
-                </exclusion>
-            </exclusions>
+            <artifactId>helidon-microprofile-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.metrics</groupId>
+            <artifactId>helidon-microprofile-metrics</artifactId>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
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 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>io.helidon.microprofile.bundles</groupId>
-            <artifactId>helidon-microprofile</artifactId>
+            <groupId>io.helidon.microprofile.metrics</groupId>
+            <artifactId>helidon-microprofile-metrics</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile</groupId>
+            <artifactId>helidon-microprofile-fault-tolerance</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
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 @@
             <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.health</groupId>
+            <artifactId>helidon-microprofile-health</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.health</groupId>
             <artifactId>microprofile-health-tck</artifactId>
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 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.helidon.microprofile.bundles</groupId>
-            <artifactId>helidon-microprofile-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.jwt</groupId>
             <artifactId>helidon-microprofile-jwt-auth</artifactId>
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 @@
             <artifactId>arquillian-testng-container</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.helidon.microprofile.openapi</groupId>
+            <artifactId>helidon-microprofile-openapi</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.eclipse.microprofile.openapi</groupId>
             <artifactId>microprofile-openapi-api</artifactId>
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 @@
             <artifactId>helidon-arquillian</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.helidon.microprofile.bundles</groupId>
-                    <artifactId>helidon-microprofile-3.1</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.reactive-streams</groupId>