[activemq-artemis] branch main updated: ARTEMIS-4238 deprecate transactionTimeout activation config prop

[jbertram]

This is an automated email from the ASF dual-hosted git repository.

jbertram pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git


The following commit(s) were added to refs/heads/main by this push:
     new 903e5888af ARTEMIS-4238 deprecate transactionTimeout activation config 
prop
903e5888af is described below

commit 903e5888af404269da34c79b10829f820b26ba5c
Author: Justin Bertram <jbert...@apache.org>
AuthorDate: Thu Apr 13 10:38:40 2023 -0500

    ARTEMIS-4238 deprecate transactionTimeout activation config prop
---
 .../org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java | 3 +++
 docs/user-manual/en/versions.md                                       | 4 ++++
 2 files changed, 7 insertions(+)

diff --git 
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
 
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
index faf0ab7311..390774abc0 100644
--- 
a/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
+++ 
b/artemis-ra/src/main/java/org/apache/activemq/artemis/ra/inflow/ActiveMQActivationSpec.java
@@ -120,6 +120,7 @@ public class ActiveMQActivationSpec extends 
ConnectionFactoryProperties implemen
    /**
     * Transaction timeout
     */
+   @Deprecated(forRemoval = true)
    private Integer transactionTimeout;
 
    private Boolean useJNDI = true;
@@ -620,6 +621,7 @@ public class ActiveMQActivationSpec extends 
ConnectionFactoryProperties implemen
     *
     * @return The value
     */
+   @Deprecated(forRemoval = true)
    public Integer getTransactionTimeout() {
       logger.trace("getTransactionTimeout()");
 
@@ -631,6 +633,7 @@ public class ActiveMQActivationSpec extends 
ConnectionFactoryProperties implemen
     *
     * @param value The value
     */
+   @Deprecated(forRemoval = true)
    public void setTransactionTimeout(final Integer value) {
       logger.trace("setTransactionTimeout({})", value);
 
diff --git a/docs/user-manual/en/versions.md b/docs/user-manual/en/versions.md
index 2a6668b3c0..68f8ff4bb1 100644
--- a/docs/user-manual/en/versions.md
+++ b/docs/user-manual/en/versions.md
@@ -58,6 +58,10 @@ Highlights:
         at org.apache.activemq.artemis.boot.Artemis.execute(Artemis.java:144)
         at org.apache.activemq.artemis.boot.Artemis.main(Artemis.java:61)
   ```
+* Due to [ARTEMIS-3707](https://issues.apache.org/jira/browse/ARTEMIS-3707) 
all use of `javax.transaction.TransactionManager`
+  was removed from the JCA Resource Adapter. However, this rendered the 
`transactionTimeout` activation configuration
+  property useless. Some existing users rely on this behavior so it has been 
restored and properly deprecated for future
+  removal.
 
 ## 2.28.0
 [Full release 
notes](https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12352523&projectId=12315920)