From b2d15cbcecf09ea34905fb6917f8c1992284315e Mon Sep 17 00:00:00 2001
From: Matej Novotny
Date: Mon, 16 May 2022 08:28:27 +0200
Subject: [PATCH] Remove dependency on JTA API
---
api/pom.xml | 14 --------------
.../enterprise/event/TransactionPhase.java | 16 ++++++++--------
2 files changed, 8 insertions(+), 22 deletions(-)
diff --git a/api/pom.xml b/api/pom.xml
index 075b82695..d374ef12b 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -135,7 +135,6 @@
2.1.0
4.0.0
- 2.0.0
11
5.1.2
@@ -183,13 +182,6 @@
jakarta.interceptor-api
${interceptor.api.version}
-
-
-
- jakarta.transaction
- jakarta.transaction-api
- ${transaction.api.version}
-
@@ -225,12 +217,6 @@
jakarta.inject-api
-
- jakarta.transaction
- jakarta.transaction-api
- provided
-
-
org.testng
testng
diff --git a/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java b/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
index c8f95fec4..a9cc05ac1 100644
--- a/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
+++ b/api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
@@ -25,8 +25,8 @@
* Transactional observer methods are observer methods which receive event notifications during the before or after completion
* phase of the transaction in which the event was fired. If no transaction is in progress when the event is fired, they are
* notified at the same time as other observers.
- * If the transaction is in progress, but {@link jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
- * marked for rollback or in state where {@link jakarta.transaction.Synchronization} callbacks cannot be registered, the {@link #BEFORE_COMPLETION},
+ * If the transaction is in progress, but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
+ * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered, the {@link #BEFORE_COMPLETION},
* {@link #AFTER_COMPLETION} and {@link #AFTER_FAILURE} observer methods are notified at the same time as other observers,
* but {@link #AFTER_SUCCESS} observer methods get skipped.
*
@@ -51,8 +51,8 @@ public enum TransactionPhase {
*
*
* Transactional observer will be notified if there is no transaction in progress, or the transaction is in progress,
- * but {@link jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
- * marked for rollback or in state where {@link jakarta.transaction.Synchronization} callbacks cannot be registered.
+ * but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
+ * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered.
*
*/
BEFORE_COMPLETION,
@@ -63,8 +63,8 @@ public enum TransactionPhase {
*
*
* Transactional observer will be notified if there is no transaction in progress, or the transaction is in progress,
- * but {@link jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
- * marked for rollback or in state where {@link jakarta.transaction.Synchronization} callbacks cannot be registered.
+ * but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
+ * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered.
*
*/
AFTER_COMPLETION,
@@ -76,8 +76,8 @@ public enum TransactionPhase {
*
*
* Transactional observer will be notified will also get invoked if there is no transaction in progress, or the transaction is in progress,
- * but {@link jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
- * marked for rollback or in state where {@link jakarta.transaction.Synchronization} callbacks cannot be registered.
+ * but {@code jakarta.transaction.Synchronization} callback cannot be registered due to the transaction being already
+ * marked for rollback or in state where {@code jakarta.transaction.Synchronization} callbacks cannot be registered.
*
*/
AFTER_FAILURE,