From c73d9e50ce5c8eb2b80a4b643db88ab3779d05ae Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Thu, 11 Apr 2024 16:29:52 -0700
Subject: [PATCH] Remove dependency on activation-api

---
 .../src/main/archetype/mp/common/common-mp.xml       |  4 ----
 grpc/metrics/pom.xml                                 |  5 -----
 integrations/micrometer/cdi/pom.xml                  |  5 -----
 microprofile/fault-tolerance/pom.xml                 |  6 ------
 microprofile/grpc/server/pom.xml                     | 12 ------------
 microprofile/metrics/pom.xml                         |  5 -----
 microprofile/tests/tck/tck-fault-tolerance/pom.xml   |  5 -----
 microprofile/tests/tck/tck-health/pom.xml            |  5 -----
 microprofile/tests/tck/tck-metrics/pom.xml           |  5 -----
 microprofile/tests/tck/tck-openapi/pom.xml           |  5 -----
 microprofile/tracing/pom.xml                         |  6 ------
 security/integration/grpc/pom.xml                    |  5 -----
 security/integration/webserver/pom.xml               |  5 -----
 security/providers/http-auth/pom.xml                 |  5 -----
 service-common/rest-cdi/pom.xml                      |  5 -----
 tests/integration/jpa/simple/pom.xml                 |  4 ----
 tests/integration/oidc/pom.xml                       |  7 +------
 tests/integration/zipkin-mp-2.2/pom.xml              |  5 -----
 webserver/jersey/pom.xml                             | 10 ----------
 webserver/webserver/pom.xml                          |  5 -----
 20 files changed, 1 insertion(+), 113 deletions(-)

diff --git a/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml b/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml
index aee281aafc9..6ed9f0e1b55 100644
--- a/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml
+++ b/archetypes/helidon/src/main/archetype/mp/common/common-mp.xml
@@ -32,10 +32,6 @@
                     <value key="artifactId">jandex</value>
                     <value key="scope">runtime</value>
                 </map>
-                <map>
-                    <value key="groupId">jakarta.activation</value>
-                    <value key="artifactId">jakarta.activation-api</value>
-                </map>
                 <map order="0">
                     <value key="groupId">org.junit.jupiter</value>
                     <value key="artifactId">junit-jupiter-api</value>
diff --git a/grpc/metrics/pom.xml b/grpc/metrics/pom.xml
index f86bd1bef63..986477cf788 100644
--- a/grpc/metrics/pom.xml
+++ b/grpc/metrics/pom.xml
@@ -70,11 +70,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.webclient</groupId>
             <artifactId>helidon-webclient</artifactId>
diff --git a/integrations/micrometer/cdi/pom.xml b/integrations/micrometer/cdi/pom.xml
index 945754bb63e..3f848f25017 100644
--- a/integrations/micrometer/cdi/pom.xml
+++ b/integrations/micrometer/cdi/pom.xml
@@ -85,11 +85,6 @@
             <groupId>jakarta.enterprise</groupId>
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/microprofile/fault-tolerance/pom.xml b/microprofile/fault-tolerance/pom.xml
index 898a29647d3..002170f98bc 100644
--- a/microprofile/fault-tolerance/pom.xml
+++ b/microprofile/fault-tolerance/pom.xml
@@ -104,12 +104,6 @@
             <groupId>org.jboss.weld</groupId>
             <artifactId>weld-spi</artifactId>
         </dependency>
-        <!-- To keep HK2 from complaining when run with Java9+ -->
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.microprofile.metrics</groupId>
             <artifactId>helidon-microprofile-metrics</artifactId>
diff --git a/microprofile/grpc/server/pom.xml b/microprofile/grpc/server/pom.xml
index 2ba7c107da4..04fda7b5504 100644
--- a/microprofile/grpc/server/pom.xml
+++ b/microprofile/grpc/server/pom.xml
@@ -44,18 +44,6 @@
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <!--
-            Needed by jersey in Java 9
-            Added as a dependency to correctly run tests (without the long exception
-            from hk2). If you run application on Java 9, you need to add this dependency
-            in compile scope to prevent the error messages.
-            -->
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.helidon.microprofile.config</groupId>
             <artifactId>helidon-microprofile-config</artifactId>
diff --git a/microprofile/metrics/pom.xml b/microprofile/metrics/pom.xml
index 9f34b87221c..bcf0d35095c 100644
--- a/microprofile/metrics/pom.xml
+++ b/microprofile/metrics/pom.xml
@@ -40,11 +40,6 @@
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.common</groupId>
             <artifactId>helidon-common</artifactId>
diff --git a/microprofile/tests/tck/tck-fault-tolerance/pom.xml b/microprofile/tests/tck/tck-fault-tolerance/pom.xml
index 757f684afe1..002e0e25e89 100644
--- a/microprofile/tests/tck/tck-fault-tolerance/pom.xml
+++ b/microprofile/tests/tck/tck-fault-tolerance/pom.xml
@@ -46,11 +46,6 @@
             <artifactId>helidon-microprofile</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.testng</groupId>
             <artifactId>arquillian-testng-container</artifactId>
