From 1b2109e077cd47399d210e72d39bcf985dfe5c3f Mon Sep 17 00:00:00 2001
From: Joe Di Pol <joe.dipol@oracle.com>
Date: Tue, 20 Aug 2024 13:13:47 -0700
Subject: [PATCH] Upgrade jakarta inject, interceptor and transaction apis

---
 dependencies/pom.xml                                        | 6 +++---
 integrations/cdi/jpa-cdi/src/main/java/module-info.java     | 2 +-
 integrations/cdi/jta-cdi/src/main/java/module-info.java     | 2 +-
 integrations/jta/jdbc/pom.xml                               | 5 +++++
 integrations/micrometer/cdi/src/main/java/module-info.java  | 2 +-
 integrations/micronaut/cdi/src/main/java/module-info.java   | 2 +-
 integrations/micronaut/data/src/main/java/module-info.java  | 2 +-
 integrations/microstream/cdi/src/main/java/module-info.java | 4 ++--
 integrations/neo4j/metrics/src/main/java/module-info.java   | 2 +-
 integrations/neo4j/neo4j/src/main/java/module-info.java     | 2 +-
 integrations/oci/metrics/cdi/src/main/java/module-info.java | 2 +-
 integrations/oci/sdk/cdi/src/main/java/module-info.java     | 2 +-
 microprofile/access-log/src/main/java/module-info.java      | 2 +-
 microprofile/cors/src/main/java/module-info.java            | 2 +-
 microprofile/fault-tolerance/src/main/java/module-info.java | 2 +-
 microprofile/graphql/server/src/main/java/module-info.java  | 2 +-
 microprofile/grpc/metrics/src/main/java/module-info.java    | 4 ++--
 microprofile/health/src/main/java/module-info.java          | 2 +-
 microprofile/jwt-auth/src/main/java/module-info.java        | 1 +
 microprofile/lra/jax-rs/src/main/java/module-info.java      | 2 +-
 microprofile/messaging/core/src/main/java/module-info.java  | 2 +-
 microprofile/metrics/src/main/java/module-info.java         | 2 +-
 microprofile/openapi/src/main/java/module-info.java         | 2 +-
 microprofile/scheduling/src/main/java/module-info.java      | 2 +-
 microprofile/security/src/main/java/module-info.java        | 2 +-
 microprofile/server/src/main/java/module-info.java          | 2 +-
 microprofile/tracing/src/main/java/module-info.java         | 2 +-
 microprofile/websocket/src/main/java/module-info.java       | 2 +-
 service-common/rest-cdi/src/main/java/module-info.java      | 2 +-
 29 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index 53548034d1a..2851a69c02e 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -75,14 +75,14 @@
         <version.lib.jakarta.annotation-api>2.0.0</version.lib.jakarta.annotation-api>
         <version.lib.jakarta.cdi-api>3.0.0</version.lib.jakarta.cdi-api>
         <version.lib.jakarta.el-api>4.0.0</version.lib.jakarta.el-api>
-        <version.lib.jakarta.inject>2.0.0</version.lib.jakarta.inject>
-        <version.lib.jakarta.interceptor-api>2.0.0</version.lib.jakarta.interceptor-api>
+        <version.lib.jakarta.inject>2.0.1</version.lib.jakarta.inject>
+        <version.lib.jakarta.interceptor-api>2.0.1</version.lib.jakarta.interceptor-api>
         <version.lib.jakarta.jaxrs-api>3.0.0</version.lib.jakarta.jaxrs-api>
         <version.lib.jakarta.jms-api>3.0.0</version.lib.jakarta.jms-api>
         <version.lib.jakarta.jsonb-api>2.0.0</version.lib.jakarta.jsonb-api>
         <version.lib.jakarta.jsonp-api>2.0.2</version.lib.jakarta.jsonp-api>
         <version.lib.jakarta.persistence-api>3.0.0</version.lib.jakarta.persistence-api>
-        <version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
+        <version.lib.jakarta.transaction-api>2.0.1</version.lib.jakarta.transaction-api>
         <version.lib.jakarta.validation-api>3.0.2</version.lib.jakarta.validation-api>
         <version.lib.jakarta.websockets-api>2.1.1</version.lib.jakarta.websockets-api>
         <!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
