diff --git a/http/api/pom.xml b/http/api/pom.xml
index 1a7d5e6..5078b48 100644
--- a/http/api/pom.xml
+++ b/http/api/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Api</name>
     <artifactId>org.apache.felix.http.api</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/base/pom.xml b/http/base/pom.xml
index a8e427f..b27c5df 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Base</name>
     <artifactId>org.apache.felix.http.base</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt b/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
index f99bfac..bba492d 100644
--- a/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
+++ b/http/base/src/test/resources/org/apache/felix/http/base/internal/context/resource.txt
@@ -1 +1,17 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 Dummy resource...
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index 8803175..f093316 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bridge</name>
     <artifactId>org.apache.felix.http.bridge</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/bundle/pom.xml b/http/bundle/pom.xml
index 87dae0b..e02fbca 100644
--- a/http/bundle/pom.xml
+++ b/http/bundle/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Bundle</name>
     <artifactId>org.apache.felix.http.bundle</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/cometd/pom.xml b/http/cometd/pom.xml
index 2a3f714..90e037f 100644
--- a/http/cometd/pom.xml
+++ b/http/cometd/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Cometd</name>
     <artifactId>org.apache.felix.http.cometd</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index be2af65..e66face 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -21,9 +21,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.0</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Jetty</name>
diff --git a/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml b/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
index 4836d8c..416e020 100644
--- a/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ b/http/jetty/src/main/resources/OSGI-INF/metatype/metatype.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
 <metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0" localization="OSGI-INF/metatype/metatype">
     <OCD id="org.apache.felix.http" name="%org.apache.felix.http.jetty.internal.JettyConfig.name" description="%org.apache.felix.http.jetty.internal.JettyConfig.description">
         <AD id="org.apache.felix.http.host" type="String" default="0.0.0.0" name="%org.apache.felix.http.host.name" description="%org.apache.felix.http.host.description"/>
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
index 934433b..cc3b2e6 100755
--- a/http/parent/pom.xml
+++ b/http/parent/pom.xml
@@ -30,7 +30,7 @@
     <name>Apache Felix Http Parent POM</name>
     <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.http.parent</artifactId>
-    <version>3-SNAPSHOT</version>
+    <version>1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <prerequisites>
@@ -98,7 +98,7 @@
             <dependency>
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
-                <version>2.3</version>
+                <version>2.5</version>
                 <scope>provided</scope>
             </dependency>
             <dependency>
diff --git a/http/pom.xml b/http/pom.xml
index e1c5b97..9afbd4d 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -17,86 +17,27 @@
     under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
-        <version>1.2.0</version>
+        <version>2.1</version>
         <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
+    <name>Apache Felix Http Reactor</name>
     <groupId>org.apache.felix</groupId>
     <artifactId>org.apache.felix.http</artifactId>
+    <version>3-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>Apache Felix Http</name>
-    <version>2.2.1-SNAPSHOT</version>
-
-    <prerequisites>
-        <maven>2.0.7</maven>
-    </prerequisites>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/resources</directory>
-            </resource>
-            <resource>
-                <targetPath>META-INF</targetPath>
-                <directory>${basedir}</directory>
-                <includes>
-                    <include>LICENSE</include>
-                    <include>NOTICE</include>
-                    <include>DEPENDENCIES</include>
-                </includes>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                    <compilerVersion>1.5</compilerVersion>
-                </configuration>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.0.1</version>
-                    <executions>
-                      <execution>
-                        <id>bundle</id>
-                        <phase>package</phase>
-                        <goals>
-                          <goal>bundle</goal>
-                        </goals>
-                      </execution>
-                    </executions>
-                    <configuration>
-                        <instructions>
-                            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                            <Bundle-Version>${pom.version}</Bundle-Version>
-                        </instructions>                        
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
 
     <modules>
         <module>api</module>
         <module>base</module>
         <module>bridge</module>
         <module>jetty</module>
+        <module>parent</module>
         <module>proxy</module>
         <module>whiteboard</module>
         <module>cometd</module>
@@ -106,39 +47,4 @@
         <module>samples/whiteboard</module>
         <module>samples/cometd</module>
     </modules>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <version>1.8.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>servlet-api</artifactId>
-                <version>2.5</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.core</artifactId>
-                <version>4.0.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.osgi</groupId>
-                <artifactId>org.osgi.compendium</artifactId>
-                <version>4.0.0</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index e272652..0730fd4 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Proxy</name>
     <artifactId>org.apache.felix.http.proxy</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/samples/bridge/pom.xml b/http/samples/bridge/pom.xml
index a272f91..11d9227 100644
--- a/http/samples/bridge/pom.xml
+++ b/http/samples/bridge/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Bridge</name>
     <artifactId>org.apache.felix.http.samples.bridge</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <build>
diff --git a/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties b/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
index 48ec827..904b336 100644
--- a/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
+++ b/http/samples/bridge/src/main/webapp/WEB-INF/framework.properties
@@ -1,3 +1,22 @@
+#
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#
+
 org.osgi.framework.storage.clean = onFirstInit
 
 org.osgi.framework.system.packages = \
diff --git a/http/samples/bridge/src/main/webapp/WEB-INF/web.xml b/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
index ad0c845..8625236 100644
--- a/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
+++ b/http/samples/bridge/src/main/webapp/WEB-INF/web.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+    http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
 <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
diff --git a/http/samples/cometd/pom.xml b/http/samples/cometd/pom.xml
index 20be53c..f650fbd 100644
--- a/http/samples/cometd/pom.xml
+++ b/http/samples/cometd/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Cometd</name>
     <artifactId>org.apache.felix.http.samples.cometd</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/samples/filter/pom.xml b/http/samples/filter/pom.xml
index 5194319..b69a5c8 100644
--- a/http/samples/filter/pom.xml
+++ b/http/samples/filter/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Filter</name>
     <artifactId>org.apache.felix.http.samples.filter</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index e57074c..f603990 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Samples - Whiteboard</name>
     <artifactId>org.apache.felix.http.samples.whiteboard</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
diff --git a/http/whiteboard/pom.xml b/http/whiteboard/pom.xml
index d8eda6f..820732f 100644
--- a/http/whiteboard/pom.xml
+++ b/http/whiteboard/pom.xml
@@ -21,13 +21,14 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.felix</groupId>
-        <artifactId>org.apache.felix.http</artifactId>
-        <version>2.2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
+        <artifactId>org.apache.felix.http.parent</artifactId>
+        <version>1-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <name>Apache Felix Http Whiteboard</name>
     <artifactId>org.apache.felix.http.whiteboard</artifactId>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>