[jboss-cvs] JBossAS SVN: r92620 - in projects/jboss-osgi/trunk: reactor/runtime/jbossmc and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-08-20 15:21:13 -0400 (Thu, 20 Aug 2009)
New Revision: 92620

Modified:
   projects/jboss-osgi/trunk/distribution/pom.xml
   projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml
   projects/jboss-osgi/trunk/reactor/runtime/jbossmc/scripts/assembly-bundles.xml
Log:
Cleanup installer dependencies

Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml	2009-08-20 19:17:58 UTC (rev 92619)
+++ projects/jboss-osgi/trunk/distribution/pom.xml	2009-08-20 19:21:13 UTC (rev 92620)
@@ -333,37 +333,31 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.configadmin</artifactId>
       <version>${version.apache.felix.configadmin}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.http.jetty</artifactId>
       <version>${version.apache.felix.http.jetty}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.log</artifactId>
       <version>${version.apache.felix.log}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.metatype</artifactId>
       <version>${version.apache.felix.metatype}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>${version.apache.felix.core}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>${version.apache.felix.core}</version>
-      <scope>provided</scope>
     </dependency>
 
     <!-- JBossMC Dependencies -->

Modified: projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml	2009-08-20 19:17:58 UTC (rev 92619)
+++ projects/jboss-osgi/trunk/reactor/runtime/jbossmc/pom.xml	2009-08-20 19:21:13 UTC (rev 92620)
@@ -62,7 +62,6 @@
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
       <version>${version.osgi}</version>
-      <scope>provided</scope>
     </dependency>
 
     <!-- Bundle Dependencies -->

Modified: projects/jboss-osgi/trunk/reactor/runtime/jbossmc/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/runtime/jbossmc/scripts/assembly-bundles.xml	2009-08-20 19:17:58 UTC (rev 92619)
+++ projects/jboss-osgi/trunk/reactor/runtime/jbossmc/scripts/assembly-bundles.xml	2009-08-20 19:21:13 UTC (rev 92620)
@@ -15,9 +15,18 @@
       <outputDirectory>bundles</outputDirectory>
       <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
       <includes>
+        <include>*:org.osgi.compendium:jar</include>
+      </includes>
+      <useStrictFiltering>true</useStrictFiltering>
+      <scope>compile</scope>
+      <unpack>false</unpack>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>bundles</outputDirectory>
+      <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+      <includes>
         <include>*:jboss-osgi-common:jar</include>
         <include>*:org.apache.felix.log:jar</include>
-        <include>*:org.osgi.compendium:jar</include>
       </includes>
       <useStrictFiltering>true</useStrictFiltering>
       <scope>provided</scope>