diff --git a/integrations/cdi/jpa-cdi/src/main/java/module-info.java b/integrations/cdi/jpa-cdi/src/main/java/module-info.java
index 828d6478a4c..604812995f8 100644
--- a/integrations/cdi/jpa-cdi/src/main/java/module-info.java
+++ b/integrations/cdi/jpa-cdi/src/main/java/module-info.java
@@ -34,7 +34,7 @@
     requires jakarta.xml.bind;
 
     requires jakarta.inject; // automatic module
-    requires jakarta.interceptor.api; // automatic module
+    requires jakarta.interceptor;
 
     requires io.helidon.integrations.cdi.delegates;
     requires io.helidon.integrations.cdi.referencecountedcontext;
diff --git a/integrations/cdi/jta-cdi/src/main/java/module-info.java b/integrations/cdi/jta-cdi/src/main/java/module-info.java
index c68dab514e9..4f15edd89a7 100644
--- a/integrations/cdi/jta-cdi/src/main/java/module-info.java
+++ b/integrations/cdi/jta-cdi/src/main/java/module-info.java
@@ -27,7 +27,7 @@
     requires jakarta.annotation;
     requires java.sql;
     requires java.rmi;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jakarta.inject;
     requires jakarta.cdi;
     requires narayana.jta.jakarta;
diff --git a/integrations/jta/jdbc/pom.xml b/integrations/jta/jdbc/pom.xml
index 7c0a85b3bb8..d74c1746bc8 100644
--- a/integrations/jta/jdbc/pom.xml
+++ b/integrations/jta/jdbc/pom.xml
@@ -49,6 +49,11 @@
             <artifactId>jakarta.transaction-api</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Test-scoped dependencies. -->
         <dependency>
diff --git a/integrations/micrometer/cdi/src/main/java/module-info.java b/integrations/micrometer/cdi/src/main/java/module-info.java
index 489b50ef314..7ec609f5618 100644
--- a/integrations/micrometer/cdi/src/main/java/module-info.java
+++ b/integrations/micrometer/cdi/src/main/java/module-info.java
@@ -26,7 +26,7 @@
     requires static jakarta.activation;
     requires static jakarta.cdi;
     requires static jakarta.inject;
-    requires static jakarta.interceptor.api;
+    requires static jakarta.interceptor;
 
     requires io.helidon.common.http;
     requires io.helidon.servicecommon.rest;
diff --git a/integrations/micronaut/cdi/src/main/java/module-info.java b/integrations/micronaut/cdi/src/main/java/module-info.java
index 2c366944fdd..792db4d6544 100644
--- a/integrations/micronaut/cdi/src/main/java/module-info.java
+++ b/integrations/micronaut/cdi/src/main/java/module-info.java
@@ -27,7 +27,7 @@
 
     requires jakarta.cdi;
     requires jakarta.inject;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     requires microprofile.config.api;
 
diff --git a/integrations/micronaut/data/src/main/java/module-info.java b/integrations/micronaut/data/src/main/java/module-info.java
index 5ee3cc33fec..786b5c684ad 100644
--- a/integrations/micronaut/data/src/main/java/module-info.java
+++ b/integrations/micronaut/data/src/main/java/module-info.java
@@ -22,7 +22,7 @@
     requires java.sql;
 
     requires jakarta.cdi;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     requires io.micronaut.inject;
 
diff --git a/integrations/microstream/cdi/src/main/java/module-info.java b/integrations/microstream/cdi/src/main/java/module-info.java
index 75b4cf6cc4c..0106368348e 100644
--- a/integrations/microstream/cdi/src/main/java/module-info.java
+++ b/integrations/microstream/cdi/src/main/java/module-info.java
@@ -27,7 +27,7 @@
     requires io.helidon.integrations.microstream.cache;
     requires transitive jakarta.cdi;
     requires transitive jakarta.inject;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jakarta.annotation;
     requires microstream.base;
     requires microstream.cache;
@@ -38,4 +38,4 @@
     provides jakarta.enterprise.inject.spi.Extension
             with io.helidon.integrations.microstream.cdi.EmbeddedStorageManagerExtension,
                     io.helidon.integrations.microstream.cdi.CacheExtension;
