diff --git a/build.xml b/build.xml
index 064be75..caed2fc 100644
--- a/build.xml
+++ b/build.xml
@@ -16,7 +16,7 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<project default="all">
+<project default="all" basedir="pom">
     <target name="init">
         <condition property="mvn" value="mvn.bat">
             <os family="dos" />
diff --git a/bundleplugin/doc/changelog.txt b/bundleplugin/doc/changelog.txt
index 3e3edfd..c6ec157 100644
--- a/bundleplugin/doc/changelog.txt
+++ b/bundleplugin/doc/changelog.txt
@@ -22,3 +22,5 @@
 * [2007-06-14] Enable output folder to be configured. (FELIX-305)
 * [2007-07-05] Added support for overriding project type. (FELIX-309)
 * [2007-07-09] Updated to BND version 0.0.160.
+* [2007-07-11] Fix a possible NullPointerException in the manifest goal. (FELIX-326)
+
diff --git a/bundleplugin/doc/maven-bundle-plugin-bnd_files/print.html b/bundleplugin/doc/maven-bundle-plugin-bnd_files/print.html
deleted file mode 100644
index 32c3b5f..0000000
--- a/bundleplugin/doc/maven-bundle-plugin-bnd_files/print.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /FELIX/media.data/print.css was not found on this server.</p>
-<hr>
-<address>Apache/2.2.3 (Unix) mod_ssl/2.2.3 OpenSSL/0.9.7g Server at cwiki.apache.org Port 80</address>
-</body></html>
diff --git a/bundleplugin/pom.xml b/bundleplugin/pom.xml
index a02eeef..8ed74a0 100644
--- a/bundleplugin/pom.xml
+++ b/bundleplugin/pom.xml
@@ -24,6 +24,7 @@
    <artifactId>felix</artifactId>
    <groupId>org.apache.felix</groupId>
    <version>0.9.0-incubator-SNAPSHOT</version>
+   <relativePath>../pom/pom.xml</relativePath>
  </parent>
 
  <modelVersion>4.0.0</modelVersion>
diff --git a/bundlerepository/doc/apache-felix-osgi-bundle-repository-obr_files/print.css b/bundlerepository/doc/apache-felix-osgi-bundle-repository-obr_files/print.css
deleted file mode 100644
index 32c3b5f..0000000
--- a/bundlerepository/doc/apache-felix-osgi-bundle-repository-obr_files/print.css
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /FELIX/media.data/print.css was not found on this server.</p>
-<hr>
-<address>Apache/2.2.3 (Unix) mod_ssl/2.2.3 OpenSSL/0.9.7g Server at cwiki.apache.org Port 80</address>
-</body></html>
diff --git a/bundlerepository/pom.xml b/bundlerepository/pom.xml
index 0fa52b7..973e3f0 100644
--- a/bundlerepository/pom.xml
+++ b/bundlerepository/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/commons/pom.xml b/commons/pom.xml
index 0a94179..b9fc0c5 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -25,6 +25,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>felix</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
     <packaging>pom</packaging>
     <name>Apache Felix Commons: Build</name>
diff --git a/configadmin/pom.xml b/configadmin/pom.xml
index 6d15bce..f5312c7 100644
--- a/configadmin/pom.xml
+++ b/configadmin/pom.xml
@@ -23,6 +23,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>felix</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.felix.configadmin</artifactId>
diff --git a/dependencymanager/pom.xml b/dependencymanager/pom.xml
index 8037342..0766f3a 100644
--- a/dependencymanager/pom.xml
+++ b/dependencymanager/pom.xml
@@ -22,6 +22,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/eventadmin/bridge.configuration/pom.xml b/eventadmin/bridge.configuration/pom.xml
index 158f4ee..9b3d421 100644
--- a/eventadmin/bridge.configuration/pom.xml
+++ b/eventadmin/bridge.configuration/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/eventadmin/bridge.upnp/pom.xml b/eventadmin/bridge.upnp/pom.xml
index 11868ae..a213f91 100644
--- a/eventadmin/bridge.upnp/pom.xml
+++ b/eventadmin/bridge.upnp/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/eventadmin/bridge.useradmin/pom.xml b/eventadmin/bridge.useradmin/pom.xml
index 7133626..78bc9ee 100644
--- a/eventadmin/bridge.useradmin/pom.xml
+++ b/eventadmin/bridge.useradmin/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/eventadmin/bridge.wireadmin/pom.xml b/eventadmin/bridge.wireadmin/pom.xml
index d421713..be80355 100644
--- a/eventadmin/bridge.wireadmin/pom.xml
+++ b/eventadmin/bridge.wireadmin/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/eventadmin/impl/pom.xml b/eventadmin/impl/pom.xml
index 3271e56..389a5f1 100644
--- a/eventadmin/impl/pom.xml
+++ b/eventadmin/impl/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/eventadmin/pom.xml b/eventadmin/pom.xml
index d9b2a02..196c9d1 100644
--- a/eventadmin/pom.xml
+++ b/eventadmin/pom.xml
@@ -27,6 +27,7 @@
 <groupId>org.apache.felix</groupId>
 <artifactId>felix</artifactId>
 <version>0.9.0-incubator-SNAPSHOT</version>
+<relativePath>../pom/pom.xml</relativePath>
 </parent>
 
 <name>Apache Felix EventAdmin Projects</name>
