[resolves #815] Add missing javax.activation.api dependency to adbera…

… modules
wildfly-extras · Aug 13, 2015 · 8a513e9 · 8a513e9
1 parent 3019755
commit 8a513e9
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 27 deletions.
diff --git a/...pack/src/main/resources/modules/system/layers/fuse/org/apache/abdera/core/main/module.xml b/...pack/src/main/resources/modules/system/layers/fuse/org/apache/abdera/core/main/module.xml
@@ -5,8 +5,8 @@
   </resources>
   <dependencies>
     <module name="javax.api" />
-    <module name="org.apache.commons.logging" />
+    <module name="javax.activation.api" />
     <module name="org.apache.abdera.i18n" />
-    <module name="org.apache.abdera.parser" />
+    <module name="org.apache.commons.logging" />
   </dependencies>
 </module>
diff --git a/...pack/src/main/resources/modules/system/layers/fuse/org/apache/abdera/i18n/main/module.xml b/...pack/src/main/resources/modules/system/layers/fuse/org/apache/abdera/i18n/main/module.xml
@@ -5,6 +5,7 @@
   </resources>
   <dependencies>
     <module name="org.apache.abdera.core" />
-    <module name="org.apache.commons.logging" />
+    <module name="javax.activation.api" />
+    <module name="org.apache.commons.codec" />
   </dependencies>
 </module>
diff --git a/...ck/src/main/resources/modules/system/layers/fuse/org/apache/abdera/parser/main/module.xml b/...ck/src/main/resources/modules/system/layers/fuse/org/apache/abdera/parser/main/module.xml
@@ -6,10 +6,12 @@
   <dependencies>
     <module name="javax.api" />
     <module name="javax.activation.api" />
-    <module name="org.apache.commons.logging" />
     <module name="org.apache.abdera.i18n" />
+    <module name="javax.xml.stream.api" />
     <module name="org.apache.abdera.core" />
+    <module name="org.apache.commons.logging" />
     <module name="org.apache.ws.commons.axiom.axiom-api" />
     <module name="org.apache.ws.commons.axiom.axiom-impl" />
+    <module name="org.jaxen" />
   </dependencies>
 </module>
diff --git a/...main/resources/modules/system/layers/fuse/org/apache/camel/component/atom/main/module.xml b/...main/resources/modules/system/layers/fuse/org/apache/camel/component/atom/main/module.xml
@@ -7,7 +7,7 @@
     <module name="org.slf4j" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.abdera.core" export="true" />
-    <module name="org.apache.abdera.parser" />
+    <module name="org.apache.abdera.parser" export="true" />
     <module name="org.apache.camel.core" />
     <module name="org.apache.commons.codec" />
     <module name="org.apache.ws.commons.axiom.axiom-api" />

diff --git a/modules/etc/baseline/exported-paths.txt b/modules/etc/baseline/exported-paths.txt
@@ -296,6 +296,8 @@ org/apache/abdera/factory
 org/apache/abdera/filter
 org/apache/abdera/model
 org/apache/abdera/parser
+org/apache/abdera/parser/stax
+org/apache/abdera/parser/stax/util
 org/apache/abdera/protocol
 org/apache/abdera/protocol/error
 org/apache/abdera/protocol/util

diff --git a/...s/etc/generated/wildfly/modules/system/layers/fuse/org/apache/abdera/core/main/module.xml b/...s/etc/generated/wildfly/modules/system/layers/fuse/org/apache/abdera/core/main/module.xml
@@ -5,8 +5,8 @@
   </resources>
   <dependencies>
     <module name="javax.api" />
-    <module name="org.apache.commons.logging" />
+    <module name="javax.activation.api" />
     <module name="org.apache.abdera.i18n" />
-    <module name="org.apache.abdera.parser" />
+    <module name="org.apache.commons.logging" />
   </dependencies>
 </module>
diff --git a/...s/etc/generated/wildfly/modules/system/layers/fuse/org/apache/abdera/i18n/main/module.xml b/...s/etc/generated/wildfly/modules/system/layers/fuse/org/apache/abdera/i18n/main/module.xml
@@ -5,6 +5,7 @@
   </resources>
   <dependencies>
     <module name="org.apache.abdera.core" />
-    <module name="org.apache.commons.logging" />
+    <module name="javax.activation.api" />
+    <module name="org.apache.commons.codec" />
   </dependencies>
 </module>
diff --git a/...etc/generated/wildfly/modules/system/layers/fuse/org/apache/abdera/parser/main/module.xml b/...etc/generated/wildfly/modules/system/layers/fuse/org/apache/abdera/parser/main/module.xml
@@ -6,10 +6,12 @@
   <dependencies>
     <module name="javax.api" />
     <module name="javax.activation.api" />
-    <module name="org.apache.commons.logging" />
     <module name="org.apache.abdera.i18n" />
+    <module name="javax.xml.stream.api" />
     <module name="org.apache.abdera.core" />
+    <module name="org.apache.commons.logging" />
     <module name="org.apache.ws.commons.axiom.axiom-api" />
     <module name="org.apache.ws.commons.axiom.axiom-impl" />
+    <module name="org.jaxen" />
   </dependencies>
 </module>
diff --git a/...erated/wildfly/modules/system/layers/fuse/org/apache/camel/component/atom/main/module.xml b/...erated/wildfly/modules/system/layers/fuse/org/apache/camel/component/atom/main/module.xml
@@ -7,7 +7,7 @@
     <module name="org.slf4j" />
     <module name="javax.xml.bind.api" />
     <module name="org.apache.abdera.core" export="true" />
-    <module name="org.apache.abdera.parser" />
+    <module name="org.apache.abdera.parser" export="true" />
     <module name="org.apache.camel.core" />
     <module name="org.apache.commons.codec" />
     <module name="org.apache.ws.commons.axiom.axiom-api" />

diff --git a/modules/etc/smartics/camel-modules.xml b/modules/etc/smartics/camel-modules.xml
@@ -96,6 +96,7 @@
         <include artifact="org.apache.camel:camel-atom" />
         <apply-to-dependencies export="true">
             <include module="org.apache.abdera.core" />
+            <include module="org.apache.abdera.parser" />
         </apply-to-dependencies>
         <apply-to-dependencies skip="true">
             <include module="org.apache.camel.apt" />

diff --git a/modules/etc/smartics/other-modules.xml b/modules/etc/smartics/other-modules.xml
@@ -86,41 +86,24 @@
 
     <module name="org.apache.abdera.core">
         <include artifact="org.apache.abdera:abdera-core" />
-        <apply-to-dependencies skip="true">
-            <include module=".*" />
-        </apply-to-dependencies>
         <dependencies>
             <module name="javax.api"/>
-            <module name="org.apache.commons.logging"/>
-            <module name="org.apache.abdera.i18n"/>
-            <module name="org.apache.abdera.parser"/>
         </dependencies>
     </module>
 
     <module name="org.apache.abdera.i18n">
         <include artifact="org.apache.abdera:abdera-i18n" />
-        <apply-to-dependencies skip="true">
-            <include module=".*" />
-        </apply-to-dependencies>
         <dependencies>
             <module name="org.apache.abdera.core"/>
-            <module name="org.apache.commons.logging"/>
         </dependencies>
     </module>
 
     <module name="org.apache.abdera.parser">
         <include artifact="org.apache.abdera:abdera-parser" />
-        <apply-to-dependencies skip="true">
-            <include module=".*" />
-        </apply-to-dependencies>
         <dependencies>
             <module name="javax.api"/>
             <module name="javax.activation.api"/>
-            <module name="org.apache.commons.logging"/>
             <module name="org.apache.abdera.i18n"/>
-            <module name="org.apache.abdera.core"/>
-            <module name="org.apache.ws.commons.axiom.axiom-api"/>
-            <module name="org.apache.ws.commons.axiom.axiom-impl"/>
         </dependencies>
     </module>