4.x: Forward ports all 3.x JDBC/JPA/JTA work (helidon-io#7437)

* Improves integrations/jdbc/jdbc to better support future JPA improvements; initial work (helidon-io#5654) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Squashable commit; initial work (helidon-io#5716) Lays some groundwork with deprecation and cleanup and isolated improvements to support ongoing JPA improvements. Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Introduces LocalXAResource and a few support classes in jta/jdbc. (helidon-io#5733) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Adds connection unwrapping abilities to CDISEPlatform.java (helidon-io#5790) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Introduces JtaConnection.java (helidon-io#5905) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Fixes erroneous closing behavior in JtaConnection.java (helidon-io#6321) * Fixes erroneous closing behavior in JtaConnection.java Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Minor JPA cleanups; part of overall refactoring effort (helidon-io#6435) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Improving JPA pom.xml as part of overall JPA refactoring (helidon-io#6508) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Fixes merge conflicts etc. from cherry-pick of c9a849e Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Adds an enabled flag to JpaExtension to permit subsequent refactoring and replacement (helidon-io#6512) Adds an enabled flag to JpaExtension to permit subsequent refactoring and replacement Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Adds more classes as part of overall JPA refactoring effort (helidon-io#6584) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Lets unit tests validating JpaExtension and unit tests validating PersistenceExtension run side-by-side; continuation of overall fix for nested transaction problems (helidon-io#7118) * Lets unit tests validating JpaExtension and unit tests validating PersistenceExtension run side-by-side; continuation of overall fix for nested transaction problems Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Resolves issue 7316, which features some intermittent database-related tests (helidon-io#7317) Signed-off-by: Laird Nelson <laird.nelson@oracle.com> * Addresses copyright plugin complaints after lots of cherry-picking from old 3.x commits Signed-off-by: Laird Nelson <laird.nelson@oracle.com> --------- Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
danielkec · Aug 25, 2023 · af9aeb5 · af9aeb5
1 parent 8c18882
commit af9aeb5
Show file tree

Hide file tree

Showing 81 changed files with 16,788 additions and 1,564 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -82,6 +82,7 @@
         <version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
         <version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
         <version.lib.jakarta.websockets-api>2.1.0</version.lib.jakarta.websockets-api>
+        <!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
         <version.lib.jakarta.xml.bind-api>4.0.0</version.lib.jakarta.xml.bind-api>
         <version.lib.jandex>3.1.2</version.lib.jandex>
         <version.lib.jaxb-core>4.0.3</version.lib.jaxb-core>
@@ -285,21 +286,42 @@
                 <artifactId>opentracing-tracerresolver</artifactId>
                 <version>${version.lib.opentracing.tracerresolver}</version>
             </dependency>
+            <!--
+                "Jakarta XML Binding API". (See
+                https://github.com/jakartaee/jaxb-api/blob/d8a68e76a5391cb2462f540c9e4c5c81d0a91942/jaxb-api/pom.xml#L23-L25)
+            -->
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>
                 <version>${version.lib.jakarta.xml.bind-api}</version>
             </dependency>
+            <!--
+                "Old JAXB Core". (See
+                https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/core/pom.xml#L25-L30.)
+            -->
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>
                 <version>${version.lib.jaxb-core}</version>
             </dependency>
+            <!--
+                "Old JAXB Runtime". (See
+                https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/runtime/pom.xml#L25-L30.)
+            -->
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>${version.lib.jaxb-impl}</version>
             </dependency>
+            <!--
+                "JAXB Runtime"/"JAXB (JSR 222) Reference Implementation". (See
+                https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/runtime/impl/pom.xml#L25-L30.)
+            -->
+            <dependency>
+                <groupId>org.glassfish.jaxb</groupId>
+                <artifactId>jaxb-runtime</artifactId>
+                <version>${version.lib.jaxb-runtime}</version>
+            </dependency>
             <dependency>
                 <groupId>jakarta.ws.rs</groupId>
                 <artifactId>jakarta.ws.rs-api</artifactId>

diff --git a/integrations/cdi/common-cdi/delegates/src/main/java/module-info.java b/integrations/cdi/common-cdi/delegates/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 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.
@@ -17,8 +17,10 @@
 /**
  * Provides classes and interfaces that wrap existing CDI constructs.
  */
+@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.integrations.cdi.delegates {
-    requires jakarta.cdi;
+
+    requires transitive jakarta.cdi;
 
     exports io.helidon.integrations.cdi.delegates;
 }
diff --git a/...t/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCounted.java b/...t/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCounted.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 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.
@@ -61,7 +61,10 @@
  * notional request starting upon first instantiation.</p>
  *
  * @see ReferenceCountedContext
+ *
+ * @deprecated This annotation is slated for removal.
  */
+@Deprecated(forRemoval = true, since = "3.0.3")
 @Documented
 @NormalScope(passivating = false)
 @Retention(RetentionPolicy.RUNTIME)

diff --git a/...ain/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCountedContext.java b/...ain/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCountedContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 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.
@@ -54,7 +54,10 @@
  * @see #get(Contextual, CreationalContext)
  *
  * @see ReferenceCounted
+ *
+ * @deprecated This class is slated for removal.
  */
+@Deprecated(forRemoval = true, since = "3.0.3")
 public final class ReferenceCountedContext implements AlterableContext {
 
 

diff --git a/...n/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCountedExtension.java b/...n/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCountedExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 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.
@@ -42,7 +42,10 @@
  * @see ReferenceCountedContext
  *
  * @see ReferenceCounted
+ *
+ * @deprecated This class is slated for removal.
  */
+@Deprecated(forRemoval = true, since = "3.0.3")
 public class ReferenceCountedExtension implements Extension {
 
 

diff --git a/...ntext/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/package-info.java b/...ntext/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 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.
@@ -18,6 +18,10 @@
  * Provides classes and interfaces that support contextual reference
  * counting.
  *
- * @see io.helidon.integrations.cdi.referencecountedcontext.ReferenceCountedExtension
+ * @see
+ * io.helidon.integrations.cdi.referencecountedcontext.ReferenceCountedExtension
+ *
+ * @deprecated This package is slated for removal with no replacement.
  */
+@Deprecated(forRemoval = true, since = "3.0.3")
 package io.helidon.integrations.cdi.referencecountedcontext;
diff --git a/integrations/cdi/common-cdi/reference-counted-context/src/main/java/module-info.java b/integrations/cdi/common-cdi/reference-counted-context/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2020, 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.
@@ -20,9 +20,11 @@
  *
  * @see io.helidon.integrations.cdi.referencecountedcontext.ReferenceCountedExtension
  */
+@Deprecated(forRemoval = true, since = "3.0.3")
+@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
 module io.helidon.integrations.cdi.referencecountedcontext {
     requires io.helidon.integrations.cdi.delegates;
-    requires jakarta.cdi;
+    requires transitive jakarta.cdi;
 
     exports io.helidon.integrations.cdi.referencecountedcontext;