diff --git a/microprofile/tests/tck/tck-health/pom.xml b/microprofile/tests/tck/tck-health/pom.xml
index aedfd893dff..77656363880 100644
--- a/microprofile/tests/tck/tck-health/pom.xml
+++ b/microprofile/tests/tck/tck-health/pom.xml
@@ -56,11 +56,6 @@
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/microprofile/tests/tck/tck-metrics/pom.xml b/microprofile/tests/tck/tck-metrics/pom.xml
index 1866aabd833..98b5b4ab527 100644
--- a/microprofile/tests/tck/tck-metrics/pom.xml
+++ b/microprofile/tests/tck/tck-metrics/pom.xml
@@ -101,11 +101,6 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
diff --git a/microprofile/tests/tck/tck-openapi/pom.xml b/microprofile/tests/tck/tck-openapi/pom.xml
index 342a7259b77..7c4b141e89e 100644
--- a/microprofile/tests/tck/tck-openapi/pom.xml
+++ b/microprofile/tests/tck/tck-openapi/pom.xml
@@ -78,11 +78,6 @@
             <artifactId>parsson</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <!--
             RestAssured xml-path, used by the TCK, requires the javax flavor of JAX-B, so add the API and impl.
         -->
diff --git a/microprofile/tracing/pom.xml b/microprofile/tracing/pom.xml
index 3d37bdbe13b..ec318ffd236 100644
--- a/microprofile/tracing/pom.xml
+++ b/microprofile/tracing/pom.xml
@@ -76,12 +76,6 @@
             <groupId>io.helidon.tracing</groupId>
             <artifactId>helidon-tracing-tracer-resolver</artifactId>
         </dependency>
-        <dependency>
-            <!-- Jersey on java 9 -->
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/security/integration/grpc/pom.xml b/security/integration/grpc/pom.xml
index 011ba16344e..9d829242d43 100644
--- a/security/integration/grpc/pom.xml
+++ b/security/integration/grpc/pom.xml
@@ -116,11 +116,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <!--
             need to use this version to work around the same groupId/artifactId and
diff --git a/security/integration/webserver/pom.xml b/security/integration/webserver/pom.xml
index 2c11812f683..c4a10ded0b0 100644
--- a/security/integration/webserver/pom.xml
+++ b/security/integration/webserver/pom.xml
@@ -104,11 +104,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>jakarta.inject</groupId>
             <artifactId>jakarta.inject-api</artifactId>
diff --git a/security/providers/http-auth/pom.xml b/security/providers/http-auth/pom.xml
index 4bc583c08f5..9268ead9ed3 100644
--- a/security/providers/http-auth/pom.xml
+++ b/security/providers/http-auth/pom.xml
@@ -103,11 +103,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.webserver</groupId>
             <artifactId>helidon-webserver</artifactId>
diff --git a/service-common/rest-cdi/pom.xml b/service-common/rest-cdi/pom.xml
index 1faa9086d61..171029e8524 100644
--- a/service-common/rest-cdi/pom.xml
+++ b/service-common/rest-cdi/pom.xml
@@ -48,11 +48,6 @@
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/tests/integration/jpa/simple/pom.xml b/tests/integration/jpa/simple/pom.xml
index f1cfbceadd8..cd0e020bcda 100644
--- a/tests/integration/jpa/simple/pom.xml
+++ b/tests/integration/jpa/simple/pom.xml
@@ -88,10 +88,6 @@
             <artifactId>jakarta.enterprise.cdi-api</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
diff --git a/tests/integration/oidc/pom.xml b/tests/integration/oidc/pom.xml
index faf2a3efbf1..975792e62f9 100644
--- a/tests/integration/oidc/pom.xml
+++ b/tests/integration/oidc/pom.xml
@@ -93,11 +93,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jsoup</groupId>
             <artifactId>jsoup</artifactId>
@@ -148,4 +143,4 @@
         </profile>
     </profiles>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/tests/integration/zipkin-mp-2.2/pom.xml b/tests/integration/zipkin-mp-2.2/pom.xml
index 7d76ae19932..69e704051df 100644
--- a/tests/integration/zipkin-mp-2.2/pom.xml
+++ b/tests/integration/zipkin-mp-2.2/pom.xml
@@ -44,11 +44,6 @@
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
diff --git a/webserver/jersey/pom.xml b/webserver/jersey/pom.xml
index 73a6c405d76..2daee512a59 100644
--- a/webserver/jersey/pom.xml
+++ b/webserver/jersey/pom.xml
@@ -67,16 +67,6 @@
             <groupId>org.glassfish.jersey.containers</groupId>
             <artifactId>jersey-container-grizzly2-http</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.activation</groupId>
-                    <artifactId>jakarta.activation-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.sun.activation</groupId>
-                    <artifactId>jakarta.activation</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.glassfish.jersey.inject</groupId>
diff --git a/webserver/webserver/pom.xml b/webserver/webserver/pom.xml
index 9c6ca8242ff..b0a79378691 100644
--- a/webserver/webserver/pom.xml
+++ b/webserver/webserver/pom.xml
@@ -232,11 +232,6 @@
             <artifactId>jersey-hk2</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.helidon.config</groupId>
             <artifactId>helidon-config-testing</artifactId>