You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/06/04 06:01:11 UTC

svn commit: r951257 - in /camel/trunk/platforms/karaf/features: pom.xml src/main/resources/config.properties

Author: ningjiang
Date: Fri Jun  4 04:01:11 2010
New Revision: 951257

URL: http://svn.apache.org/viewvc?rev=951257&view=rev
Log:
Using the provided dependencies to add the bundles which are loaded by default.

Modified:
    camel/trunk/platforms/karaf/features/pom.xml
    camel/trunk/platforms/karaf/features/src/main/resources/config.properties

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=951257&r1=951256&r2=951257&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Jun  4 04:01:11 2010
@@ -58,6 +58,8 @@
       <fastinfoset-version>1.2.7_2</fastinfoset-version>
       <features.file>features.xml</features.file>
       <flatpack-bundle-version>3.1.1_3</flatpack-bundle-version>
+      <felix.configadmin.version>1.2.4</felix.configadmin.version>
+      <felix.framework.version>2.0.5</felix.framework.version>
       <freemarker-bundle-version>2.3.15_3</freemarker-bundle-version>
       <geronimo-el-version>1.0.1</geronimo-el-version>
       <geronimo-jsp-version>1.0.1</geronimo-jsp-version>
@@ -146,6 +148,7 @@
       </repository>   
     </repositories>
     
+    <!-- The validate plugin will export these provided dependencies bundles' export packages first -->  
     <dependencies>
     	<dependency>
     	    <groupId>org.osgi</groupId>
@@ -159,6 +162,18 @@
     	    <version>1.4</version>
     	    <scope>provided</scope>
     	</dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>${felix.framework.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.configadmin</artifactId>
+            <version>${felix.configadmin.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>

Modified: camel/trunk/platforms/karaf/features/src/main/resources/config.properties
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/config.properties?rev=951257&r1=951256&r2=951257&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/config.properties (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/config.properties Fri Jun  4 04:01:11 2010
@@ -26,8 +26,8 @@ org.osgi.framework.system.packages=org.o
  org.osgi.service.packageadmin; version=1.2.0, \
  org.osgi.service.startlevel; version=1.1.0, \
  org.osgi.service.url; version=1.0.0, \
- org.osgi.util.tracker; version=1.3.0, \
- org.osgi.service.cm; version=1.3.0
+ org.osgi.util.tracker; version=1.3.0 \
+ ${jre-${java.specification.version}} 
 
 org.osgi.framework.bootdelegation=sun.*,com.sun*,javax.transaction,javax.transaction.*