[jboss-osgi-commits] JBoss-OSGI SVN: r86737 - in projects/jboss-osgi/trunk: runtime/deployer and 1 other directory.

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

Author: thomas.diesler at jboss.com
Date: 2009-04-03 06:55:34 -0400 (Fri, 03 Apr 2009)
New Revision: 86737

Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/runtime/deployer/pom.xml
Log:
Add org.osgi dependencies to deployer in scope provided

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2009-04-03 10:35:38 UTC (rev 86736)
+++ projects/jboss-osgi/trunk/pom.xml	2009-04-03 10:55:34 UTC (rev 86737)
@@ -36,7 +36,7 @@
   <!-- Properties -->
   <properties>
     <version.aqute.bnd>0.0.249</version.aqute.bnd>
-    <version.eclipse.osgi>3.4.2</version.eclipse.osgi>
+    <version.equinox>3.4.2</version.equinox>
     <version.felix.configadmin>1.0.10</version.felix.configadmin>
     <version.felix.framework>1.4.1</version.felix.framework>
     <version.felix.http.jetty>0.9.0-20090218-R745505</version.felix.http.jetty>
@@ -58,10 +58,10 @@
     <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
     <version.jboss.metadata>1.0.0.CR11</version.jboss.metadata>
     <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
+    <version.jboss.test>1.0.5.GA</version.jboss.test>
     <version.junit>4.4</version.junit>
     <version.log4j>1.2.14</version.log4j>
     <version.osgi>r4v41</version.osgi>
-    <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
   </properties>
 
   <!-- DependencyManagement -->
@@ -93,16 +93,6 @@
         <version>${version.izpack}</version>
       </dependency>
       <dependency>
-        <groupId>org.eclipse.equinox</groupId>
-        <artifactId>org.eclipse.osgi</artifactId>
-        <version>${version.eclipse.osgi}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.eclipse.equinox</groupId>
-        <artifactId>org.eclipse.osgi.services</artifactId>
-        <version>${version.eclipse.osgi}</version>
-      </dependency>
-      <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-common-core</artifactId>
         <version>${version.jboss.common.core}</version>
@@ -194,6 +184,18 @@
         <version>${version.osgi}</version>
       </dependency>
 
+      <!-- Equinox Dependencies -->
+      <dependency>
+        <groupId>org.eclipse.equinox</groupId>
+        <artifactId>org.eclipse.osgi</artifactId>
+        <version>${version.equinox}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.eclipse.equinox</groupId>
+        <artifactId>org.eclipse.osgi.services</artifactId>
+        <version>${version.equinox}</version>
+      </dependency>
+      
       <!-- Felix Dependencies -->
       <dependency>
         <groupId>org.apache.felix</groupId>
@@ -245,7 +247,7 @@
       <dependency>
         <groupId>org.jboss</groupId>
         <artifactId>jboss-test</artifactId>
-        <version>${version.org.jboss.test}</version>
+        <version>${version.jboss.test}</version>
         <scope>test</scope>
       </dependency>
       <dependency>

Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/pom.xml	2009-04-03 10:35:38 UTC (rev 86736)
+++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml	2009-04-03 10:55:34 UTC (rev 86737)
@@ -22,6 +22,16 @@
   <!-- Dependencies -->
   <dependencies>
     <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.osgi</groupId>
       <artifactId>jboss-osgi-runtime-spi</artifactId>
       <version>${version}</version>