FELIX-277 Improve SCR packaging to make it simpler to deploy and use

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@538121 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scr/pom.xml b/scr/pom.xml
index 67926a2..fb18b67 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -1,56 +1,65 @@
 <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>

+    <parent>

         <groupId>org.apache.felix</groupId>

-        <artifactId>maven-bundle-plugin</artifactId>

+        <artifactId>felix</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.component; version=1.0

-            </Export-Package>

-            <Private-Package>

-              org.apache.felix.scr.*,

-              org.kxml2.io,

-              org.xmlpull.v1

-            </Private-Package>

-          </instructions>

-        </configuration>

-      </plugin>

-    </plugins>

-  </build>

+    </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>