Author: dkulp
Date: Tue Nov 20 20:50:08 2012
New Revision: 1411853
URL: http://svn.apache.org/viewvc?rev=1411853&view=rev
Log:
Merged revisions 1411708 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1411708 | cschneider | 2012-11-20 10:48:27 -0500 (Tue, 20 Nov 2012) | 2 lines
CXF-4642 Fixing version range for jetty feature
........
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Modified:
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml?rev=1411853&r1=1411852&r2=1411853&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
(original)
+++
cxf/branches/2.6.x-fixes/osgi/karaf/features/src/main/resources/features.xml
Tue Nov 20 20:50:08 2012
@@ -141,7 +141,7 @@
</feature>
<feature name="cxf-http-jetty" version="${project.version}"
resolver='(obr)'>
<feature version="[2,3)">cxf-http</feature>
- <feature version="[7,8)">jetty</feature>
+ <feature version="[7,9)">jetty</feature>
<bundle
start-level='40'>mvn:org.apache.cxf/cxf-rt-transports-http-jetty/${project.version}</bundle>
</feature>
<feature name="cxf-bindings-soap" version="${project.version}"
resolver='(obr)'>