-}
\ No newline at end of file
+}
diff --git a/integrations/neo4j/metrics/src/main/java/module-info.java b/integrations/neo4j/metrics/src/main/java/module-info.java
index 9ae2d2876c7..f4801cffffc 100644
--- a/integrations/neo4j/metrics/src/main/java/module-info.java
+++ b/integrations/neo4j/metrics/src/main/java/module-info.java
@@ -29,7 +29,7 @@
 
     requires static jakarta.cdi;
     requires static jakarta.inject;
-    requires static jakarta.interceptor.api;
+    requires static jakarta.interceptor;
     requires static jakarta.annotation;
 
     exports io.helidon.integrations.neo4j.metrics;
diff --git a/integrations/neo4j/neo4j/src/main/java/module-info.java b/integrations/neo4j/neo4j/src/main/java/module-info.java
index 6ab5eceaf17..e0b9aa995ff 100644
--- a/integrations/neo4j/neo4j/src/main/java/module-info.java
+++ b/integrations/neo4j/neo4j/src/main/java/module-info.java
@@ -22,7 +22,7 @@
 
     requires static jakarta.cdi;
     requires static jakarta.inject;
-    requires static jakarta.interceptor.api;
+    requires static jakarta.interceptor;
     requires static io.helidon.config;
     requires static io.helidon.config.mp;
 
diff --git a/integrations/oci/metrics/cdi/src/main/java/module-info.java b/integrations/oci/metrics/cdi/src/main/java/module-info.java
index 18b58d523a5..f0e688faee0 100644
--- a/integrations/oci/metrics/cdi/src/main/java/module-info.java
+++ b/integrations/oci/metrics/cdi/src/main/java/module-info.java
@@ -25,7 +25,7 @@
 
     requires oci.java.sdk.monitoring;
 
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     provides jakarta.enterprise.inject.spi.Extension with io.helidon.integrations.oci.metrics.cdi.OciMetricsCdiExtension;
 
     opens io.helidon.integrations.oci.metrics.cdi to weld.core.impl, io.helidon.microprofile.cdi;
diff --git a/integrations/oci/sdk/cdi/src/main/java/module-info.java b/integrations/oci/sdk/cdi/src/main/java/module-info.java
index 5b9ea1008d3..03a5d6c1154 100644
--- a/integrations/oci/sdk/cdi/src/main/java/module-info.java
+++ b/integrations/oci/sdk/cdi/src/main/java/module-info.java
@@ -29,7 +29,7 @@
     requires java.logging;
     requires transitive jakarta.cdi;
     requires jakarta.inject;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jakarta.ws.rs;
     requires microprofile.config.api;
     requires oci.java.sdk.common;
diff --git a/microprofile/access-log/src/main/java/module-info.java b/microprofile/access-log/src/main/java/module-info.java
index 2ad208504ad..29817095cfc 100644
--- a/microprofile/access-log/src/main/java/module-info.java
+++ b/microprofile/access-log/src/main/java/module-info.java
@@ -22,7 +22,7 @@
 
     requires io.helidon.microprofile.server;
     requires io.helidon.webserver.accesslog;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     exports io.helidon.microprofile.accesslog;
 
diff --git a/microprofile/cors/src/main/java/module-info.java b/microprofile/cors/src/main/java/module-info.java
index a8c50bdaa1a..ea9bf4052b3 100644
--- a/microprofile/cors/src/main/java/module-info.java
+++ b/microprofile/cors/src/main/java/module-info.java
@@ -34,7 +34,7 @@
     requires jersey.common;
     requires microprofile.config.api;
 
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jakarta.cdi;
 
     exports io.helidon.microprofile.cors;
diff --git a/microprofile/fault-tolerance/src/main/java/module-info.java b/microprofile/fault-tolerance/src/main/java/module-info.java
index 871c0e7644f..05f644a5f4c 100644
--- a/microprofile/fault-tolerance/src/main/java/module-info.java
+++ b/microprofile/fault-tolerance/src/main/java/module-info.java
@@ -23,7 +23,7 @@
     requires java.logging;
     requires jakarta.annotation;
     requires jakarta.inject;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     requires io.helidon.common.context;
     requires io.helidon.common.configurable;
