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 2011/03/16 10:01:45 UTC
svn commit: r1082100 - in /camel/trunk: parent/pom.xml
platforms/karaf/features/pom.xml
platforms/karaf/features/src/main/resources/features.xml
Author: ningjiang
Date: Wed Mar 16 09:01:44 2011
New Revision: 1082100
URL: http://svn.apache.org/viewvc?rev=1082100&view=rev
Log:
CAMEL-3763 Added the blueprint bundle into feature dependency
Modified:
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1082100&r1=1082099&r2=1082100&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Wed Mar 16 09:01:44 2011
@@ -112,7 +112,7 @@
<ognl-version>2.7.3_3</ognl-version>
<openjpa-version>1.2.2</openjpa-version>
<osgi-version>4.1.0</osgi-version>
- <pax-exam-version>1.2.3</pax-exam-version>
+ <pax-exam-version>1.2.4</pax-exam-version>
<pax-tiny-bundle-version>1.2.0</pax-tiny-bundle-version>
<pax-logging-version>1.5.3</pax-logging-version>
<protobuf-version>2.3.0</protobuf-version>
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1082100&r1=1082099&r2=1082100&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Wed Mar 16 09:01:44 2011
@@ -170,6 +170,12 @@
<version>${felix.configadmin.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.aries.blueprint</groupId>
+ <artifactId>org.apache.aries.blueprint</artifactId>
+ <version>${aries-blueprint-version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1082100&r1=1082099&r2=1082100&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Wed Mar 16 09:01:44 2011
@@ -41,10 +41,6 @@
</feature>
<feature name='camel-blueprint' version='${pom.version}' resolver='(obr)'>
<feature version='${pom.version}'>camel-core</feature>
- <bundle>mvn:org.apache.aries.blueprint/org.apache.aries.blueprint/${aries-blueprint-version}</bundle>
- <bundle>mvn:org.apache.aries.proxy/org.apache.aries.proxy/${aries-blueprint-version}</bundle>
- <bundle>mvn:org.apache.aries/org.apache.aries.util/${aries-blueprint-version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.asm/${asm-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-blueprint/${pom.version}</bundle>
</feature>
<feature name='camel-test' version='${pom.version}' resolver='(obr)'>