diff --git a/ipojo/runtime/composite/pom.xml b/ipojo/runtime/composite/pom.xml
index cbe8908..1958514 100644
--- a/ipojo/runtime/composite/pom.xml
+++ b/ipojo/runtime/composite/pom.xml
@@ -16,141 +16,158 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>felix-parent</artifactId>
+        <version>1.2.1</version>
+        <relativePath>../../../pom/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>bundle</packaging>
+    <name>Apache Felix iPOJO Composite</name>
+    <artifactId>org.apache.felix.ipojo.composite</artifactId>
     <groupId>org.apache.felix</groupId>
-    <artifactId>felix-parent</artifactId>
-    <version>1.2.1</version>
-    <relativePath>../../../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <name>Apache Felix iPOJO Composite</name>
-  <artifactId>org.apache.felix.ipojo.composite</artifactId>
-  <groupId>org.apache.felix</groupId>
-  <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
 
-  <properties>
-    <ipojo.package.version>1.8.2</ipojo.package.version>
-  </properties>
+    <properties>
+        <ipojo.package.version>1.8.2</ipojo.package.version>
+    </properties>
 
-  <description>
-  iPOJO Composition Model. This is an iPOJO extension to execute service composition.
-  </description>
-  <url>http://felix.apache.org/site/ipojo-composition-tutorial.html</url>
+    <description>
+        iPOJO Composition Model. This is an iPOJO extension to execute service composition.
+    </description>
+    <url>http://felix.apache.org/site/ipojo-composition-tutorial.html</url>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>4.0.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-      <version>1.8.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.ipojo</artifactId>
-      <version>1.9.0-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <version>1.4.3</version>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
-            <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-            <Bundle-Vendor> The Apache Software Foundation </Bundle-Vendor>
-            <Bundle-Description> iPOJO Composititon Framework
-            </Bundle-Description>
-            <Bundle-DocURL>
-             http://felix.apache.org/site/ipojo-composition-tutorial.html
-            </Bundle-DocURL>
-            <Import-Package>
-              org.apache.felix.ipojo,
-              org.apache.felix.ipojo.architecture,
-              org.apache.felix.ipojo.context,
-              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,
-              org.apache.felix.ipojo.composite.service*,
-              org.apache.felix.ipojo.composite.instance,
-              org.apache.felix.ipojo.composite.util,
-                <!-- ASM (Manipulator dependencies) -->
-              org.objectweb.asm.commons,
-              org.objectweb.asm.signature,
-              org.objectweb.asm
-            </Private-Package>
-            <Export-Package>
-              org.apache.felix.ipojo.composite; version="${ipojo.package.version}"
-            </Export-Package>
-            <Include-Resource>
-              META-INF/LICENSE=LICENSE,
-              META-INF/NOTICE=NOTICE,
-              META-INF/LICENSE.asm=LICENSE.asm,
-              META-INF/DEPENDENCIES=DEPENDENCIES
-            </Include-Resource>
-            <IPOJO-Extension>
-              composite:org.apache.felix.ipojo.composite.CompositeFactory
-            </IPOJO-Extension>
-            <_donotcopy> (CVS|.svn|.+.bak|~.+|metadata.xml) </_donotcopy>
-          </instructions>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-ipojo-plugin</artifactId>
-        <version>1.8.4</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>ipojo-bundle</goal>
-            </goals>
-            <configuration>
-              <metadata>src/main/resources/metadata.xml</metadata>
-              <ignoreAnnotations>true</ignoreAnnotations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <configuration>
-          <excludeSubProjects>false</excludeSubProjects>
-          <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
-          <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
-          <excludes>
-            <param>doc/**/*</param>
-            <param>maven-eclipse.xml</param>
-            <param>.checkstyle</param>
-            <param>.externalToolBuilders/*</param>
-            <param>LICENSE.asm</param>
-          </excludes>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <enableRulesSummary>false</enableRulesSummary>
-          <violationSeverity>warning</violationSeverity>
-          <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    <dependencies>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>4.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+            <!-- Same as the iPOJO core embedded manipulator -->
+            <version>1.8.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.ipojo</artifactId>
+            <version>1.9.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>.</directory>
+                <targetPath>META-INF</targetPath>
+                <includes>
+                    <include>LICENSE*</include>
+                    <include>NOTICE*</include>
+                    <include>DEPENDENCIES*</include>
+                </includes>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>1.4.3</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-Name>Apache Felix iPOJO Composite</Bundle-Name>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+                        <Bundle-Description>iPOJO Composititon Framework
+                        </Bundle-Description>
+                        <Bundle-DocURL>
+                            http://felix.apache.org/site/ipojo-composition-tutorial.html
+                        </Bundle-DocURL>
+                        <Import-Package>
+                            org.apache.felix.ipojo,
+                            org.apache.felix.ipojo.architecture,
+                            org.apache.felix.ipojo.context,
+                            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,
+                            org.apache.felix.ipojo.composite.service*,
+                            org.apache.felix.ipojo.composite.instance,
+                            org.apache.felix.ipojo.composite.util,
+                            <!-- ASM (Manipulator dependencies) -->
+                            org.objectweb.asm.commons,
+                            org.objectweb.asm.signature,
+                            org.objectweb.asm
+                        </Private-Package>
+                        <Export-Package>
+                            org.apache.felix.ipojo.composite; version="${ipojo.package.version}"
+                        </Export-Package>
+                        <Include-Resource>
+                            META-INF/LICENSE=LICENSE,
+                            META-INF/NOTICE=NOTICE,
+                            META-INF/LICENSE.asm=LICENSE.asm,
+                            META-INF/DEPENDENCIES=DEPENDENCIES
+                        </Include-Resource>
+                        <IPOJO-Extension>
+                            composite:org.apache.felix.ipojo.composite.CompositeFactory
+                        </IPOJO-Extension>
+                        <_donotcopy>(CVS|.svn|.+.bak|~.+|metadata.xml)</_donotcopy>
+                    </instructions>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-ipojo-plugin</artifactId>
+                <version>1.8.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>ipojo-bundle</goal>
+                        </goals>
+                        <configuration>
+                            <metadata>src/main/resources/metadata.xml</metadata>
+                            <ignoreAnnotations>true</ignoreAnnotations>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>rat-maven-plugin</artifactId>
+                <configuration>
+                    <excludeSubProjects>false</excludeSubProjects>
+                    <useEclipseDefaultExcludes>true</useEclipseDefaultExcludes>
+                    <useMavenDefaultExcludes>true</useMavenDefaultExcludes>
+                    <excludes>
+                        <param>doc/**/*</param>
+                        <param>maven-eclipse.xml</param>
+                        <param>.checkstyle</param>
+                        <param>.externalToolBuilders/*</param>
+                        <param>LICENSE.asm</param>
+                    </excludes>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+                <configuration>
+                    <enableRulesSummary>false</enableRulesSummary>
+                    <violationSeverity>warning</violationSeverity>
+                    <configLocation>http://felix.apache.org/ipojo/dev/checkstyle_ipojo.xml</configLocation>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>