felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clem...@apache.org
Subject svn commit: r1466409 - in /felix/trunk/ipojo/runtime: composite-it/pom.xml composite/pom.xml
Date Wed, 10 Apr 2013 09:52:20 GMT
Author: clement
Date: Wed Apr 10 09:52:20 2013
New Revision: 1466409

URL: http://svn.apache.org/r1466409
Log:
Fix composite packaging

Modified:
    felix/trunk/ipojo/runtime/composite-it/pom.xml
    felix/trunk/ipojo/runtime/composite/pom.xml

Modified: felix/trunk/ipojo/runtime/composite-it/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite-it/pom.xml?rev=1466409&r1=1466408&r2=1466409&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite-it/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite-it/pom.xml Wed Apr 10 09:52:20 2013
@@ -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>

Modified: felix/trunk/ipojo/runtime/composite/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/ipojo/runtime/composite/pom.xml?rev=1466409&r1=1466408&r2=1466409&view=diff
==============================================================================
--- felix/trunk/ipojo/runtime/composite/pom.xml (original)
+++ felix/trunk/ipojo/runtime/composite/pom.xml Wed Apr 10 09:52:20 2013
@@ -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}"



Mime
View raw message