diff --git a/examples/dictionaryclient/pom.xml b/examples/dictionaryclient/pom.xml
index 8667cd4..15f455f 100644
--- a/examples/dictionaryclient/pom.xml
+++ b/examples/dictionaryclient/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/dictionaryclient2/pom.xml b/examples/dictionaryclient2/pom.xml
index 4a45b16..7301166 100644
--- a/examples/dictionaryclient2/pom.xml
+++ b/examples/dictionaryclient2/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/dictionaryservice.itest/pom.xml b/examples/dictionaryservice.itest/pom.xml
index 07bef3a..a08bf07 100644
--- a/examples/dictionaryservice.itest/pom.xml
+++ b/examples/dictionaryservice.itest/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/dictionaryservice/pom.xml b/examples/dictionaryservice/pom.xml
index bd10faf..afdf745 100644
--- a/examples/dictionaryservice/pom.xml
+++ b/examples/dictionaryservice/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/eventlistener/pom.xml b/examples/eventlistener/pom.xml
index c58b4c3..21ed17c 100644
--- a/examples/eventlistener/pom.xml
+++ b/examples/eventlistener/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/frenchdictionary/pom.xml b/examples/frenchdictionary/pom.xml
index 744185d..5c044c1 100644
--- a/examples/frenchdictionary/pom.xml
+++ b/examples/frenchdictionary/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/pom.xml b/examples/pom.xml
index a9e1684..06ba77c 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>pom</packaging>
diff --git a/examples/spellcheckbinder/pom.xml b/examples/spellcheckbinder/pom.xml
index c84224d..25202b8 100644
--- a/examples/spellcheckbinder/pom.xml
+++ b/examples/spellcheckbinder/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/spellcheckclient/pom.xml b/examples/spellcheckclient/pom.xml
index 31961ba..a3ae307 100644
--- a/examples/spellcheckclient/pom.xml
+++ b/examples/spellcheckclient/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/examples/spellcheckscr/pom.xml b/examples/spellcheckscr/pom.xml
index b2f46cf..61b827b 100644
--- a/examples/spellcheckscr/pom.xml
+++ b/examples/spellcheckscr/pom.xml
@@ -25,6 +25,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/examples/spellcheckservice/pom.xml b/examples/spellcheckservice/pom.xml
index 03d432e..033adf0 100644
--- a/examples/spellcheckservice/pom.xml
+++ b/examples/spellcheckservice/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>osgi-bundle</packaging>
diff --git a/framework/pom.xml b/framework/pom.xml
index 53e1d7d..2022633 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/http.jetty/pom.xml b/http.jetty/pom.xml
index e720c3f..20ba3ae 100644
--- a/http.jetty/pom.xml
+++ b/http.jetty/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/installers/pom.xml b/installers/pom.xml
index 9c9d711..8b6e628 100644
--- a/installers/pom.xml
+++ b/installers/pom.xml
@@ -5,6 +5,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <packaging>jar</packaging>
   <name>Apache Felix Installers</name>
diff --git a/ipojo/arch/pom.xml b/ipojo/arch/pom.xml
index a32aa47..4404f9f 100644
--- a/ipojo/arch/pom.xml
+++ b/ipojo/arch/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/ipojo/core/pom.xml b/ipojo/core/pom.xml
index 42707fb..ad47b1c 100644
--- a/ipojo/core/pom.xml
+++ b/ipojo/core/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/ipojo/manipulator/pom.xml b/ipojo/manipulator/pom.xml
index 7aa38bf..e2accd3 100644
--- a/ipojo/manipulator/pom.xml
+++ b/ipojo/manipulator/pom.xml
@@ -1,60 +1,61 @@
-<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/xsd/maven-4.0.0.xsd">
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>bundle</packaging>
-  <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
-  <version>0.7.3-incubator-SNAPSHOT</version>
-  <name>Apache Felix iPOJO Manipulator</name>
-  <dependencies>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-commons</artifactId>
-      <version>3.0</version>
-    </dependency>
-    <!-- to remove -->
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm-tree</artifactId>
-      <version>3.0</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
-      <version>0.7.3-incubator-SNAPSHOT</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>          
-            <Bundle-Name>iPOJO Manipulator</Bundle-Name>
-            <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
-            <Bundle-Description> iPOJO Manipulator </Bundle-Description>
-            <Private-Package>
-            	org.apache.felix.ipojo.manipulation,
-            	org.apache.felix.ipojo.manipulator,
-            	org.apache.felix.ipojo.xml.parser,
-              	org.objectweb.asm,
-              	org.objectweb.asm.commons,
-              	org.objectweb.asm.tree <!-- to remove -->
-            </Private-Package>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
\ No newline at end of file
+<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/xsd/maven-4.0.0.xsd">
+  <parent>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>felix</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>bundle</packaging>
+  <artifactId>org.apache.felix.ipojo.manipulator</artifactId>
+  <version>0.7.3-incubator-SNAPSHOT</version>
+  <name>Apache Felix iPOJO Manipulator</name>
+  <dependencies>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-commons</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <!-- to remove -->
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm-tree</artifactId>
+      <version>3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.apache.felix.ipojo.metadata</artifactId>
+      <version>0.7.3-incubator-SNAPSHOT</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>          
+            <Bundle-Name>iPOJO Manipulator</Bundle-Name>
+            <Bundle-Vendor>Clement ESCOFFIER</Bundle-Vendor>
+            <Bundle-Description> iPOJO Manipulator </Bundle-Description>
+            <Private-Package>
+            	org.apache.felix.ipojo.manipulation,
+            	org.apache.felix.ipojo.manipulator,
+            	org.apache.felix.ipojo.xml.parser,
+              	org.objectweb.asm,
+              	org.objectweb.asm.commons,
+              	org.objectweb.asm.tree <!-- to remove -->
+            </Private-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/ipojo/metadata/pom.xml b/ipojo/metadata/pom.xml
index 12777f3..5c84d59 100644
--- a/ipojo/metadata/pom.xml
+++ b/ipojo/metadata/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.felix.ipojo.metadata</artifactId>
diff --git a/ipojo/plugin/pom.xml b/ipojo/plugin/pom.xml
index 116d580..f4a639e 100644
--- a/ipojo/plugin/pom.xml
+++ b/ipojo/plugin/pom.xml
@@ -3,6 +3,7 @@
     <artifactId>felix</artifactId>
     <groupId>org.apache.felix</groupId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>org.apache.felix.ipojo.plugin</artifactId>
