commit f52abb84a9ff7ba5e592284880787316d9921676
author Sten Roger Sandvik <srs@apache.org> Mon Sep 14 10:42:08 2009 +0000
committer Sten Roger Sandvik <srs@apache.org> Mon Sep 14 10:42:08 2009 +0000
tree da7e6915d57f9f30853e4e656b8e9388a8bc776e
parent 5af73c25724b85173797955b13223f298f532799

FELIX-1456: Attached it to master pom

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@814569 13f79535-47bb-0310-9956-ffa450edef68

http/pom.xml

diff --git a/http/pom.xml b/http/pom.xml
index 5d35c62..ab17620 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -25,6 +25,7 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>felix-parent</artifactId>
         <version>1.2.0</version>
+        <relativePath>../pom/pom.xml</relativePath>
     </parent>
 
     <artifactId>org.apache.felix.http</artifactId>

pom.xml

diff --git a/pom.xml b/pom.xml
index fcc2324..7533d0b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,8 @@
         <module>bundlerepository</module>
         <module>log</module>
         <module>eventadmin</module>
-        <module>http.jetty</module>
+        <module>http</module>
+        <!--module>http.jetty</module-->
         <module>upnp</module>
         <module>scr</module>
         <module>configadmin</module>