Skip to content

Commit af9aeb5

Browse files
ljnelsonljnelson
authored
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>
1 parent 8c18882 commit af9aeb5

81 files changed

Lines changed: 16788 additions & 1564 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dependencies/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
<version.lib.jakarta.transaction-api>2.0.0</version.lib.jakarta.transaction-api>
8383
<version.lib.jakarta.validation-api>3.0.0</version.lib.jakarta.validation-api>
8484
<version.lib.jakarta.websockets-api>2.1.0</version.lib.jakarta.websockets-api>
85+
<!-- Check Hibernate when upgrading to ensure its supplied jaxb-runtime is compatible. -->
8586
<version.lib.jakarta.xml.bind-api>4.0.0</version.lib.jakarta.xml.bind-api>
8687
<version.lib.jandex>3.1.2</version.lib.jandex>
8788
<version.lib.jaxb-core>4.0.3</version.lib.jaxb-core>
@@ -285,21 +286,42 @@
285286
<artifactId>opentracing-tracerresolver</artifactId>
286287
<version>${version.lib.opentracing.tracerresolver}</version>
287288
</dependency>
289+
<!--
290+
"Jakarta XML Binding API". (See
291+
https://github.com/jakartaee/jaxb-api/blob/d8a68e76a5391cb2462f540c9e4c5c81d0a91942/jaxb-api/pom.xml#L23-L25)
292+
-->
288293
<dependency>
289294
<groupId>jakarta.xml.bind</groupId>
290295
<artifactId>jakarta.xml.bind-api</artifactId>
291296
<version>${version.lib.jakarta.xml.bind-api}</version>
292297
</dependency>
298+
<!--
299+
"Old JAXB Core". (See
300+
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/core/pom.xml#L25-L30.)
301+
-->
293302
<dependency>
294303
<groupId>com.sun.xml.bind</groupId>
295304
<artifactId>jaxb-core</artifactId>
296305
<version>${version.lib.jaxb-core}</version>
297306
</dependency>
307+
<!--
308+
"Old JAXB Runtime". (See
309+
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/bundles/runtime/pom.xml#L25-L30.)
310+
-->
298311
<dependency>
299312
<groupId>com.sun.xml.bind</groupId>
300313
<artifactId>jaxb-impl</artifactId>
301314
<version>${version.lib.jaxb-impl}</version>
302315
</dependency>
316+
<!--
317+
"JAXB Runtime"/"JAXB (JSR 222) Reference Implementation". (See
318+
https://github.com/eclipse-ee4j/jaxb-ri/blob/1120e83b8bac6dfd1636e19269a36a8ccaad94e4/jaxb-ri/runtime/impl/pom.xml#L25-L30.)
319+
-->
320+
<dependency>
321+
<groupId>org.glassfish.jaxb</groupId>
322+
<artifactId>jaxb-runtime</artifactId>
323+
<version>${version.lib.jaxb-runtime}</version>
324+
</dependency>
303325
<dependency>
304326
<groupId>jakarta.ws.rs</groupId>
305327
<artifactId>jakarta.ws.rs-api</artifactId>

‎integrations/cdi/common-cdi/delegates/src/main/java/module-info.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2021 Oracle and/or its affiliates.
2+
* Copyright (c) 2020, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,8 +17,10 @@
1717
/**
1818
* Provides classes and interfaces that wrap existing CDI constructs.
1919
*/
20+
@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
2021
module io.helidon.integrations.cdi.delegates {
21-
requires jakarta.cdi;
22+
23+
requires transitive jakarta.cdi;
2224

2325
exports io.helidon.integrations.cdi.delegates;
2426
}

‎integrations/cdi/common-cdi/reference-counted-context/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCounted.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -61,7 +61,10 @@
6161
* notional request starting upon first instantiation.</p>
6262
*
6363
* @see ReferenceCountedContext
64+
*
65+
* @deprecated This annotation is slated for removal.
6466
*/
67+
@Deprecated(forRemoval = true, since = "3.0.3")
6568
@Documented
6669
@NormalScope(passivating = false)
6770
@Retention(RetentionPolicy.RUNTIME)

‎integrations/cdi/common-cdi/reference-counted-context/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCountedContext.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -54,7 +54,10 @@
5454
* @see #get(Contextual, CreationalContext)
5555
*
5656
* @see ReferenceCounted
57+
*
58+
* @deprecated This class is slated for removal.
5759
*/
60+
@Deprecated(forRemoval = true, since = "3.0.3")
5861
public final class ReferenceCountedContext implements AlterableContext {
5962

6063

‎integrations/cdi/common-cdi/reference-counted-context/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/ReferenceCountedExtension.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -42,7 +42,10 @@
4242
* @see ReferenceCountedContext
4343
*
4444
* @see ReferenceCounted
45+
*
46+
* @deprecated This class is slated for removal.
4547
*/
48+
@Deprecated(forRemoval = true, since = "3.0.3")
4649
public class ReferenceCountedExtension implements Extension {
4750

4851

‎integrations/cdi/common-cdi/reference-counted-context/src/main/java/io/helidon/integrations/cdi/referencecountedcontext/package-info.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, 2021 Oracle and/or its affiliates.
2+
* Copyright (c) 2019, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,6 +18,10 @@
1818
* Provides classes and interfaces that support contextual reference
1919
* counting.
2020
*
21-
* @see io.helidon.integrations.cdi.referencecountedcontext.ReferenceCountedExtension
21+
* @see
22+
* io.helidon.integrations.cdi.referencecountedcontext.ReferenceCountedExtension
23+
*
24+
* @deprecated This package is slated for removal with no replacement.
2225
*/
26+
@Deprecated(forRemoval = true, since = "3.0.3")
2327
package io.helidon.integrations.cdi.referencecountedcontext;

‎integrations/cdi/common-cdi/reference-counted-context/src/main/java/module-info.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2021 Oracle and/or its affiliates.
2+
* Copyright (c) 2020, 2023 Oracle and/or its affiliates.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,9 +20,11 @@
2020
*
2121
* @see io.helidon.integrations.cdi.referencecountedcontext.ReferenceCountedExtension
2222
*/
23+
@Deprecated(forRemoval = true, since = "3.0.3")
24+
@SuppressWarnings({ "requires-automatic", "requires-transitive-automatic" })
2325
module io.helidon.integrations.cdi.referencecountedcontext {
2426
requires io.helidon.integrations.cdi.delegates;
25-
requires jakarta.cdi;
27+
requires transitive jakarta.cdi;
2628

2729
exports io.helidon.integrations.cdi.referencecountedcontext;
2830

0 commit comments

Comments
 (0)