Fixed exported packaged by basedriver
Renamed UPnP root


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@620538 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/upnp/basedriver/pom.xml b/upnp/basedriver/pom.xml
index c0d8df1..6e6e1f3 100644
--- a/upnp/basedriver/pom.xml
+++ b/upnp/basedriver/pom.xml
@@ -16,13 +16,13 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"

-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+<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>1.0.2</version>
+    <version>1.0.3-SNAPSHOT</version>
     <relativePath>../../pom/pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
       <name>Domoware Snapshot Repository</name>
       <url>http://domoware.isti.cnr.it/maven2-snap</url>
       <releases>
-        <enabled>false</enabled>

+        <enabled>false</enabled>
       </releases>
     </repository>
     <!-- For release (no snapshots jars or non-apache jars)           -->
@@ -47,7 +47,7 @@
       <name>Domoware Release Repository</name>
       <url>http://domoware.isti.cnr.it/maven2</url>
       <snapshots>
-        <enabled>false</enabled>

+        <enabled>false</enabled>
       </snapshots>
     </repository>
   </repositories>
@@ -75,7 +75,6 @@
           <plugin>
             <groupId>org.apache.felix</groupId>
             <artifactId>maven-bundle-plugin</artifactId>
-            <version>1.2.0</version>
             <extensions>true</extensions>
             <configuration>
               <instructions>
@@ -96,12 +95,12 @@
                 <Bundle-SymbolicName>
                   org.apache.felix.upnp.basedriver
                 </Bundle-SymbolicName>
-                <!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>

+                <!--Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
                   <Embed-Transitive>true</Embed-Transitive-->
                 <Export-Package>
-                  org.apache.felix.upnp.basedriver.controller;version=0.1.0,

-                  org.apache.felix.upnp.basedriver.util;version=0.3.0
-                  org.apache.felix.upnp.basedriver.resources;version=0.3.0

+                  org.apache.felix.upnp.basedriver.controller;version=0.1.0,
+                  org.apache.felix.upnp.basedriver.util;version=0.3.0,
+                  org.apache.felix.upnp.basedriver.resources;version=0.3.0,
                 </Export-Package>
                 <Import-Package>org.osgi.*</Import-Package>
                 <Private-Package>
@@ -160,9 +159,9 @@
                   org.apache.felix.upnp.basedriver
                 </Bundle-SymbolicName>
                 <Export-Package>
-                  org.apache.felix.upnp.basedriver.controller;version=0.1.0,

-                  org.apache.felix.upnp.basedriver.util;version=0.3.0
-                  org.apache.felix.upnp.basedriver.resources;version=0.3.0

+                  org.apache.felix.upnp.basedriver.controller;version=0.1.0,
+                  org.apache.felix.upnp.basedriver.util;version=0.3.0,
+                  org.apache.felix.upnp.basedriver.resources;version=0.3.0
                 </Export-Package>
                 <Import-Package>
                   org.osgi.*, javax.xml.parsers, org.w3c.dom,
@@ -190,7 +189,7 @@
     <dependency>
       <groupId>${pom.groupId}</groupId>
       <artifactId>org.osgi.core</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
+      <version>1.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>