Fix composite packaging

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1466409 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/ipojo/runtime/composite-it/pom.xml b/ipojo/runtime/composite-it/pom.xml
index 7a56cf7..7cf9920 100644
--- a/ipojo/runtime/composite-it/pom.xml
+++ b/ipojo/runtime/composite-it/pom.xml
@@ -76,6 +76,9 @@
                     <excludes>
                         <exclude>src/main/appended-resources/**</exclude>
                         <exclude>**/*.iml</exclude> <!-- Exclude iml files -->
+                        <!-- Exclude target folders that may have been created during
+                         the integration-tests -->
+                        <exclude>src/it/**/target/**/*</exclude> 
                     </excludes>
                 </configuration>
             </plugin>
diff --git a/ipojo/runtime/composite/pom.xml b/ipojo/runtime/composite/pom.xml
index 95392d1..09f152c 100644
--- a/ipojo/runtime/composite/pom.xml
+++ b/ipojo/runtime/composite/pom.xml
@@ -80,9 +80,9 @@
                             org.apache.felix.ipojo.metadata,
                             org.apache.felix.ipojo.parser,
                             org.apache.felix.ipojo.util,
-                            org.apache.felix.ipojo.manipulation,
                             org.osgi.framework;version=1.3,
                             !org.objectweb.asm.tree,
+                            *
                         </Import-Package>
                         <Private-Package>
                             org.apache.felix.ipojo.composite.architecture,
@@ -92,7 +92,8 @@
                             <!-- ASM (Manipulator dependencies) -->
                             org.objectweb.asm.commons,
                             org.objectweb.asm.signature,
-                            org.objectweb.asm
+                            org.objectweb.asm,
+                            org.apache.felix.ipojo.manipulation*
                         </Private-Package>
                         <Export-Package>
                             org.apache.felix.ipojo.composite; version="${ipojo.package.version}"