Author: hadrian
Date: Fri Mar 16 02:48:18 2012
New Revision: 1301316
URL: http://svn.apache.org/viewvc?rev=1301316&view=rev
Log:
CAMEL-5097. Fix feature definition for camel-fop
Modified:
camel/trunk/platforms/karaf/features/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/platforms/karaf/features/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1301316&r1=1301315&r2=1301316&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Fri Mar 16 02:48:18 2012
@@ -38,6 +38,7 @@
<antlr-bundle-version>2.7.7_5</antlr-bundle-version>
<aopalliance-bundle-version>1.0_6</aopalliance-bundle-version>
<asm2-bundle-version>2.2.3_5</asm2-bundle-version>
+ <avalon-bundle-version>4.3.1_1</avalon-bundle-version>
<aws-java-sdk-bundle-version>1.3.0_1</aws-java-sdk-bundle-version>
<bcel-bundle-version>5.2_4</bcel-bundle-version>
<bcpg-jdk16-bundle-version>1.46_2</bcpg-jdk16-bundle-version>
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=1301316&r1=1301315&r2=1301316&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Fri
Mar 16 02:48:18 2012
@@ -278,6 +278,7 @@
</feature>
<feature name='camel-fop' version='${pom.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.avalon-framework/${avalon-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.fop/${fop-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-fop/${project.version}</bundle>
</feature>