FELIX-2642 Implement Ant Task for DS and Metatype service
descriptor generation

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1025755 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/scrplugin/pom.xml b/scrplugin/pom.xml
index 8b383a9..0ea3fdf 100644
--- a/scrplugin/pom.xml
+++ b/scrplugin/pom.xml
@@ -49,18 +49,26 @@
             <artifactId>maven-plugin-api</artifactId>
             <version>2.0.7</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-archiver</artifactId>
             <version>2.2</version>
         </dependency>
+        
+        <!-- Ant Task Implementation -->
+        <dependency>
+            <groupId>org.apache.ant</groupId>
+            <artifactId>ant</artifactId>
+            <version>1.7.0</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- JavaDoc Tags -->
 		<dependency>
 			<groupId>com.thoughtworks.qdox</groupId>
 			<artifactId>qdox</artifactId>
 			<version>1.12</version>
+            <scope>provided</scope>
 		</dependency>
 
         <!-- SCR Annotations -->
@@ -68,42 +76,55 @@
 			<groupId>org.apache.felix</groupId>
 			<artifactId>org.apache.felix.scr.annotations</artifactId>
 			<version>1.3.1-SNAPSHOT</version>
+            <scope>provided</scope>
 		</dependency>
         
-        <!-- Sling Servlet SCR Annotation -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- bind/unbind method generation -->
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm-all</artifactId>
             <version>3.1</version>
+            <scope>provided</scope>
         </dependency>
 
-        <!-- OSGi APIs -->		
+        <!-- OSGi APIs (some constant references used only) -->		
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>4.0.0</version>           
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
             <version>4.0.0</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 	</dependencies>
 	
 	<build>
 		<plugins>
+            <!-- unpack qdox, asm and annotations into bundle package -->
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <includeArtifactIds>
+                                qdox,asm-all,org.apache.felix.scr.annotations
+                            </includeArtifactIds>
+                            <outputDirectory>
+                                ${project.build.outputDirectory}
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
 
-		  <!-- JDK 1.5 needed for annotation support -->
+            <!-- JDK 1.5 needed for annotation support -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
@@ -112,8 +133,6 @@
 				  <target>1.5</target>
 				</configuration>
 			</plugin>
-			
 		</plugins>
   </build>
-	
 </project>