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

Remove dependency on JTA API #609

Merged
merged 1 commit into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,6 @@
<interceptor.api.version>2.1.0</interceptor.api.version>
<!-- These are only used in javadoc links -->
<ejb.api.version>4.0.0</ejb.api.version>
<transaction.api.version>2.0.0</transaction.api.version>

<maven.compiler.release>11</maven.compiler.release>
<maven-bundle-plugin.version>5.1.2</maven-bundle-plugin.version>
Expand Down Expand Up @@ -183,13 +182,6 @@
<artifactId>jakarta.interceptor-api</artifactId>
<version>${interceptor.api.version}</version>
</dependency>

<!-- Only for javadoc references -->
<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<version>${transaction.api.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down Expand Up @@ -225,12 +217,6 @@
<artifactId>jakarta.inject-api</artifactId>
</dependency>

<dependency>
<groupId>jakarta.transaction</groupId>
<artifactId>jakarta.transaction-api</artifactId>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions api/src/main/java/jakarta/enterprise/event/TransactionPhase.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* </p>
Expand All @@ -51,8 +51,8 @@ public enum TransactionPhase {
* </p>
* <p>
* 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.
* </p>
*/
BEFORE_COMPLETION,
Expand All @@ -63,8 +63,8 @@ public enum TransactionPhase {
* </p>
* <p>
* 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.
* </p>
*/
AFTER_COMPLETION,
Expand All @@ -76,8 +76,8 @@ public enum TransactionPhase {
* </p>
* <p>
* 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.
* </p>
*/
AFTER_FAILURE,
Expand Down