Fixed assembly excludes for modular build

forge · Aug 1, 2011 · 87d0a6f · 87d0a6f
1 parent 0c504c5
commit 87d0a6f
Showing 1 changed file with 23 additions and 23 deletions.
diff --git a/modules-build/src/main/assembly/assembly.xml b/modules-build/src/main/assembly/assembly.xml
@@ -57,30 +57,10 @@
       <dependencySet>
          <outputDirectory>modules/org/jboss/forge/main</outputDirectory>
          <useProjectArtifact>false</useProjectArtifact>
+         <useTransitiveDependencies>true</useTransitiveDependencies>
          <includes>
             <include>org.jboss.forge:*</include>
          </includes>
-         <excludes>
-
-            <!-- Maven -->
-            <exclude>org.jboss.forge:forge-maven-api*</exclude>
-            <exclude>org.apache.maven:*</exclude>
-            <exclude>org.apache.maven.wagon:*</exclude>
-            <exclude>org.codehaus.plexus:*</exclude>
-            <exclude>org.sonatype.plexus:*</exclude>
-            <exclude>org.sonatype.aether:*</exclude>
-            <exclude>org.sonatype.sisu:*</exclude>
-            <exclude>commons-cli:commons-cli:*</exclude>
-
-            <exclude>org.jboss.forge:forge-javaee-api*</exclude>
-            <exclude>org.jboss.forge:forge-scaffold-api*</exclude>
-
-            <!-- Forge -->
-            <exclude>org.jboss.forge:forge-event-bus*</exclude>
-            <exclude>org.jboss.forge:forge-shell-api*</exclude>
-            <exclude>javax.enterprise.cdi-api*</exclude>
-            <exclude>javax.inject:javax.inject*</exclude>
-         </excludes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>
 
@@ -132,8 +112,28 @@
          <useProjectArtifact>false</useProjectArtifact>
          <useTransitiveDependencies>true</useTransitiveDependencies>
          <excludes>
-            <exclude>org.jboss.forge.*:*:*:javadoc</exclude>
-            <exclude>org.jboss.forge.*:*:*:sources</exclude>
+
+            <!-- Maven -->
+            <exclude>org.jboss.forge:forge-maven-api*</exclude>
+            <exclude>org.apache.maven:*</exclude>
+            <exclude>org.apache.maven.wagon:*</exclude>
+            <exclude>org.codehaus.plexus:*</exclude>
+            <exclude>org.sonatype.plexus:*</exclude>
+            <exclude>org.sonatype.aether:*</exclude>
+            <exclude>org.sonatype.sisu:*</exclude>
+
+            <!-- 
+            <exclude>commons-cli:commons-cli:*</exclude>
+             -->
+
+            <exclude>org.jboss.forge:forge-javaee-api*</exclude>
+            <exclude>org.jboss.forge:forge-scaffold-api*</exclude>
+
+            <!-- Forge -->
+            <exclude>org.jboss.forge:forge-event-bus*</exclude>
+            <exclude>org.jboss.forge:forge-shell-api*</exclude>
+            <exclude>javax.enterprise.cdi-api*</exclude>
+            <exclude>javax.inject:javax.inject*</exclude>
          </excludes>
          <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       </dependencySet>