[jboss-cvs] JBossAS SVN: r91194 - in projects/jboss-osgi/trunk/distribution: scripts and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-07-14 04:48:12 -0400 (Tue, 14 Jul 2009)
New Revision: 91194

Modified:
   projects/jboss-osgi/trunk/distribution/pom.xml
   projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml
Log:
Fix distro dependencies

Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml	2009-07-14 08:36:28 UTC (rev 91193)
+++ projects/jboss-osgi/trunk/distribution/pom.xml	2009-07-14 08:48:12 UTC (rev 91194)
@@ -39,27 +39,11 @@
     <dependency>
       <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-deployers</artifactId>
-      <version>${version.jboss.osgi.deployers}</version>
+      <version>${version.jboss.osgi.runtime.deployers}</version>
       <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-husky</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-husky</artifactId>
-      <version>${version.jboss.osgi.husky}</version>
-      <classifier>sources</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-husky</artifactId>
-      <version>${version.jboss.osgi.husky}</version>
-      <classifier>javadoc</classifier>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-runtime-jbossas</artifactId>
     </dependency>
     <dependency>
@@ -111,6 +95,10 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-common</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-common-core</artifactId>
     </dependency>
     <dependency>
@@ -119,18 +107,26 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-jaxb</artifactId>
+      <artifactId>jboss-osgi-husky</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-xml-binding</artifactId>
+      <artifactId>jboss-osgi-husky</artifactId>
+      <version>${version.jboss.osgi.husky}</version>
+      <classifier>sources</classifier>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-common</artifactId>
+      <artifactId>jboss-osgi-husky</artifactId>
+      <version>${version.jboss.osgi.husky}</version>
+      <classifier>javadoc</classifier>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-jaxb</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-jmx</artifactId>
     </dependency>
     <dependency>
@@ -145,6 +141,10 @@
       <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-webconsole</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.osgi.bundles</groupId>
+      <artifactId>jboss-osgi-xml-binding</artifactId>
+    </dependency>
 
     <!-- Equinox Dependencies -->
     <dependency>

Modified: projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml	2009-07-14 08:36:28 UTC (rev 91193)
+++ projects/jboss-osgi/trunk/distribution/scripts/assembly-deploy-artifacts.xml	2009-07-14 08:48:12 UTC (rev 91194)
@@ -44,7 +44,7 @@
       <outputDirectory>resources/jbossas-config</outputDirectory>
       <useStrictFiltering>true</useStrictFiltering>
       <includes>
-        <include>*:jboss-osgi-integration-jbossas:jar:config</include>
+        <include>*:jboss-osgi-runtime-jbossas:jar:config</include>
       </includes>
       <unpack>true</unpack>
     </dependencySet>