ARTEMIS-4238 deprecate transactionTimeout activation config prop

apache · May 31, 2023 · 903e588 · 903e588
1 parent c5be8b7
commit 903e588
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
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
@@ -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 void setSingleConnection(final Boolean value) {
     *
     * @return The value
     */
+   @Deprecated(forRemoval = true)
    public Integer getTransactionTimeout() {
       logger.trace("getTransactionTimeout()");
 
@@ -631,6 +633,7 @@ public Integer getTransactionTimeout() {
     *
     * @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
@@ -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)