I think simply reverting HHH-10178 is going to be the best option here.

I had looked into possibly using javax.transaction:jta instead of org.apache.geronimo.specs:geronimo-jta_1.1_spec. Both are licensed under CDDL so licensing would not be a concern. However, javax.transaction:jta does not define any OSGi metadata where as org.apache.geronimo.specs:geronimo-jta_1.1_spec does. Thus moving to javax.transaction:jta would require a "wrap" instruction in our OSGi support; wrap instructions should be avoided.