diff --git a/microprofile/graphql/server/src/main/java/module-info.java b/microprofile/graphql/server/src/main/java/module-info.java
index 71b1170b06d..416210621be 100644
--- a/microprofile/graphql/server/src/main/java/module-info.java
+++ b/microprofile/graphql/server/src/main/java/module-info.java
@@ -26,7 +26,7 @@
     requires jakarta.json.bind;
     requires jakarta.annotation;
     requires jakarta.cdi;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires org.eclipse.yasson;
 
     requires org.jboss.jandex;
diff --git a/microprofile/grpc/metrics/src/main/java/module-info.java b/microprofile/grpc/metrics/src/main/java/module-info.java
index 5ff244bd6c9..eb464ff09d1 100644
--- a/microprofile/grpc/metrics/src/main/java/module-info.java
+++ b/microprofile/grpc/metrics/src/main/java/module-info.java
@@ -28,11 +28,11 @@
     requires io.helidon.servicecommon.restcdi;
 
     requires java.logging;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     provides io.helidon.microprofile.grpc.server.AnnotatedServiceConfigurer
             with io.helidon.microprofile.grpc.metrics.MetricsConfigurer;
 
     provides jakarta.enterprise.inject.spi.Extension
             with io.helidon.microprofile.grpc.metrics.GrpcMetricsCdiExtension;
-}
\ No newline at end of file
+}
diff --git a/microprofile/health/src/main/java/module-info.java b/microprofile/health/src/main/java/module-info.java
index 4009805a534..25d8d19be61 100644
--- a/microprofile/health/src/main/java/module-info.java
+++ b/microprofile/health/src/main/java/module-info.java
@@ -34,7 +34,7 @@
     requires jakarta.inject;
     requires jakarta.ws.rs;
     requires jakarta.json;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires microprofile.config.api;
     requires microprofile.health.api;
     requires io.helidon.config.mp;
diff --git a/microprofile/jwt-auth/src/main/java/module-info.java b/microprofile/jwt-auth/src/main/java/module-info.java
index f39c5bfe153..0eb32611737 100644
--- a/microprofile/jwt-auth/src/main/java/module-info.java
+++ b/microprofile/jwt-auth/src/main/java/module-info.java
@@ -25,6 +25,7 @@
 
     requires jakarta.cdi;
     requires jakarta.inject;
+    requires jakarta.interceptor;
     requires jakarta.ws.rs;
     requires microprofile.config.api;
     requires transitive microprofile.jwt.auth.api;
diff --git a/microprofile/lra/jax-rs/src/main/java/module-info.java b/microprofile/lra/jax-rs/src/main/java/module-info.java
index aff48332bad..ac21a1fd593 100644
--- a/microprofile/lra/jax-rs/src/main/java/module-info.java
+++ b/microprofile/lra/jax-rs/src/main/java/module-info.java
@@ -30,7 +30,7 @@
     requires io.helidon.microprofile.config;
     requires io.helidon.microprofile.server;
     requires microprofile.config.api;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jersey.common;
     requires io.helidon.lra.coordinator.client;
     requires io.helidon.common.serviceloader;
diff --git a/microprofile/messaging/core/src/main/java/module-info.java b/microprofile/messaging/core/src/main/java/module-info.java
index 148215e01ff..d9621886451 100644
--- a/microprofile/messaging/core/src/main/java/module-info.java
+++ b/microprofile/messaging/core/src/main/java/module-info.java
@@ -25,7 +25,7 @@
     requires static jakarta.cdi;
     requires static jakarta.inject;
     requires static jakarta.activation;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires io.helidon.config;
     requires io.helidon.config.mp;
     requires io.helidon.microprofile.config;
diff --git a/microprofile/metrics/src/main/java/module-info.java b/microprofile/metrics/src/main/java/module-info.java
index a5d4de4a3fa..6fed9c476ab 100644
--- a/microprofile/metrics/src/main/java/module-info.java
+++ b/microprofile/metrics/src/main/java/module-info.java
@@ -24,7 +24,7 @@
 
     requires static jakarta.cdi;
     requires static jakarta.inject;
