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.

Sign up for GitHub

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

Jump to bottom

Upgrades Narayana to 5.12.0.Final and deprecates now-redundant classes for removal #3296

Merged
merged 4 commits into from
Aug 25, 2021
Merged

Upgrades Narayana to 5.12.0.Final and deprecates now-redundant classes for removal #3296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4d9226
Upgrades Narayana to 5.12.0.Final and deprecates now-redundant classe…
ljnelson Aug 19, 2021
63494ad
Squashable commit; fixing copyright
ljnelson Aug 19, 2021
0ab5d36
Squashable commit; documentation change
ljnelson Aug 19, 2021
d4619e5
Squashable commit; upgrades JBoss Transaction SPI to 7.6.1.Final
ljnelson Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<version.lib.jboss.classfilewriter>1.2.5.Final</version.lib.jboss.classfilewriter>
<version.lib.jboss.logging>3.2.1.Final</version.lib.jboss.logging>
<version.lib.jboss.transaction-api>1.0.0.Final</version.lib.jboss.transaction-api>
<version.lib.jboss.transaction-spi>7.6.0.Final</version.lib.jboss.transaction-spi>
<version.lib.jboss.transaction-spi>7.6.1.Final</version.lib.jboss.transaction-spi>
<!-- Force upgrade version used by maven-jaxb2-plugin. Needed to support Java 16 -->
<version.lib.jaxb-runtime>2.3.3</version.lib.jaxb-runtime>
<version.lib.jedis>3.1.0</version.lib.jedis>
Expand Down Expand Up @@ -116,7 +116,7 @@
<version.lib.mssql-jdbc>8.4.1.jre8</version.lib.mssql-jdbc>
<version.lib.neo4j>4.2.4</version.lib.neo4j>
<version.lib.mysql-connector-java>8.0.22</version.lib.mysql-connector-java>
<version.lib.narayana>5.9.3.Final</version.lib.narayana>
<version.lib.narayana>5.12.0.Final</version.lib.narayana>
<version.lib.netty>4.1.63.Final</version.lib.netty>
<version.lib.oci-java-sdk-objectstorage>2.3.0</version.lib.oci-java-sdk-objectstorage>
<version.lib.ojdbc8>19.8.0.0</version.lib.ojdbc8>
Expand Down
5 changes: 4 additions & 1 deletion ...i/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/DelegatingTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2020 Oracle and/or its affiliates.
* Copyright (c) 2019, 2021 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.
Expand Down Expand Up @@ -35,7 +35,10 @@
* other non-{@code public} internal classes.</p>
*
* @see TransactionManager
*
* @deprecated An equivalent class now exists in Narayana itself.
*/
@Deprecated(forRemoval = true)
public abstract class DelegatingTransactionManager implements TransactionManager {

private final TransactionManager delegate;
Expand Down
3 changes: 3 additions & 0 deletions ...in/java/io/helidon/integrations/jta/cdi/DelegatingTransactionSynchronizationRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
* other non-{@code public} internal classes.</p>
*
* @see TransactionSynchronizationRegistry
*
* @deprecated An equivalent class now exists in Narayana itself.
*/
@Deprecated(forRemoval = true)
public abstract class DelegatingTransactionSynchronizationRegistry implements TransactionSynchronizationRegistry {

private final TransactionSynchronizationRegistry delegate;
Expand Down
5 changes: 5 additions & 0 deletions ...cdi/jta-cdi/src/main/java/io/helidon/integrations/jta/cdi/NarayanaTransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import javax.enterprise.context.Destroyed;
import javax.enterprise.context.Initialized;
import javax.enterprise.event.Event;
import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;
import javax.transaction.HeuristicMixedException;
import javax.transaction.HeuristicRollbackException;
Expand All @@ -40,8 +41,12 @@
* implementation.
*
* @see com.arjuna.ats.jta.common.JTAEnvironmentBean#getTransactionManager()
*
* @deprecated An equivalent class now exists in Narayana itself.
*/
@ApplicationScoped
@Deprecated(forRemoval = true)
@Vetoed
class NarayanaTransactionManager extends DelegatingTransactionManager {


Expand Down
5 changes: 5 additions & 0 deletions ...main/java/io/helidon/integrations/jta/cdi/NarayanaTransactionSynchronizationRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package io.helidon.integrations.jta.cdi;

import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Vetoed;
import javax.inject.Inject;

import com.arjuna.ats.jta.common.JTAEnvironmentBean;
Expand All @@ -28,8 +29,12 @@
* as its backing implementation.
*
* @see JTAEnvironmentBean#getTransactionSynchronizationRegistry()
*
* @deprecated An equivalent class now exists in Narayana itself.
*/
@ApplicationScoped
@Deprecated(forRemoval = true)
@Vetoed
class NarayanaTransactionSynchronizationRegistry extends DelegatingTransactionSynchronizationRegistry {

/**
Expand Down