Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

4.x: Forward ports all 3.x JDBC/JPA/JTA work #7437

Merged

Conversation

ljnelson
Copy link
Member

@ljnelson ljnelson commented Aug 23, 2023

This PR forward ports all JDBC, JPA and JTA improvements made over the past year or so to the 4.x/main branch in one shot.

The PR consists of the following cherry-picked commits, together with a few smoothing-out/minor merge conflict commits, and a "make the copyright plugin shut up" commit or two:

(Obviously reviewers would be wise to spend most of their time on the (few) manual commits rather than the cherry-picked ones.)

…ents; initial work (helidon-io#5654)

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
Lays some groundwork with deprecation and cleanup and isolated improvements to support ongoing JPA improvements.

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
…o#5790)

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
* Fixes erroneous closing behavior in JtaConnection.java

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
…6508)

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
… 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>
…io#6584)

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
…sistenceExtension 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>
…d tests (helidon-io#7317)

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
…om old 3.x commits

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
@ljnelson ljnelson added build P4 cdi CDI jpa/jta java Pull requests that update Java code 4.x Version 4.x labels Aug 23, 2023
@ljnelson ljnelson self-assigned this Aug 23, 2023
@oracle-contributor-agreement oracle-contributor-agreement bot added the OCA Verified All contributors have signed the Oracle Contributor Agreement. label Aug 23, 2023
@ljnelson ljnelson marked this pull request as ready for review August 23, 2023 23:17
@ljnelson ljnelson merged commit af9aeb5 into helidon-io:main Aug 25, 2023
12 checks passed
dalexandrov pushed a commit to dalexandrov/helidon that referenced this pull request Aug 26, 2023
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4.x Version 4.x build cdi CDI java Pull requests that update Java code jpa/jta OCA Verified All contributors have signed the Oracle Contributor Agreement. P4
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants