[jboss-cvs] JBossAS SVN: r94265 - in projects/jboss-osgi/trunk: distribution and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-10-02 07:04:18 -0400 (Fri, 02 Oct 2009)
New Revision: 94265

Modified:
   projects/jboss-osgi/trunk/distribution/pom.xml
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Fix version dependecy on framework

Modified: projects/jboss-osgi/trunk/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/pom.xml	2009-10-02 10:24:01 UTC (rev 94264)
+++ projects/jboss-osgi/trunk/distribution/pom.xml	2009-10-02 11:04:18 UTC (rev 94265)
@@ -360,12 +360,12 @@
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-framework</artifactId>
-      <version>${version.jboss.osgi.framework}</version>
+      <version>${version.jboss.osgi.runtime.jbossmc}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-framework</artifactId>
-      <version>${version.jboss.osgi.framework}</version>
+      <version>${version.jboss.osgi.runtime.jbossmc}</version>
       <classifier>sources</classifier>
     </dependency>
 

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-10-02 10:24:01 UTC (rev 94264)
+++ projects/jboss-osgi/trunk/pom.xml	2009-10-02 11:04:18 UTC (rev 94265)
@@ -47,7 +47,7 @@
     <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.1</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
-    <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework>
+    <version.jboss.osgi.runtime.jbossmc>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.jbossmc>
     <version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
     <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
     <version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
@@ -200,6 +200,13 @@
         <version>${version.apache.felix.core}</version>
       </dependency>
 
+      <!-- JBossMC Dependencies -->
+      <dependency>
+        <groupId>org.jboss.osgi.runtime</groupId>
+        <artifactId>jboss-osgi-framework</artifactId>
+        <version>${version.jboss.osgi.runtime.jbossmc}</version>
+      </dependency>
+
       <!-- org.osgi -->
       <dependency>
         <groupId>org.osgi</groupId>

Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml	2009-10-02 10:24:01 UTC (rev 94264)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml	2009-10-02 11:04:18 UTC (rev 94265)
@@ -188,7 +188,6 @@
         <dependency>
           <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-runtime-equinox</artifactId>
-          <version>${version.jboss.osgi.runtime.equinox}</version>
           <scope>provided</scope>
         </dependency>
         <!-- equinox-3.5 does not contain package org.osgi.util.xml -->
@@ -220,7 +219,6 @@
         <dependency>
           <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-runtime-felix</artifactId>
-          <version>${version.jboss.osgi.runtime.felix}</version>
           <scope>provided</scope>
         </dependency>
       </dependencies>
@@ -242,7 +240,6 @@
         <dependency>
           <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-framework</artifactId>
-          <version>${version.jboss.osgi.runtime.jbossmc}</version>
           <scope>provided</scope>
         </dependency>
       </dependencies>
@@ -268,7 +265,6 @@
         <dependency>
           <groupId>org.jboss.osgi.runtime</groupId>
           <artifactId>jboss-osgi-framework</artifactId>
-          <version>${version.jboss.osgi.framework}</version>
           <scope>provided</scope>
         </dependency>
       </dependencies>