Author: ningjiang
Date: Thu Aug 30 07:33:28 2012
New Revision: 1378832
URL: http://svn.apache.org/viewvc?rev=1378832&view=rev
Log:
Fixed the feature package resolve issue of camel-saxon
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=1378832&r1=1378831&r2=1378832&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Aug 30 07:33:28 2012
@@ -228,7 +228,7 @@
org.ccil.cowan.tagsoup.*;version="[1.2,2)",
org.mortbay.cometd.*;version="[6.1,7)",
net.sf.flatpack.*;version="[3.1.1,4)",
- net.sf.saxon.*;version="[9.3.0,9.4)",
+ net.sf.saxon.*;version="[9.3.0,9.5)",
freemarker.*;version="[2.3.15,3)",
javax.persistence.*;version="[1.1,3)",
</camel.osgi.import.defaults>
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=1378832&r1=1378831&r2=1378832&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml
(original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu
Aug 30 07:33:28 2012
@@ -684,6 +684,7 @@
</feature>
<feature name='camel-saxon' version='${project.version}' resolver='(obr)'
start-level='50'>
<feature version='${project.version}'>camel-core</feature>
+ <bundle
dependnecy='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xmlresolver/${xmlresolver-bundle-version}</bundle>
<bundle
dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.saxon/${saxon-bundle-version}</bundle>
<bundle>mvn:org.apache.camel/camel-saxon/${project.version}</bundle>
</feature>