diff --git a/javax.servlet/pom.xml b/javax.servlet/pom.xml
index 4fce36f..5b14086 100644
--- a/javax.servlet/pom.xml
+++ b/javax.servlet/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <name>Servlet 2.1 API</name>
diff --git a/jmood/pom.xml b/jmood/pom.xml
index 20f47dd..0a2d747 100644
--- a/jmood/pom.xml
+++ b/jmood/pom.xml
@@ -1,90 +1,91 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <name>JMood JMX Management Agent</name>
-  <artifactId>${groupId}.jmood</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest >
-            <bundleName>${name}</bundleName>
-            <bundleActivator>${artifactId}.Activator</bundleActivator>
-            <bundleDescription>JMood management agent</bundleDescription>
-            <bundleSymbolicName>${artifactId}</bundleSymbolicName>
-            <exportPackage>
-            <!-- TODO -->
-            </exportPackage>
-            <!--Automatic resolution includes not available, unused, mx4j stuff-->
- 			<importPackage>
-			org.osgi.framework, org.osgi.util.tracker, org.osgi.service.log, org.osgi.service.packageadmin, org.osgi.service.startlevel, org.osgi.service.permissionadmin, org.osgi.service.useradmin, org.osgi.service.cm, javax.management, javax.management.remote
-			</importPackage>
-          </osgiManifest>
-        </configuration>
-      </plugin>
-     <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-plugin</artifactId>
-      <configuration>
-      <!--
-      Current tests are (unfinished) integration tests, and need 
-      to have the bundle available, so there's a chicken-egg problem there. Temporal workaround: omit tests in pom
-      -->
-      
-        <skip>true</skip>
-      </configuration>
-    </plugin>
-      
-    </plugins>
-  </build>
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <name>JMood JMX Management Agent</name>
+  <artifactId>${groupId}.jmood</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <version>${pom.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest >
+            <bundleName>${name}</bundleName>
+            <bundleActivator>${artifactId}.Activator</bundleActivator>
+            <bundleDescription>JMood management agent</bundleDescription>
+            <bundleSymbolicName>${artifactId}</bundleSymbolicName>
+            <exportPackage>
+            <!-- TODO -->
+            </exportPackage>
+            <!--Automatic resolution includes not available, unused, mx4j stuff-->
+ 			<importPackage>
+			org.osgi.framework, org.osgi.util.tracker, org.osgi.service.log, org.osgi.service.packageadmin, org.osgi.service.startlevel, org.osgi.service.permissionadmin, org.osgi.service.useradmin, org.osgi.service.cm, javax.management, javax.management.remote
+			</importPackage>
+          </osgiManifest>
+        </configuration>
+      </plugin>
+     <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-surefire-plugin</artifactId>
+      <configuration>
+      <!--
+      Current tests are (unfinished) integration tests, and need 
+      to have the bundle available, so there's a chicken-egg problem there. Temporal workaround: omit tests in pom
+      -->
+      
+        <skip>true</skip>
+      </configuration>
+    </plugin>
+      
+    </plugins>
+  </build>
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-project-info-reports-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+</project>
diff --git a/jmxintrospector/pom.xml b/jmxintrospector/pom.xml
index 899ae7b..9881b97 100644
--- a/jmxintrospector/pom.xml
+++ b/jmxintrospector/pom.xml
@@ -1,62 +1,63 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <name>JMXIntrospector</name>
-  <packaging>osgi-bundle</packaging>
-  <artifactId>${groupId}.jmxintrospector</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>cglib</groupId>
-      <artifactId>cglib</artifactId>
-      <version>2.1_3</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-            <inlinedArtifacts>
-        	    <inlinedArtifact>cglib</inlinedArtifact>
-          	</inlinedArtifacts>
-          <osgiManifest>
-            <bundleName>${name}</bundleName>
-            <bundleSymbolicName>${artifactId}</bundleSymbolicName>
-            <exportPackage>
-            org.apache.felix.jmxintrospector
-            </exportPackage>
-          </osgiManifest>
-        </configuration>
-      </plugin>
-        <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>5</source><!--should fail if not java6-->
-                    <target>5</target>
-                </configuration>
-             </plugin>      
-    <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-surefire-plugin</artifactId>
-      <configuration>
-        <skip>true</skip>
-      </configuration>
-    </plugin>
-    </plugins>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <name>JMXIntrospector</name>
+  <packaging>osgi-bundle</packaging>
+  <artifactId>${groupId}.jmxintrospector</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>cglib</groupId>
+      <artifactId>cglib</artifactId>
+      <version>2.1_3</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <version>${pom.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+            <inlinedArtifacts>
+        	    <inlinedArtifact>cglib</inlinedArtifact>
+          	</inlinedArtifacts>
+          <osgiManifest>
+            <bundleName>${name}</bundleName>
+            <bundleSymbolicName>${artifactId}</bundleSymbolicName>
+            <exportPackage>
+            org.apache.felix.jmxintrospector
+            </exportPackage>
+          </osgiManifest>
+        </configuration>
+      </plugin>
+        <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>5</source><!--should fail if not java6-->
+                    <target>5</target>
+                </configuration>
+             </plugin>      
+    <plugin>
+      <groupId>org.apache.maven.plugins</groupId>
+      <artifactId>maven-surefire-plugin</artifactId>
+      <configuration>
+        <skip>true</skip>
+      </configuration>
+    </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/log/pom.xml b/log/pom.xml
index 0785d50..ee4d13b 100644
--- a/log/pom.xml
+++ b/log/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/main/pom.xml b/main/pom.xml
index ba02bd5..e60575f 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/metatype/pom.xml b/metatype/pom.xml
index c0e2eb1..f92340e 100644
--- a/metatype/pom.xml
+++ b/metatype/pom.xml
@@ -5,6 +5,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>felix</artifactId>
         <version>0.9.0-incubator-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.felix.metatype</artifactId>
diff --git a/mishell/pom.xml b/mishell/pom.xml
index 9ff3343..00fd67d 100644
--- a/mishell/pom.xml
+++ b/mishell/pom.xml
@@ -1,93 +1,94 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <name>Management Interactive Shell</name>
-   <packaging>osgi-bundle</packaging>
-  <artifactId>${groupId}.mishell</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-     <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>${groupId}.jmxintrospector</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-        <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-        <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    
-        <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    
-  </dependencies>
-  <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <version>${pom.version}</version>
-        <extensions>true</extensions>
-        <configuration>
-		    <!--
-		    We're inlining a lot here. This is nasty for a bundle, nice for an executable jar.
-		    It should be simple to change afterwards
-		    -->
-    	    <inlinedArtifacts>
-        	    <inlinedArtifact>org.apache.felix.jmxintrospector</inlinedArtifact>
-          	</inlinedArtifacts>
-          <osgiManifest>
-            <bundleActivator>${artifactId}.Activator</bundleActivator>
-            <bundleName>${name}</bundleName>
-            <bundleDescription>Management Interactive Shell</bundleDescription>
-            <bundleSymbolicName>${artifactId}</bundleSymbolicName>
-            <dynamicImportPackage>
-            *
-            </dynamicImportPackage>
-            <importPackage>
-            <!--Note that we explicitly do not import jmood classes as they we use 
-            dynamically generated interfaces and proxies instead-->
-			org.osgi.framework, javax.management, javax.management.remote, javax.script
-			</importPackage>
-            
-          </osgiManifest>
-        </configuration>
-      </plugin>
-              <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.6</source><!--should fail if not java6-->
-                    <target>1.6</target>
-                </configuration>
-             </plugin>      
-    </plugins>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <name>Management Interactive Shell</name>
+   <packaging>osgi-bundle</packaging>
+  <artifactId>${groupId}.mishell</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+     <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>${groupId}.jmxintrospector</artifactId>
+      <version>${pom.version}</version>
+    </dependency>
+        <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+        <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    
+        <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+      <version>${pom.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    
+  </dependencies>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <version>${pom.version}</version>
+        <extensions>true</extensions>
+        <configuration>
+		    <!--
+		    We're inlining a lot here. This is nasty for a bundle, nice for an executable jar.
+		    It should be simple to change afterwards
+		    -->
+    	    <inlinedArtifacts>
+        	    <inlinedArtifact>org.apache.felix.jmxintrospector</inlinedArtifact>
+          	</inlinedArtifacts>
+          <osgiManifest>
+            <bundleActivator>${artifactId}.Activator</bundleActivator>
+            <bundleName>${name}</bundleName>
+            <bundleDescription>Management Interactive Shell</bundleDescription>
+            <bundleSymbolicName>${artifactId}</bundleSymbolicName>
+            <dynamicImportPackage>
+            *
+            </dynamicImportPackage>
+            <importPackage>
+            <!--Note that we explicitly do not import jmood classes as they we use 
+            dynamically generated interfaces and proxies instead-->
+			org.osgi.framework, javax.management, javax.management.remote, javax.script
+			</importPackage>
+            
+          </osgiManifest>
+        </configuration>
+      </plugin>
+              <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source><!--should fail if not java6-->
+                    <target>1.6</target>
+                </configuration>
+             </plugin>      
+    </plugins>
+  </build>
+</project>
diff --git a/mosgi/console.component/pom.xml b/mosgi/console.component/pom.xml
index 19880a2..6db1596 100644
--- a/mosgi/console.component/pom.xml
+++ b/mosgi/console.component/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/console.gui/pom.xml b/mosgi/console.gui/pom.xml
index d7bc87c..6cfb05f 100644
--- a/mosgi/console.gui/pom.xml
+++ b/mosgi/console.gui/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/console.ifc/pom.xml b/mosgi/console.ifc/pom.xml
index 8e7b816..c868e81 100644
--- a/mosgi/console.ifc/pom.xml
+++ b/mosgi/console.ifc/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/jmx.agent/pom.xml b/mosgi/jmx.agent/pom.xml
index 4c883b2..f58989f 100644
--- a/mosgi/jmx.agent/pom.xml
+++ b/mosgi/jmx.agent/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/jmx.httpconnector/pom.xml b/mosgi/jmx.httpconnector/pom.xml
index ff2225a..de53f43 100644
--- a/mosgi/jmx.httpconnector/pom.xml
+++ b/mosgi/jmx.httpconnector/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/jmx.registry/pom.xml b/mosgi/jmx.registry/pom.xml
index 0aea6c4..bb77d75 100644
--- a/mosgi/jmx.registry/pom.xml
+++ b/mosgi/jmx.registry/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/jmx.remotelogger/pom.xml b/mosgi/jmx.remotelogger/pom.xml
index cd8ac3d..a6b4b05 100644
--- a/mosgi/jmx.remotelogger/pom.xml
+++ b/mosgi/jmx.remotelogger/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/jmx.rmiconnector/pom.xml b/mosgi/jmx.rmiconnector/pom.xml
index aa7554d..6642665 100644
--- a/mosgi/jmx.rmiconnector/pom.xml
+++ b/mosgi/jmx.rmiconnector/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.bundlesprobes.tab/pom.xml b/mosgi/managedelements.bundlesprobes.tab/pom.xml
index c87abf9..023f0c4 100644
--- a/mosgi/managedelements.bundlesprobes.tab/pom.xml
+++ b/mosgi/managedelements.bundlesprobes.tab/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.bundlesprobes/pom.xml b/mosgi/managedelements.bundlesprobes/pom.xml
index ab82674..54030fb 100644
--- a/mosgi/managedelements.bundlesprobes/pom.xml
+++ b/mosgi/managedelements.bundlesprobes/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.memoryprobe/pom.xml b/mosgi/managedelements.memoryprobe/pom.xml
index c1140d8..aab8eec 100644
--- a/mosgi/managedelements.memoryprobe/pom.xml
+++ b/mosgi/managedelements.memoryprobe/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.obrprobe.tab/pom.xml b/mosgi/managedelements.obrprobe.tab/pom.xml
index f629516..f580588 100644
--- a/mosgi/managedelements.obrprobe.tab/pom.xml
+++ b/mosgi/managedelements.obrprobe.tab/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.obrprobe/pom.xml b/mosgi/managedelements.obrprobe/pom.xml
index 9b00563..d3922fd 100644
--- a/mosgi/managedelements.obrprobe/pom.xml
+++ b/mosgi/managedelements.obrprobe/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.osgiprobes.tab/pom.xml b/mosgi/managedelements.osgiprobes.tab/pom.xml
index c7e958b..99cb88b 100644
--- a/mosgi/managedelements.osgiprobes.tab/pom.xml
+++ b/mosgi/managedelements.osgiprobes.tab/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/managedelements.osgiprobes/pom.xml b/mosgi/managedelements.osgiprobes/pom.xml
index b2fdf91..c1b64e0 100644
--- a/mosgi/managedelements.osgiprobes/pom.xml
+++ b/mosgi/managedelements.osgiprobes/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mosgi/pom.xml b/mosgi/pom.xml
index dd62b40..6681ac9 100644
--- a/mosgi/pom.xml
+++ b/mosgi/pom.xml
@@ -4,6 +4,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/org.apache.felix.daemon/pom.xml b/org.apache.felix.daemon/pom.xml
index dcf1881..19daf3e 100644
--- a/org.apache.felix.daemon/pom.xml
+++ b/org.apache.felix.daemon/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>jar</packaging>
diff --git a/org.osgi.compendium/pom.xml b/org.osgi.compendium/pom.xml
index 5a94239..bb54fbf 100644
--- a/org.osgi.compendium/pom.xml
+++ b/org.osgi.compendium/pom.xml
@@ -20,6 +20,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <organization>
     <name>OSGi Alliance</name>
diff --git a/org.osgi.core/doc/apache-felix-osgi-core_files/print.css b/org.osgi.core/doc/apache-felix-osgi-core_files/print.css
deleted file mode 100644
index 32c3b5f..0000000
--- a/org.osgi.core/doc/apache-felix-osgi-core_files/print.css
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /FELIX/media.data/print.css was not found on this server.</p>
-<hr>
-<address>Apache/2.2.3 (Unix) mod_ssl/2.2.3 OpenSSL/0.9.7g Server at cwiki.apache.org Port 80</address>
-</body></html>
diff --git a/org.osgi.core/pom.xml b/org.osgi.core/pom.xml
index 08ecffd..9a6aec5 100644
--- a/org.osgi.core/pom.xml
+++ b/org.osgi.core/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <organization>
     <name>OSGi Alliance</name>
diff --git a/org.osgi.foundation/pom.xml b/org.osgi.foundation/pom.xml
index c420fd3..c100a98 100644
--- a/org.osgi.foundation/pom.xml
+++ b/org.osgi.foundation/pom.xml
@@ -20,6 +20,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <organization>
     <name>OSGi Alliance</name>
diff --git a/pom.xml b/pom/pom.xml
similarity index 82%
rename from pom.xml
rename to pom/pom.xml
index e2cdd16..cd35845 100644
--- a/pom.xml
+++ b/pom/pom.xml
@@ -33,6 +33,7 @@
   <name>Apache Felix</name>
   <version>0.9.0-incubator-SNAPSHOT</version>
   <url>http://felix.apache.org/</url>
+  <inceptionYear>2006</inceptionYear>
   <description>Apache felix is an OSGi implementation.</description>
 
   <issueManagement>
@@ -95,11 +96,11 @@
         </property>
       </activation>
       <modules>
-        <module>bundleplugin</module>
-        <module>tools/maven2/maven-osgi-plugin</module>
-        <module>ipojo/metadata</module>
-        <module>ipojo/manipulator</module>
-        <module>ipojo/plugin</module>
+        <module>../bundleplugin</module>
+        <module>../tools/maven2/maven-osgi-plugin</module>
+        <module>../ipojo/metadata</module>
+        <module>../ipojo/manipulator</module>
+        <module>../ipojo/plugin</module>
       </modules>
     </profile>
 
@@ -125,31 +126,31 @@
         </property>
       </activation>
       <modules>
-        <module>org.osgi.foundation</module>
-        <module>javax.servlet</module>
-        <module>org.osgi.core</module>
-        <module>org.osgi.compendium</module>
-        <module>framework</module>
-        <module>main</module>
-        <module>shell</module>
-        <module>shell.tui</module>
-        <module>shell.gui</module>
-        <module>shell.gui.plugin</module>
-        <module>bundlerepository</module>
-        <module>log</module>
-        <module>eventadmin</module>
-        <module>http.jetty</module>
-        <module>scr</module>
-        <module>configadmin</module>
-        <module>metatype</module>
-        <module>dependencymanager</module>
-        <module>servicebinder</module>
-        <module>wireadmin</module>
+        <module>../org.osgi.foundation</module>
+        <module>../javax.servlet</module>
+        <module>../org.osgi.core</module>
+        <module>../org.osgi.compendium</module>
+        <module>../framework</module>
+        <module>../main</module>
+        <module>../shell</module>
+        <module>../shell.tui</module>
+        <module>../shell.gui</module>
+        <module>../shell.gui.plugin</module>
+        <module>../bundlerepository</module>
+        <module>../log</module>
+        <module>../eventadmin</module>
+        <module>../http.jetty</module>
+        <module>../scr</module>
+        <module>../configadmin</module>
+        <module>../metatype</module>
+        <module>../dependencymanager</module>
+        <module>../servicebinder</module>
+        <module>../wireadmin</module>
         
-        <module>ipojo/core</module>
-        <module>ipojo/arch</module>
+        <module>../ipojo/core</module>
+        <module>../ipojo/arch</module>
 	
-	<module>mosgi</module>
+	<module>../mosgi</module>
       </modules>
     </profile>
     
@@ -162,16 +163,16 @@
         </property>
       </activation>
       <modules>
-        <module>org.apache.felix.daemon</module>
+        <module>../org.apache.felix.daemon</module>
 
-        <module>examples</module>
+        <module>../examples</module>
 
-        <module>upnp.extra</module>
-        <module>upnp.basedriver</module>
-        <module>upnp.tester</module>
-        <module>upnp.sample.tv</module>
-        <module>upnp.sample.clock</module>
-        <module>upnp.sample.binaryLight</module>
+        <module>../upnp.extra</module>
+        <module>../upnp.basedriver</module>
+        <module>../upnp.tester</module>
+        <module>../upnp.sample.tv</module>
+        <module>../upnp.sample.clock</module>
+        <module>../upnp.sample.binaryLight</module>
 
         <!--    <module>tools/mangen</module> -->
 
@@ -327,6 +328,11 @@
           <artifactId>maven-bundle-plugin</artifactId>
           <version>0.9.0-incubator-SNAPSHOT</version>
         </plugin>
+<!--        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.0-alpha-5</version>
+        </plugin> -->
       </plugins>
     </pluginManagement>
     <plugins>
@@ -345,6 +351,23 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
       </plugin -->
+      <!-- We want to package up license resources in the JARs produced
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>-->
     </plugins>
   </build>
   <reporting>
diff --git a/scr/pom.xml b/scr/pom.xml
index fb18b67..640823f 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -1,65 +1,66 @@
-<project>
-    <parent>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>felix</artifactId>
-        <version>0.9.0-incubator-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>bundle</packaging>
-    <name>Apache Felix Declarative Services</name>
-    <description>
-        Implementation of the Declarative Services specification 1.0
-    </description>
-    <artifactId>org.apache.felix.scr</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${pom.groupId}</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sf.kxml</groupId>
-            <artifactId>kxml2</artifactId>
-            <version>2.2.2</version>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-		        <version>0.9.0-incubator-SNAPSHOT</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>
-                            ${artifactId}
-                        </Bundle-SymbolicName>
-                        <Bundle-Vendor>
-                            Apache Software Foundation
-                        </Bundle-Vendor>
-                        <Bundle-Activator>
-                            org.apache.felix.scr.Activator
-                        </Bundle-Activator>
-                        <Export-Package>
-                            org.osgi.service.cm, org.osgi.service.component
-                        </Export-Package>
-                        <Private-Package>
-                            org.apache.felix.scr.*, org.kxml2.io,
-                            org.osgi.util.tracker,
-                            org.xmlpull.v1
-                        </Private-Package>
-                        <DynamicImport-Package>
-                            org.osgi.service.log
-                        </DynamicImport-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
+<project>
+    <parent>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>felix</artifactId>
+        <version>0.9.0-incubator-SNAPSHOT</version>
+        <relativePath>../pom/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <packaging>bundle</packaging>
+    <name>Apache Felix Declarative Services</name>
+    <description>
+        Implementation of the Declarative Services specification 1.0
+    </description>
+    <artifactId>org.apache.felix.scr</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sf.kxml</groupId>
+            <artifactId>kxml2</artifactId>
+            <version>2.2.2</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+		        <version>0.9.0-incubator-SNAPSHOT</version>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>
+                            ${artifactId}
+                        </Bundle-SymbolicName>
+                        <Bundle-Vendor>
+                            Apache Software Foundation
+                        </Bundle-Vendor>
+                        <Bundle-Activator>
+                            org.apache.felix.scr.Activator
+                        </Bundle-Activator>
+                        <Export-Package>
+                            org.osgi.service.cm, org.osgi.service.component
+                        </Export-Package>
+                        <Private-Package>
+                            org.apache.felix.scr.*, org.kxml2.io,
+                            org.osgi.util.tracker,
+                            org.xmlpull.v1
+                        </Private-Package>
+                        <DynamicImport-Package>
+                            org.osgi.service.log
+                        </DynamicImport-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/servicebinder/pom.xml b/servicebinder/pom.xml
index 6ea4985..9f4ab12 100644
--- a/servicebinder/pom.xml
+++ b/servicebinder/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/shell.gui.plugin/pom.xml b/shell.gui.plugin/pom.xml
index 234204d..d636977 100644
--- a/shell.gui.plugin/pom.xml
+++ b/shell.gui.plugin/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/shell.gui/pom.xml b/shell.gui/pom.xml
index 4aa0099..71b8957 100644
--- a/shell.gui/pom.xml
+++ b/shell.gui/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/shell.tui/doc/apache-felix-shell-tui_files/print.css b/shell.tui/doc/apache-felix-shell-tui_files/print.css
deleted file mode 100644
index 32c3b5f..0000000
--- a/shell.tui/doc/apache-felix-shell-tui_files/print.css
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /FELIX/media.data/print.css was not found on this server.</p>
-<hr>
-<address>Apache/2.2.3 (Unix) mod_ssl/2.2.3 OpenSSL/0.9.7g Server at cwiki.apache.org Port 80</address>
-</body></html>
diff --git a/shell.tui/pom.xml b/shell.tui/pom.xml
index d53fc6e..e25b37e 100644
--- a/shell.tui/pom.xml
+++ b/shell.tui/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/shell/doc/apache-felix-shell-service_files/print.css b/shell/doc/apache-felix-shell-service_files/print.css
deleted file mode 100644
index 32c3b5f..0000000
--- a/shell/doc/apache-felix-shell-service_files/print.css
+++ /dev/null
@@ -1,9 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
-<html><head>
-<title>404 Not Found</title>
-</head><body>
-<h1>Not Found</h1>
-<p>The requested URL /FELIX/media.data/print.css was not found on this server.</p>
-<hr>
-<address>Apache/2.2.3 (Unix) mod_ssl/2.2.3 OpenSSL/0.9.7g Server at cwiki.apache.org Port 80</address>
-</body></html>
diff --git a/shell/pom.xml b/shell/pom.xml
index 1d962ce..70c50d6 100644
--- a/shell/pom.xml
+++ b/shell/pom.xml
@@ -21,6 +21,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>
diff --git a/tools/mangen/pom.xml b/tools/mangen/pom.xml
index e6c90f0..ff5146d 100644
--- a/tools/mangen/pom.xml
+++ b/tools/mangen/pom.xml
@@ -1,57 +1,58 @@
-<project>
-  <parent>
-    <groupId>org.apache.felix</groupId>
-    <artifactId>felix</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>jar</packaging>
-  <name>Apache Felix Bundle Manifest Generator (mangen)</name>
-  <artifactId>org.apache.felix.tool.mangen</artifactId>
-  <version>1.0.1</version>
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.apache.felix.framework</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>asm</groupId>
-      <artifactId>asm</artifactId>
-      <version>2.2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>bcel</groupId>
-      <artifactId>bcel</artifactId>
-      <version>5.1</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>org.apache.felix.tool.mangen.MangenMain</mainClass>
-              <addClasspath>true</addClasspath>
-            </manifest>
-            <manifestEntries/>
-          </archive>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-  </build>
-</project>
+<project>
+  <parent>
+    <groupId>org.apache.felix</groupId>
+    <artifactId>felix</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>jar</packaging>
+  <name>Apache Felix Bundle Manifest Generator (mangen)</name>
+  <artifactId>org.apache.felix.tool.mangen</artifactId>
+  <version>1.0.1</version>
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.apache.felix.framework</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <version>2.2.1</version>
+    </dependency>
+    <dependency>
+      <groupId>bcel</groupId>
+      <artifactId>bcel</artifactId>
+      <version>5.1</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifest>
+              <mainClass>org.apache.felix.tool.mangen.MangenMain</mainClass>
+              <addClasspath>true</addClasspath>
+            </manifest>
+            <manifestEntries/>
+          </archive>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/tools/maven2/maven-felix-plugin/pom.xml b/tools/maven2/maven-felix-plugin/pom.xml
index 9bd8d3a..26bb695 100644
--- a/tools/maven2/maven-felix-plugin/pom.xml
+++ b/tools/maven2/maven-felix-plugin/pom.xml
@@ -4,6 +4,7 @@
     <artifactId>felix</artifactId>
     <groupId>org.apache.felix</groupId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.felix.plugins</groupId>
diff --git a/tools/maven2/maven-osgi-plugin/pom.xml b/tools/maven2/maven-osgi-plugin/pom.xml
index c42426e..ec14bd7 100644
--- a/tools/maven2/maven-osgi-plugin/pom.xml
+++ b/tools/maven2/maven-osgi-plugin/pom.xml
@@ -21,6 +21,7 @@
     <artifactId>felix</artifactId>
     <groupId>org.apache.felix</groupId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.felix.plugins</groupId>
diff --git a/upnp.basedriver/pom.xml b/upnp.basedriver/pom.xml
index 36f8b07..ee68800 100644
--- a/upnp.basedriver/pom.xml
+++ b/upnp.basedriver/pom.xml
@@ -1,76 +1,77 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <groupId>org.apache.felix</groupId>
-  <name>Apache Felix UPnP Base Driver</name>
-  <artifactId>org.apache.felix.upnp.basedriver</artifactId>
-  <version>0.1.0-incubator-SNAPSHOT</version>
-  <repositories>
-    <!-- For snapshots (no release jars or non-apache jars)           -->
-    <repository>
-      <id>domoware.isti.cnr.it</id>
-      <name>DomoWare Repository for Missing Artifacts</name>
-      <url>http://domoware.isti.cnr.it/maven2</url>
-    </repository>
-  </repositories>   <!-- <url>http://maven.apache.org</url> -->
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.upnp.extra</artifactId>
-      <version>0.1.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org-cybergarage</groupId>
-      <artifactId>cyberlink-upnp-patched</artifactId>
-      <version>1.7.2</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!-- <version>${pom.version}</version> -->
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest>
-            <bundleName>UPnPBaseDriver</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
-               	A Bundle implementation of the UPnP Service Specification R4
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.basedriver</bundleSymbolicName>
-		    <bundleActivator>org.apache.felix.upnp.basedriver.Activator</bundleActivator>
-          </osgiManifest>
-          <manifestFile>src/main/resources/release/META-INF/Manifest.mf</manifestFile>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-	  <directory>src/main/resources/release</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <groupId>org.apache.felix</groupId>
+  <name>Apache Felix UPnP Base Driver</name>
+  <artifactId>org.apache.felix.upnp.basedriver</artifactId>
+  <version>0.1.0-incubator-SNAPSHOT</version>
+  <repositories>
+    <!-- For snapshots (no release jars or non-apache jars)           -->
+    <repository>
+      <id>domoware.isti.cnr.it</id>
+      <name>DomoWare Repository for Missing Artifacts</name>
+      <url>http://domoware.isti.cnr.it/maven2</url>
+    </repository>
+  </repositories>   <!-- <url>http://maven.apache.org</url> -->
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.upnp.extra</artifactId>
+      <version>0.1.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org-cybergarage</groupId>
+      <artifactId>cyberlink-upnp-patched</artifactId>
+      <version>1.7.2</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <!-- <version>${pom.version}</version> -->
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>UPnPBaseDriver</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleVersion>0.1.0</bundleVersion>
+            <bundleDescription>
+               	A Bundle implementation of the UPnP Service Specification R4
+            </bundleDescription>
+            <bundleSymbolicName>org.apache.felix.upnp.basedriver</bundleSymbolicName>
+		    <bundleActivator>org.apache.felix.upnp.basedriver.Activator</bundleActivator>
+          </osgiManifest>
+          <manifestFile>src/main/resources/release/META-INF/Manifest.mf</manifestFile>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+	  <directory>src/main/resources/release</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/upnp.extra/pom.xml b/upnp.extra/pom.xml
index da7e561..ca1f863 100644
--- a/upnp.extra/pom.xml
+++ b/upnp.extra/pom.xml
@@ -1,47 +1,48 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <groupId>org.apache.felix</groupId>
-  <name>Apache Felix UPnP Extra </name>
-  <artifactId>org.apache.felix.upnp.extra</artifactId>
-  <version>0.1.0-incubator-SNAPSHOT</version>
-  <!-- <url>http://maven.apache.org</url> -->
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!-- <version>${pom.version}</version> -->
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest>
-            <bundleName>UPnPExtra</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
-               	A library used to extend the integration between UPnP and OSGi that is not part of the standard. Also services that allow to change the beahviour of the UPnP Base Driver
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.extra</bundleSymbolicName>
-            <exportPackage>
-               	org.apache.felix.upnp.extra.util;specification-version=1.0,org.apache.felix.upnp.extra.controller;specification-version=1.0
-            </exportPackage>
-          </osgiManifest>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <groupId>org.apache.felix</groupId>
+  <name>Apache Felix UPnP Extra </name>
+  <artifactId>org.apache.felix.upnp.extra</artifactId>
+  <version>0.1.0-incubator-SNAPSHOT</version>
+  <!-- <url>http://maven.apache.org</url> -->
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <!-- <version>${pom.version}</version> -->
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>UPnPExtra</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleVersion>0.1.0</bundleVersion>
+            <bundleDescription>
+               	A library used to extend the integration between UPnP and OSGi that is not part of the standard. Also services that allow to change the beahviour of the UPnP Base Driver
+            </bundleDescription>
+            <bundleSymbolicName>org.apache.felix.upnp.extra</bundleSymbolicName>
+            <exportPackage>
+               	org.apache.felix.upnp.extra.util;specification-version=1.0,org.apache.felix.upnp.extra.controller;specification-version=1.0
+            </exportPackage>
+          </osgiManifest>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/upnp.sample.binaryLight/pom.xml b/upnp.sample.binaryLight/pom.xml
index 25f2dbe..4925ec0 100644
--- a/upnp.sample.binaryLight/pom.xml
+++ b/upnp.sample.binaryLight/pom.xml
@@ -1,63 +1,64 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <groupId>org.apache.felix</groupId>
-  <name>Apache Felix UPnP Sample Binary-Light</name>
-  <artifactId>org.apache.felix.upnp.sample.binaryLight</artifactId>
-  <version>0.1.0-incubator-SNAPSHOT</version>
-  <!-- <url>http://maven.apache.org</url> -->
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>javax.servlet</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!-- <version>${pom.version}</version> -->
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest>
-            <bundleName>UPnPBinaryLight</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
-               	Standardized BinaryLight DCPs to test UPnP Base Driver
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.sample.binaryLight</bundleSymbolicName>
-		<bundleActivator>org.apache.felix.upnp.sample.binaryLight.Activator</bundleActivator>
-          </osgiManifest>
-          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-	  <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <groupId>org.apache.felix</groupId>
+  <name>Apache Felix UPnP Sample Binary-Light</name>
+  <artifactId>org.apache.felix.upnp.sample.binaryLight</artifactId>
+  <version>0.1.0-incubator-SNAPSHOT</version>
+  <!-- <url>http://maven.apache.org</url> -->
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <!-- <version>${pom.version}</version> -->
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>UPnPBinaryLight</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleVersion>0.1.0</bundleVersion>
+            <bundleDescription>
+               	Standardized BinaryLight DCPs to test UPnP Base Driver
+            </bundleDescription>
+            <bundleSymbolicName>org.apache.felix.upnp.sample.binaryLight</bundleSymbolicName>
+		<bundleActivator>org.apache.felix.upnp.sample.binaryLight.Activator</bundleActivator>
+          </osgiManifest>
+          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+	  <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/upnp.sample.clock/pom.xml b/upnp.sample.clock/pom.xml
index 78becb8..eba63bf 100644
--- a/upnp.sample.clock/pom.xml
+++ b/upnp.sample.clock/pom.xml
@@ -1,57 +1,58 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <groupId>org.apache.felix</groupId>
-  <name>Apache Felix UPnP Sample Clock</name>
-  <artifactId>org.apache.felix.upnp.sample.clock</artifactId>
-  <version>0.1.0-incubator-SNAPSHOT</version>
-  <!-- <url>http://maven.apache.org</url> -->
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!-- <version>${pom.version}</version> -->
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest>
-            <bundleName>UPnPClock</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
-               	CyberLink Clock clone to test UPnPBase driver
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.sample.clock</bundleSymbolicName>
-		<bundleActivator>org.apache.felix.upnp.sample.clock.Activator</bundleActivator>
-          </osgiManifest>
-          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-	  <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <groupId>org.apache.felix</groupId>
+  <name>Apache Felix UPnP Sample Clock</name>
+  <artifactId>org.apache.felix.upnp.sample.clock</artifactId>
+  <version>0.1.0-incubator-SNAPSHOT</version>
+  <!-- <url>http://maven.apache.org</url> -->
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <!-- <version>${pom.version}</version> -->
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>UPnPClock</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleVersion>0.1.0</bundleVersion>
+            <bundleDescription>
+               	CyberLink Clock clone to test UPnPBase driver
+            </bundleDescription>
+            <bundleSymbolicName>org.apache.felix.upnp.sample.clock</bundleSymbolicName>
+		<bundleActivator>org.apache.felix.upnp.sample.clock.Activator</bundleActivator>
+          </osgiManifest>
+          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+	  <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/upnp.sample.tv/pom.xml b/upnp.sample.tv/pom.xml
index a7f5b8c..b9726b7 100644
--- a/upnp.sample.tv/pom.xml
+++ b/upnp.sample.tv/pom.xml
@@ -1,57 +1,58 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <groupId>org.apache.felix</groupId>
-  <name>Apache Felix UPnP Sample TV</name>
-  <artifactId>org.apache.felix.upnp.sample.tv</artifactId>
-  <version>0.1.0-incubator-SNAPSHOT</version>
-  <!-- <url>http://maven.apache.org</url> -->
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!-- <version>${pom.version}</version> -->
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest>
-            <bundleName>UPnPTV</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
-               	CyberLink Tv clone to test UPnPBase driver
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.sample.tv</bundleSymbolicName>
-		<bundleActivator>org.apache.felix.upnp.sample.tv.Activator</bundleActivator>
-          </osgiManifest>
-          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-	  <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <groupId>org.apache.felix</groupId>
+  <name>Apache Felix UPnP Sample TV</name>
+  <artifactId>org.apache.felix.upnp.sample.tv</artifactId>
+  <version>0.1.0-incubator-SNAPSHOT</version>
+  <!-- <url>http://maven.apache.org</url> -->
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <!-- <version>${pom.version}</version> -->
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>UPnPTV</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleVersion>0.1.0</bundleVersion>
+            <bundleDescription>
+               	CyberLink Tv clone to test UPnPBase driver
+            </bundleDescription>
+            <bundleSymbolicName>org.apache.felix.upnp.sample.tv</bundleSymbolicName>
+		<bundleActivator>org.apache.felix.upnp.sample.tv.Activator</bundleActivator>
+          </osgiManifest>
+          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+	  <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/upnp.tester/pom.xml b/upnp.tester/pom.xml
index 4676fb6..ecb6be6 100644
--- a/upnp.tester/pom.xml
+++ b/upnp.tester/pom.xml
@@ -1,63 +1,64 @@
-<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</artifactId>
-    <version>0.9.0-incubator-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <packaging>osgi-bundle</packaging>
-  <groupId>org.apache.felix</groupId>
-  <name>Apache Felix UPnP Tester</name>
-  <artifactId>org.apache.felix.upnp.tester</artifactId>
-  <version>0.1.0-incubator-SNAPSHOT</version>
-  <!-- <url>http://maven.apache.org</url> -->
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.core</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>0.9.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.felix</groupId>
-      <artifactId>org.apache.felix.upnp.extra</artifactId>
-      <version>0.1.0-incubator-SNAPSHOT</version>
-      <scope>provided</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix.plugins</groupId>
-        <artifactId>maven-osgi-plugin</artifactId>
-        <!-- <version>${pom.version}</version> -->
-        <extensions>true</extensions>
-        <configuration>
-          <osgiManifest>
-            <bundleName>UPnPTester</bundleName>
-            <bundleVendor>Apache Software Foundation</bundleVendor>
-            <bundleVersion>0.1.0</bundleVersion>
-            <bundleDescription>
-               	OSGi Generic Control Point to control UPnPDevice services
-            </bundleDescription>
-            <bundleSymbolicName>org.apache.felix.upnp.tester</bundleSymbolicName>
-		<bundleActivator>org.apache.felix.upnp.tester.Activator</bundleActivator>
-          </osgiManifest>
-          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
-        </configuration>
-      </plugin>
-    </plugins>
-    <resources>
-      <resource>
-	  <directory>src/main/resources</directory>
-      </resource>
-    </resources>
-  </build>
-</project>
+<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</artifactId>
+    <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>osgi-bundle</packaging>
+  <groupId>org.apache.felix</groupId>
+  <name>Apache Felix UPnP Tester</name>
+  <artifactId>org.apache.felix.upnp.tester</artifactId>
+  <version>0.1.0-incubator-SNAPSHOT</version>
+  <!-- <url>http://maven.apache.org</url> -->
+  <dependencies>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <version>0.9.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.upnp.extra</artifactId>
+      <version>0.1.0-incubator-SNAPSHOT</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix.plugins</groupId>
+        <artifactId>maven-osgi-plugin</artifactId>
+        <!-- <version>${pom.version}</version> -->
+        <extensions>true</extensions>
+        <configuration>
+          <osgiManifest>
+            <bundleName>UPnPTester</bundleName>
+            <bundleVendor>Apache Software Foundation</bundleVendor>
+            <bundleVersion>0.1.0</bundleVersion>
+            <bundleDescription>
+               	OSGi Generic Control Point to control UPnPDevice services
+            </bundleDescription>
+            <bundleSymbolicName>org.apache.felix.upnp.tester</bundleSymbolicName>
+		<bundleActivator>org.apache.felix.upnp.tester.Activator</bundleActivator>
+          </osgiManifest>
+          <manifestFile>src/main/resources/META-INF/Manifest.mf</manifestFile>
+        </configuration>
+      </plugin>
+    </plugins>
+    <resources>
+      <resource>
+	  <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  </build>
+</project>
diff --git a/wireadmin/pom.xml b/wireadmin/pom.xml
index 259f9dd..ac6cc23 100644
--- a/wireadmin/pom.xml
+++ b/wireadmin/pom.xml
@@ -3,6 +3,7 @@
     <groupId>org.apache.felix</groupId>
     <artifactId>felix</artifactId>
     <version>0.9.0-incubator-SNAPSHOT</version>
+    <relativePath>../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <packaging>bundle</packaging>