-    requires static jakarta.interceptor.api;
+    requires static jakarta.interceptor;
     requires static jakarta.annotation;
     requires static jakarta.activation;
 
diff --git a/microprofile/openapi/src/main/java/module-info.java b/microprofile/openapi/src/main/java/module-info.java
index 2667b5f916a..5e09241538f 100644
--- a/microprofile/openapi/src/main/java/module-info.java
+++ b/microprofile/openapi/src/main/java/module-info.java
@@ -29,7 +29,7 @@
     requires microprofile.config.api;
     requires io.helidon.microprofile.server;
     requires io.helidon.openapi;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires transitive microprofile.openapi.api;
 
     requires org.jboss.jandex;
diff --git a/microprofile/scheduling/src/main/java/module-info.java b/microprofile/scheduling/src/main/java/module-info.java
index 01f03a4f081..c52d44a61a4 100644
--- a/microprofile/scheduling/src/main/java/module-info.java
+++ b/microprofile/scheduling/src/main/java/module-info.java
@@ -23,7 +23,7 @@
     requires java.logging;
     requires static jakarta.cdi;
     requires static jakarta.inject;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires io.helidon.common.configurable;
     requires io.helidon.config;
     requires io.helidon.config.mp;
diff --git a/microprofile/security/src/main/java/module-info.java b/microprofile/security/src/main/java/module-info.java
index 60ccacff221..7baea325151 100644
--- a/microprofile/security/src/main/java/module-info.java
+++ b/microprofile/security/src/main/java/module-info.java
@@ -26,7 +26,7 @@
     requires transitive io.helidon.security.integration.webserver;
     requires io.helidon.microprofile.server;
     requires io.helidon.microprofile.cdi;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     exports io.helidon.microprofile.security;
 
diff --git a/microprofile/server/src/main/java/module-info.java b/microprofile/server/src/main/java/module-info.java
index 2727a020b75..fbbcee54b94 100644
--- a/microprofile/server/src/main/java/module-info.java
+++ b/microprofile/server/src/main/java/module-info.java
@@ -30,7 +30,7 @@
     requires io.helidon.microprofile.config;
     requires transitive jakarta.cdi;
     requires transitive jakarta.ws.rs;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jakarta.validation;
     requires transitive jakarta.json;
     requires io.helidon.jersey.media.jsonp;
diff --git a/microprofile/tracing/src/main/java/module-info.java b/microprofile/tracing/src/main/java/module-info.java
index b06ca96a012..c9ce4b9f720 100644
--- a/microprofile/tracing/src/main/java/module-info.java
+++ b/microprofile/tracing/src/main/java/module-info.java
@@ -29,7 +29,7 @@
 
     requires static jakarta.cdi;
     requires static jakarta.inject;
-    requires static jakarta.interceptor.api;
+    requires static jakarta.interceptor;
 
     requires io.helidon.microprofile.server;
     requires transitive io.helidon.microprofile.config;
diff --git a/microprofile/websocket/src/main/java/module-info.java b/microprofile/websocket/src/main/java/module-info.java
index 150a8f32b01..045567b707d 100644
--- a/microprofile/websocket/src/main/java/module-info.java
+++ b/microprofile/websocket/src/main/java/module-info.java
@@ -20,7 +20,7 @@
 module io.helidon.microprofile.tyrus {
     requires java.logging;
     requires jakarta.inject;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
 
     requires jakarta.cdi;
     requires transitive jakarta.websocket;
diff --git a/service-common/rest-cdi/src/main/java/module-info.java b/service-common/rest-cdi/src/main/java/module-info.java
index af4bc576412..4b8e0022498 100644
--- a/service-common/rest-cdi/src/main/java/module-info.java
+++ b/service-common/rest-cdi/src/main/java/module-info.java
@@ -25,7 +25,7 @@
     requires io.helidon.servicecommon.rest;
     requires java.logging;
     requires microprofile.config.api;
-    requires jakarta.interceptor.api;
+    requires jakarta.interceptor;
     requires jakarta.inject;
     requires io.helidon.config.mp;
     requires io.helidon.microprofile.server;