Author: ningjiang
Date: Tue Apr 13 02:45:30 2010
New Revision: 933467
URL: http://svn.apache.org/viewvc?rev=933467&view=rev
Log:
Fixed the karaf features' package resolve issue.
Modified:
camel/trunk/parent/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=933467&r1=933466&r2=933467&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Apr 13 02:45:30 2010
@@ -511,6 +511,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-security</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-sql</artifactId>
<version>${project.version}</version>
</dependency>
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=933467&r1=933466&r2=933467&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Tue
Apr 13 02:45:30 2010
@@ -82,7 +82,7 @@
</feature>
<feature name='camel-crypto' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
-
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-codec/${commons-codec-bundle-version}</bundle>
+ <bundle>mvn:commons-codec/commons-codec/${commons-codec}</bundle>
<bundle>mvn:org.apache.camel/camel-crypto/${pom.version}</bundle>
</feature>
<feature name='camel-dozer' version='${pom.version}'>
@@ -105,7 +105,7 @@
<bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
<bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${servlet-api-2.5-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-http/${pom.version}</bundle>
+ <bundle>mvn:org.apache.camel/camel-http4/${pom.version}</bundle>
</feature>
<feature name='camel-mina' version='${pom.version}'>
<feature version='${pom.version}'>camel-core</feature>
