Merge pull request #8644 from dmlloyd/wfly-6117

[WFLY-6117] Exclude the .xa subpackage from the transaction API

pom.xml

@@ -214,7 +214,7 @@
         <version.org.scannotation>1.0.3</version.org.scannotation>
         <version.org.slf4j>1.7.7.jbossorg-1</version.org.slf4j>
         <version.org.syslog4j>0.9.30</version.org.syslog4j>
-        <version.org.wildfly.build-tools>1.1.0.Final</version.org.wildfly.build-tools>
+        <version.org.wildfly.build-tools>1.1.3.Final</version.org.wildfly.build-tools>
         <version.org.wildfly.checkstyle-config>1.0.4.Final</version.org.wildfly.checkstyle-config>
         <version.org.wildfly.core>2.1.0.CR2</version.org.wildfly.core>
         <version.org.wildfly.arquillian>1.0.2.Final</version.org.wildfly.arquillian>

servlet-feature-pack/src/main/resources/modules/system/layers/base/javax/transaction/api/main/module.xml

@@ -22,13 +22,21 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.3" name="javax.transaction.api">
+<module xmlns="urn:jboss:module:1.5" name="javax.transaction.api">
     <resources>
-        <artifact name="${org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec}"/>
+        <artifact name="${org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec}">
+            <filter>
+                <exclude path="javax/transaction/xa"/>
+            </filter>
+        </artifact>
     </resources>
     <dependencies>
-        <module name="javax.api"/>
+        <system export="true">
+            <paths>
+                <path name="javax/transaction/xa"/>
+            </paths>
+        </system>
         <module name="javax.enterprise.api"/>
         <module name="javax.interceptor.api"/>
-    </dependencies>    
+    </dependencies>
 </module>